From 05f95c0506f0c6036bce633d088f878ddbc236ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Skowro=C5=84ski?= Date: Mon, 21 Sep 2015 21:44:11 +0200 Subject: [PATCH] Fix files encoding. Go from ISO8859-1 to UTF-8. --- src/3rdParty/CxImage/CxImage/ximadsp.cpp | 2 +- src/3rdParty/CxImage/CxImage/ximainfo.cpp | 8 +- src/3rdParty/CxImage/CxImage/ximaint.cpp | 4 +- src/3rdParty/CxImage/CxImage/ximawnd.cpp | 4 +- .../salomesmesh/src/SMESH/SMESH_Octree.cpp | 2 +- .../src/SMESH/SMESH_OctreeNode.cpp | 2 +- .../src/StdMeshers/StdMeshers_Hexa_3D.cpp | 4 +- .../StdMeshers/StdMeshers_Quadrangle_2D.cpp | 8 +- src/App/Application.h | 2 +- src/App/ComplexGeoData.cpp | 2 +- src/App/ComplexGeoData.h | 2 +- src/App/ComplexGeoDataPyImp.cpp | 2 +- src/App/Document.cpp | 2 +- src/App/Document.h | 2 +- src/App/DocumentObject.cpp | 2 +- src/App/DocumentObject.h | 2 +- src/App/DocumentObjectFileIncluded.cpp | 2 +- src/App/DocumentObjectFileIncluded.h | 2 +- src/App/DocumentObjectPyImp.cpp | 2 +- src/App/DocumentPyImp.cpp | 2 +- src/App/FeaturePython.cpp | 2 +- src/App/FeaturePython.h | 2 +- src/App/FeatureTest.cpp | 2 +- src/App/FeatureTest.h | 2 +- src/App/GeoFeature.cpp | 2 +- src/App/GeoFeature.h | 2 +- src/App/Material.cpp | 2 +- src/App/Material.h | 2 +- src/App/MaterialObject.cpp | 2 +- src/App/MaterialObject.h | 2 +- src/App/Placement.cpp | 2 +- src/App/Placement.h | 2 +- src/App/Plane.cpp | 2 +- src/App/Plane.h | 2 +- src/App/PreCompiled.cpp | 2 +- src/App/PreCompiled.h | 2 +- src/App/Property.h | 2 +- src/App/PropertyContainer.cpp | 2 +- src/App/PropertyContainer.h | 2 +- src/App/PropertyContainerPyImp.cpp | 2 +- src/App/PropertyFile.cpp | 2 +- src/App/PropertyFile.h | 2 +- src/App/PropertyGeo.cpp | 2 +- src/App/PropertyGeo.h | 2 +- src/App/PropertyLinks.cpp | 2 +- src/App/PropertyLinks.h | 2 +- src/App/PropertyStandard.cpp | 2 +- src/App/PropertyStandard.h | 2 +- src/App/PropertyUnits.cpp | 2 +- src/App/PropertyUnits.h | 2 +- src/Base/Base64.cpp | 4 +- src/Base/Base64.h | 4 +- src/Base/BaseClassPyImp.cpp | 2 +- src/Base/BoundBox.h | 2 +- src/Base/Builder3D.h | 2 +- src/Base/Console.cpp | 2 +- src/Base/Console.h | 2 +- src/Base/Exception.cpp | 2 +- src/Base/Exception.h | 2 +- src/Base/Factory.cpp | 2 +- src/Base/Factory.h | 2 +- src/Base/FileInfo.cpp | 2 +- src/Base/FileInfo.h | 2 +- src/Base/Handle.cpp | 2 +- src/Base/Handle.h | 2 +- src/Base/InputSource.h | 2 +- src/Base/Interpreter.cpp | 2 +- src/Base/Interpreter.h | 2 +- src/Base/MemDebug.cpp | 2 +- src/Base/MemDebug.h | 2 +- src/Base/Observer.h | 2 +- src/Base/Parameter.cpp | 2 +- src/Base/Parameter.h | 2 +- src/Base/ParameterPy.cpp | 2 +- src/Base/PersistencePyImp.cpp | 2 +- src/Base/PreCompiled.cpp | 2 +- src/Base/PreCompiled.h | 2 +- src/Base/PyExport.cpp | 2 +- src/Base/PyExport.h | 2 +- src/Base/PyObjectBase.cpp | 2 +- src/Base/PyObjectBase.h | 2 +- src/Base/QuantityPyImp.cpp | 2 +- src/Base/Reader.h | 2 +- src/Base/Sequencer.h | 2 +- src/Base/StackWalker.cpp | 2 +- src/Base/Uuid.cpp | 2 +- src/Base/Uuid.h | 4 +- src/Base/Writer.h | 2 +- src/Base/XMLTools.h | 2 +- src/FCConfig.h | 2 +- src/Gui/Application.cpp | 2 +- src/Gui/Application.h | 4 +- src/Gui/BitmapFactory.cpp | 2 +- src/Gui/BitmapFactory.h | 4 +- src/Gui/CombiView.cpp | 2 +- src/Gui/CombiView.h | 2 +- src/Gui/Command.cpp | 2 +- src/Gui/Command.h | 16 +- src/Gui/CommandDoc.cpp | 2 +- src/Gui/CommandFeat.cpp | 2 +- src/Gui/CommandStd.cpp | 2 +- src/Gui/CommandTest.cpp | 2 +- src/Gui/CommandView.cpp | 2 +- src/Gui/DlgDisplayPropertiesImp.cpp | 2 +- src/Gui/DlgDisplayPropertiesImp.h | 4 +- .../DlgEditFileIncludeProptertyExternal.cpp | 2 +- src/Gui/DlgEditFileIncludeProptertyExternal.h | 4 +- src/Gui/DlgMacroExecuteImp.cpp | 2 +- src/Gui/DlgMacroExecuteImp.h | 4 +- src/Gui/DlgMacroRecordImp.cpp | 2 +- src/Gui/DlgMacroRecordImp.h | 4 +- src/Gui/DlgParameterImp.cpp | 2 +- src/Gui/DlgParameterImp.h | 6 +- src/Gui/DlgPreferencesImp.cpp | 2 +- src/Gui/DlgPreferencesImp.h | 4 +- src/Gui/DlgRunExternal.cpp | 2 +- src/Gui/DlgRunExternal.h | 4 +- src/Gui/DlgSettings3DViewImp.cpp | 2 +- src/Gui/DlgSettings3DViewImp.h | 4 +- src/Gui/DlgSettingsDocumentImp.cpp | 2 +- src/Gui/DlgSettingsDocumentImp.h | 4 +- src/Gui/DlgSettingsMacroImp.cpp | 2 +- src/Gui/DlgSettingsMacroImp.h | 4 +- src/Gui/DlgSettingsUnitsImp.cpp | 2 +- src/Gui/DlgSettingsUnitsImp.h | 4 +- src/Gui/DlgUnitsCalculatorImp.cpp | 2 +- src/Gui/DlgUnitsCalculatorImp.h | 2 +- src/Gui/DockWindow.h | 2 +- src/Gui/Document.cpp | 2 +- src/Gui/Document.h | 4 +- src/Gui/DownloadDialog.cpp | 2 +- src/Gui/DownloadDialog.h | 2 +- src/Gui/GuiConsole.cpp | 2 +- src/Gui/GuiConsole.h | 4 +- src/Gui/InventorAll.h | 2 +- src/Gui/MDIView.h | 2 +- src/Gui/Macro.cpp | 2 +- src/Gui/Macro.h | 4 +- src/Gui/ManualAlignment.cpp | 2 +- src/Gui/MouseSelection.h | 4 +- src/Gui/PreCompiled.cpp | 2 +- src/Gui/PreCompiled.h | 2 +- src/Gui/ProjectView.cpp | 2 +- src/Gui/ProjectView.h | 2 +- src/Gui/PropertyView.h | 2 +- src/Gui/Qt4All.h | 2 +- src/Gui/SelectionView.cpp | 2 +- src/Gui/SelectionView.h | 2 +- src/Gui/SoAxisCrossKit.cpp | 2 +- src/Gui/SoFCSelection.cpp | 2 +- src/Gui/SoFCSelection.h | 4 +- src/Gui/SoFCSelectionAction.cpp | 2 +- src/Gui/SoFCSelectionAction.h | 4 +- src/Gui/SoFCUnifiedSelection.cpp | 2 +- src/Gui/SoFCUnifiedSelection.h | 4 +- src/Gui/TaskDlgRelocation.cpp | 2 +- src/Gui/TaskDlgRelocation.h | 2 +- src/Gui/TaskView/TaskAppearance.cpp | 2 +- src/Gui/TaskView/TaskAppearance.h | 2 +- src/Gui/TaskView/TaskDialog.cpp | 2 +- src/Gui/TaskView/TaskDialog.h | 2 +- src/Gui/TaskView/TaskEditControl.cpp | 2 +- src/Gui/TaskView/TaskEditControl.h | 2 +- src/Gui/TaskView/TaskSelectLinkProperty.cpp | 2 +- src/Gui/TaskView/TaskSelectLinkProperty.h | 2 +- src/Gui/TaskView/TaskView.cpp | 2 +- src/Gui/TaskView/TaskView.h | 2 +- src/Gui/TaskView/TaskWatcher.cpp | 2 +- src/Gui/TaskView/TaskWatcher.h | 2 +- src/Gui/Tree.cpp | 2 +- src/Gui/Tree.h | 4 +- src/Gui/View.cpp | 2 +- src/Gui/View3DInventor.cpp | 2 +- src/Gui/View3DInventorExamples.cpp | 2 +- src/Gui/View3DInventorExamples.h | 2 +- src/Gui/View3DInventorRiftViewer.cpp | 2 +- src/Gui/View3DPy.cpp | 2 +- src/Gui/View3DPy.h | 2 +- src/Gui/ViewProvider.cpp | 2 +- src/Gui/ViewProvider.h | 2 +- src/Gui/ViewProviderDocumentObject.cpp | 2 +- src/Gui/ViewProviderDocumentObject.h | 2 +- src/Gui/ViewProviderExtern.cpp | 2 +- src/Gui/ViewProviderExtern.h | 2 +- src/Gui/ViewProviderFeature.cpp | 2 +- src/Gui/ViewProviderFeature.h | 2 +- src/Gui/ViewProviderMaterialObject.cpp | 2 +- src/Gui/ViewProviderMaterialObject.h | 2 +- src/Gui/ViewProviderPlacement.cpp | 2 +- src/Gui/ViewProviderPlacement.h | 2 +- src/Gui/ViewProviderPlane.cpp | 2 +- src/Gui/ViewProviderPlane.h | 2 +- src/Gui/Window.cpp | 2 +- src/Gui/Window.h | 4 +- src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp | 2 +- src/Gui/iisTaskPanel/src/iisfreecadscheme.h | 2 +- src/Main/MainCmd.cpp | 2 +- src/Main/MainGui.cpp | 2 +- src/Mod/Assembly/App/AppAssembly.cpp | 2 +- src/Mod/Assembly/App/AppAssemblyPy.cpp | 2 +- src/Mod/Assembly/App/PreCompiled.cpp | 2 +- src/Mod/Assembly/App/PreCompiled.h | 2 +- src/Mod/Assembly/Gui/AppAssemblyGui.cpp | 2 +- src/Mod/Assembly/Gui/Command.cpp | 2 +- src/Mod/Assembly/Gui/PreCompiled.cpp | 2 +- src/Mod/Assembly/Gui/PreCompiled.h | 2 +- src/Mod/Cam/App/AppCam.cpp | 2 +- src/Mod/Cam/App/AppCamPy.cpp | 42 +-- src/Mod/Cam/App/Approx.cpp | 6 +- src/Mod/Cam/App/SpringbackCorrection.cpp | 50 +-- src/Mod/Cam/App/UniGridApprox.cpp | 12 +- src/Mod/Cam/App/best_fit.cpp | 42 +-- src/Mod/Cam/App/best_fit.h | 8 +- src/Mod/Cam/App/cutting_tools.cpp | 152 ++++---- src/Mod/Cam/App/cutting_tools.h | 4 +- src/Mod/Cam/App/deviation.cpp | 4 +- src/Mod/Cam/App/path_simulate.cpp | 350 +++++++++--------- src/Mod/Cam/App/path_simulate.h | 4 +- src/Mod/Cam/App/routine.cpp | 8 +- src/Mod/Cam/Gui/Cutting.cpp | 2 +- src/Mod/Complete/App/AppComplete.cpp | 2 +- src/Mod/Complete/App/AppCompletePy.cpp | 2 +- src/Mod/Complete/App/CompleteConfiguration.h | 2 +- src/Mod/Complete/App/PreCompiled.cpp | 2 +- src/Mod/Complete/App/PreCompiled.h | 2 +- src/Mod/Complete/Gui/AppCompleteGui.cpp | 2 +- src/Mod/Complete/Gui/Command.cpp | 2 +- src/Mod/Complete/Gui/PreCompiled.cpp | 2 +- src/Mod/Complete/Gui/PreCompiled.h | 2 +- src/Mod/Drawing/App/AppDrawing.cpp | 2 +- src/Mod/Drawing/App/AppDrawingPy.cpp | 2 +- src/Mod/Drawing/App/FeaturePage.cpp | 2 +- src/Mod/Drawing/App/FeaturePage.h | 2 +- src/Mod/Drawing/App/FeatureView.cpp | 2 +- src/Mod/Drawing/App/FeatureView.h | 2 +- src/Mod/Drawing/App/FeatureViewPart.cpp | 2 +- src/Mod/Drawing/App/FeatureViewPart.h | 2 +- src/Mod/Drawing/App/PageGroup.cpp | 2 +- src/Mod/Drawing/App/PageGroup.h | 2 +- src/Mod/Drawing/App/PreCompiled.cpp | 2 +- src/Mod/Drawing/App/PreCompiled.h | 2 +- src/Mod/Drawing/App/ProjectionAlgos.cpp | 2 +- src/Mod/Drawing/App/ProjectionAlgos.h | 2 +- src/Mod/Drawing/Gui/AppDrawingGui.cpp | 2 +- src/Mod/Drawing/Gui/DrawingView.cpp | 2 +- src/Mod/Drawing/Gui/DrawingView.h | 2 +- src/Mod/Drawing/Gui/PreCompiled.cpp | 2 +- src/Mod/Drawing/Gui/PreCompiled.h | 2 +- src/Mod/Drawing/Gui/ViewProviderPage.cpp | 2 +- src/Mod/Drawing/Gui/ViewProviderPage.h | 2 +- src/Mod/Drawing/Gui/ViewProviderView.cpp | 2 +- src/Mod/Drawing/Gui/ViewProviderView.h | 2 +- src/Mod/Fem/App/AppFem.cpp | 2 +- src/Mod/Fem/App/AppFemPy.cpp | 10 +- src/Mod/Fem/App/FemAnalysis.cpp | 2 +- src/Mod/Fem/App/FemAnalysis.h | 2 +- src/Mod/Fem/App/FemMesh.cpp | 10 +- src/Mod/Fem/App/FemMesh.h | 2 +- src/Mod/Fem/App/FemMeshObject.cpp | 2 +- src/Mod/Fem/App/FemMeshObject.h | 2 +- src/Mod/Fem/App/FemMeshProperty.cpp | 2 +- src/Mod/Fem/App/FemMeshProperty.h | 2 +- src/Mod/Fem/App/FemMeshPyImp.cpp | 2 +- src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp | 2 +- src/Mod/Fem/App/FemMeshShapeNetgenObject.h | 2 +- src/Mod/Fem/App/FemMeshShapeObject.cpp | 2 +- src/Mod/Fem/App/FemMeshShapeObject.h | 2 +- src/Mod/Fem/App/FemResultObject.cpp | 2 +- src/Mod/Fem/App/FemResultObject.h | 2 +- src/Mod/Fem/App/FemSetElementsObject.cpp | 2 +- src/Mod/Fem/App/FemSetElementsObject.h | 2 +- src/Mod/Fem/App/FemSetFacesObject.cpp | 2 +- src/Mod/Fem/App/FemSetFacesObject.h | 2 +- src/Mod/Fem/App/FemSetGeometryObject.cpp | 2 +- src/Mod/Fem/App/FemSetGeometryObject.h | 2 +- src/Mod/Fem/App/FemSetNodesObject.cpp | 2 +- src/Mod/Fem/App/FemSetNodesObject.h | 2 +- src/Mod/Fem/App/FemSetObject.cpp | 2 +- src/Mod/Fem/App/FemSetObject.h | 2 +- src/Mod/Fem/App/PreCompiled.cpp | 2 +- src/Mod/Fem/App/PreCompiled.h | 2 +- src/Mod/Fem/Gui/AppFemGui.cpp | 2 +- src/Mod/Fem/Gui/Command.cpp | 2 +- src/Mod/Fem/Gui/FemSelectionGate.cpp | 2 +- src/Mod/Fem/Gui/FemSelectionGate.h | 2 +- src/Mod/Fem/Gui/PreCompiled.cpp | 2 +- src/Mod/Fem/Gui/PreCompiled.h | 2 +- src/Mod/Fem/Gui/TaskAnalysisInfo.cpp | 2 +- src/Mod/Fem/Gui/TaskAnalysisInfo.h | 2 +- src/Mod/Fem/Gui/TaskCreateNodeSet.cpp | 2 +- src/Mod/Fem/Gui/TaskCreateNodeSet.h | 2 +- src/Mod/Fem/Gui/TaskDlgAnalysis.cpp | 2 +- src/Mod/Fem/Gui/TaskDlgAnalysis.h | 2 +- src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp | 2 +- src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h | 2 +- src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp | 2 +- src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h | 2 +- src/Mod/Fem/Gui/TaskDriver.cpp | 2 +- src/Mod/Fem/Gui/TaskDriver.h | 2 +- src/Mod/Fem/Gui/TaskObjectName.cpp | 2 +- src/Mod/Fem/Gui/TaskObjectName.h | 2 +- src/Mod/Fem/Gui/TaskTetParameter.cpp | 2 +- src/Mod/Fem/Gui/TaskTetParameter.h | 2 +- src/Mod/Fem/Gui/ViewProviderAnalysis.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderAnalysis.h | 2 +- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemMesh.h | 2 +- src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemMeshShape.h | 2 +- .../Gui/ViewProviderFemMeshShapeNetgen.cpp | 2 +- .../Fem/Gui/ViewProviderFemMeshShapeNetgen.h | 2 +- src/Mod/Fem/Gui/ViewProviderResult.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderResult.h | 2 +- src/Mod/Fem/Gui/ViewProviderSetElements.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSetElements.h | 2 +- src/Mod/Fem/Gui/ViewProviderSetFaces.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSetFaces.h | 2 +- src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSetGeometry.h | 2 +- src/Mod/Fem/Gui/ViewProviderSetNodes.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSetNodes.h | 2 +- src/Mod/Image/App/AppImage.cpp | 2 +- src/Mod/Image/App/ImagePlane.cpp | 2 +- src/Mod/Image/App/ImagePlane.h | 2 +- src/Mod/Image/App/PreCompiled.cpp | 2 +- src/Mod/Image/App/PreCompiled.h | 2 +- src/Mod/Image/Gui/AppImageGui.cpp | 2 +- src/Mod/Image/Gui/Command.cpp | 2 +- src/Mod/Image/Gui/PreCompiled.cpp | 2 +- src/Mod/Image/Gui/PreCompiled.h | 2 +- src/Mod/Image/Gui/ViewProviderImagePlane.cpp | 2 +- src/Mod/Image/Gui/ViewProviderImagePlane.h | 2 +- src/Mod/Import/App/AppImport.cpp | 2 +- src/Mod/Import/App/FeatureImportIges.cpp | 2 +- src/Mod/Import/App/FeatureImportIges.h | 2 +- src/Mod/Import/App/FeatureImportStep.cpp | 2 +- src/Mod/Import/App/FeatureImportStep.h | 2 +- src/Mod/Import/App/PreCompiled.cpp | 2 +- src/Mod/Import/App/PreCompiled.h | 2 +- src/Mod/Import/App/StepShape.cpp | 2 +- src/Mod/Import/App/StepShape.h | 2 +- src/Mod/Import/Gui/AppImportGui.cpp | 2 +- src/Mod/Import/Gui/Command.cpp | 2 +- src/Mod/Import/Gui/PreCompiled.cpp | 2 +- src/Mod/Import/Gui/PreCompiled.h | 2 +- src/Mod/Mesh/App/Core/Approximation.h | 40 +- src/Mod/Mesh/App/Core/Degeneration.cpp | 4 +- src/Mod/Mesh/App/Core/Degeneration.h | 2 +- src/Mod/Mesh/App/Core/Elements.cpp | 6 +- src/Mod/Mesh/App/Core/Elements.h | 4 +- src/Mod/Mesh/App/MeshPointPyImp.cpp | 2 +- src/Mod/MeshPart/App/AppMeshPart.cpp | 2 +- src/Mod/MeshPart/App/AppMeshPartPy.cpp | 2 +- src/Mod/MeshPart/App/PreCompiled.cpp | 2 +- src/Mod/MeshPart/App/PreCompiled.h | 2 +- src/Mod/MeshPart/Gui/AppMeshPartGui.cpp | 2 +- src/Mod/MeshPart/Gui/Command.cpp | 2 +- src/Mod/MeshPart/Gui/PreCompiled.cpp | 2 +- src/Mod/MeshPart/Gui/PreCompiled.h | 2 +- src/Mod/Part/App/AppPart.cpp | 2 +- src/Mod/Part/App/AppPartPy.cpp | 2 +- src/Mod/Part/App/FeatureGeometrySet.cpp | 2 +- src/Mod/Part/App/FeatureGeometrySet.h | 2 +- src/Mod/Part/App/FeaturePartBox.cpp | 2 +- src/Mod/Part/App/FeaturePartBox.h | 2 +- src/Mod/Part/App/FeaturePartCurveNet.cpp | 2 +- src/Mod/Part/App/FeaturePartCurveNet.h | 2 +- src/Mod/Part/App/FeaturePartCut.cpp | 2 +- src/Mod/Part/App/FeaturePartCut.h | 2 +- src/Mod/Part/App/FeaturePartImportBrep.cpp | 2 +- src/Mod/Part/App/FeaturePartImportBrep.h | 2 +- src/Mod/Part/App/FeaturePartImportIges.cpp | 2 +- src/Mod/Part/App/FeaturePartImportIges.h | 2 +- src/Mod/Part/App/FeaturePartImportStep.cpp | 2 +- src/Mod/Part/App/FeaturePartImportStep.h | 2 +- src/Mod/Part/App/ImportStep.cpp | 2 +- src/Mod/Part/App/ImportStep.h | 2 +- src/Mod/Part/App/Part2DObject.cpp | 2 +- src/Mod/Part/App/Part2DObject.h | 2 +- src/Mod/Part/App/PartFeature.cpp | 2 +- src/Mod/Part/App/PartFeature.h | 2 +- src/Mod/Part/App/PartFeatureReference.cpp | 2 +- src/Mod/Part/App/PartFeatureReference.h | 2 +- src/Mod/Part/App/PreCompiled.cpp | 2 +- src/Mod/Part/App/PreCompiled.h | 2 +- src/Mod/Part/App/PropertyGeometryList.cpp | 2 +- src/Mod/Part/App/PropertyGeometryList.h | 2 +- src/Mod/Part/App/PropertyTopoShape.cpp | 2 +- src/Mod/Part/App/PropertyTopoShape.h | 2 +- src/Mod/Part/App/TopoShape.h | 2 +- src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeCompoundPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeEdgePyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeFacePyImp.cpp | 2 +- src/Mod/Part/App/TopoShapePyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeShellPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeSolidPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeVertexPyImp.cpp | 2 +- src/Mod/Part/App/TopoShapeWirePyImp.cpp | 2 +- src/Mod/Part/App/TopologyPy.cpp | 2 +- src/Mod/Part/App/TopologyPy.h | 2 +- src/Mod/Part/Gui/Command.cpp | 2 +- src/Mod/Part/Gui/CommandParametric.cpp | 2 +- src/Mod/Part/Gui/CommandSimple.cpp | 2 +- src/Mod/Part/Gui/DlgPartBoxImp.cpp | 2 +- src/Mod/Part/Gui/DlgPartBoxImp.h | 2 +- src/Mod/Part/Gui/DlgPartCylinderImp.cpp | 2 +- src/Mod/Part/Gui/DlgPartCylinderImp.h | 2 +- src/Mod/Part/Gui/DlgPartImportIgesImp.cpp | 2 +- src/Mod/Part/Gui/DlgPartImportIgesImp.h | 2 +- src/Mod/Part/Gui/DlgPartImportStepImp.cpp | 2 +- src/Mod/Part/Gui/DlgPartImportStepImp.h | 2 +- src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp | 2 +- src/Mod/Part/Gui/DlgSettings3DViewPartImp.h | 4 +- src/Mod/Part/Gui/PreCompiled.cpp | 2 +- src/Mod/Part/Gui/PreCompiled.h | 2 +- src/Mod/Part/Gui/ViewProvider.h | 2 +- src/Mod/Part/Gui/ViewProvider2DObject.cpp | 2 +- src/Mod/Part/Gui/ViewProvider2DObject.h | 2 +- src/Mod/Part/Gui/ViewProviderBox.cpp | 2 +- src/Mod/Part/Gui/ViewProviderBox.h | 2 +- .../Part/Gui/ViewProviderCircleParametric.cpp | 2 +- .../Part/Gui/ViewProviderCircleParametric.h | 2 +- .../Part/Gui/ViewProviderConeParametric.cpp | 2 +- src/Mod/Part/Gui/ViewProviderConeParametric.h | 2 +- src/Mod/Part/Gui/ViewProviderCurveNet.cpp | 2 +- src/Mod/Part/Gui/ViewProviderCurveNet.h | 2 +- .../Gui/ViewProviderCylinderParametric.cpp | 2 +- .../Part/Gui/ViewProviderCylinderParametric.h | 2 +- .../Part/Gui/ViewProviderEllipseParametric.h | 2 +- .../Part/Gui/ViewProviderHelixParametric.h | 2 +- src/Mod/Part/Gui/ViewProviderImport.cpp | 2 +- src/Mod/Part/Gui/ViewProviderImport.h | 2 +- .../Part/Gui/ViewProviderLineParametric.cpp | 2 +- src/Mod/Part/Gui/ViewProviderLineParametric.h | 2 +- .../Part/Gui/ViewProviderPlaneParametric.cpp | 2 +- .../Part/Gui/ViewProviderPlaneParametric.h | 2 +- .../Part/Gui/ViewProviderPointParametric.h | 2 +- src/Mod/Part/Gui/ViewProviderReference.h | 2 +- src/Mod/Part/Gui/ViewProviderRuledSurface.cpp | 2 +- src/Mod/Part/Gui/ViewProviderRuledSurface.h | 2 +- .../Part/Gui/ViewProviderSphereParametric.cpp | 2 +- .../Part/Gui/ViewProviderSphereParametric.h | 2 +- .../Part/Gui/ViewProviderTorusParametric.cpp | 2 +- .../Part/Gui/ViewProviderTorusParametric.h | 2 +- src/Mod/PartDesign/App/AppPartDesign.cpp | 2 +- src/Mod/PartDesign/App/AppPartDesignPy.cpp | 2 +- src/Mod/PartDesign/App/PreCompiled.cpp | 2 +- src/Mod/PartDesign/App/PreCompiled.h | 2 +- src/Mod/PartDesign/Gui/AppPartDesignGui.cpp | 2 +- src/Mod/PartDesign/Gui/AppPartDesignGuiPy.cpp | 2 +- src/Mod/PartDesign/Gui/Command.cpp | 2 +- src/Mod/PartDesign/Gui/PreCompiled.cpp | 2 +- src/Mod/PartDesign/Gui/PreCompiled.h | 2 +- .../Gui/TaskTransformedMessages.cpp | 2 +- .../PartDesign/Gui/TaskTransformedMessages.h | 2 +- src/Mod/Path/libarea/clipper.cpp | 8 +- src/Mod/Points/App/PreCompiled.cpp | 2 +- src/Mod/Points/App/PreCompiled.h | 2 +- src/Mod/Points/Gui/AppPointsGui.cpp | 2 +- src/Mod/Points/Gui/DlgPointsReadImp.cpp | 2 +- src/Mod/Points/Gui/DlgPointsReadImp.h | 2 +- src/Mod/Points/Gui/PreCompiled.cpp | 2 +- src/Mod/Points/Gui/PreCompiled.h | 2 +- src/Mod/Raytracing/App/LuxTools.cpp | 2 +- src/Mod/Raytracing/App/LuxTools.h | 2 +- src/Mod/Raytracing/App/PovTools.cpp | 2 +- src/Mod/Raytracing/App/PovTools.h | 2 +- src/Mod/Raytracing/App/PreCompiled.cpp | 2 +- src/Mod/Raytracing/App/PreCompiled.h | 2 +- src/Mod/Raytracing/App/RayFeature.cpp | 2 +- src/Mod/Raytracing/App/RayFeature.h | 2 +- src/Mod/Raytracing/App/RayProject.cpp | 2 +- src/Mod/Raytracing/App/RayProject.h | 2 +- src/Mod/Raytracing/App/RaySegment.cpp | 2 +- src/Mod/Raytracing/App/RaySegment.h | 2 +- src/Mod/Raytracing/Gui/AppRaytracingGui.cpp | 2 +- src/Mod/Raytracing/Gui/Command.cpp | 2 +- src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp | 2 +- src/Mod/Raytracing/Gui/DlgSettingsRayImp.h | 4 +- src/Mod/Raytracing/Gui/PreCompiled.cpp | 2 +- src/Mod/Raytracing/Gui/PreCompiled.h | 2 +- .../App/AppReverseEngineering.cpp | 2 +- .../App/AppReverseEngineeringPy.cpp | 2 +- .../ReverseEngineering/App/ApproxSurface.cpp | 24 +- .../ReverseEngineering/App/ApproxSurface.h | 96 ++--- .../ReverseEngineering/App/PreCompiled.cpp | 2 +- src/Mod/ReverseEngineering/App/PreCompiled.h | 2 +- .../Gui/AppReverseEngineeringGui.cpp | 2 +- src/Mod/ReverseEngineering/Gui/Command.cpp | 2 +- .../ReverseEngineering/Gui/PreCompiled.cpp | 2 +- src/Mod/ReverseEngineering/Gui/PreCompiled.h | 2 +- src/Mod/Robot/App/AppRobot.cpp | 2 +- src/Mod/Robot/App/AppRobotPy.cpp | 2 +- src/Mod/Robot/App/Edge2TracObject.cpp | 2 +- src/Mod/Robot/App/Edge2TracObject.h | 2 +- src/Mod/Robot/App/PreCompiled.cpp | 2 +- src/Mod/Robot/App/PreCompiled.h | 2 +- src/Mod/Robot/App/PropertyTrajectory.cpp | 2 +- src/Mod/Robot/App/PropertyTrajectory.h | 2 +- src/Mod/Robot/App/Robot6Axis.cpp | 2 +- src/Mod/Robot/App/Robot6Axis.h | 12 +- src/Mod/Robot/App/Robot6AxisPyImp.cpp | 2 +- src/Mod/Robot/App/RobotAlgos.cpp | 2 +- src/Mod/Robot/App/RobotAlgos.h | 2 +- src/Mod/Robot/App/RobotObject.cpp | 2 +- src/Mod/Robot/App/RobotObject.h | 2 +- src/Mod/Robot/App/RobotObjectPyImp.cpp | 2 +- src/Mod/Robot/App/Simulation.cpp | 2 +- src/Mod/Robot/App/Simulation.h | 2 +- src/Mod/Robot/App/Trajectory.cpp | 2 +- src/Mod/Robot/App/Trajectory.h | 2 +- src/Mod/Robot/App/TrajectoryCompound.cpp | 2 +- src/Mod/Robot/App/TrajectoryCompound.h | 2 +- src/Mod/Robot/App/TrajectoryDressUpObject.cpp | 2 +- src/Mod/Robot/App/TrajectoryDressUpObject.h | 2 +- src/Mod/Robot/App/TrajectoryObject.cpp | 2 +- src/Mod/Robot/App/TrajectoryObject.h | 2 +- src/Mod/Robot/App/TrajectoryPyImp.cpp | 2 +- src/Mod/Robot/App/Waypoint.cpp | 2 +- src/Mod/Robot/App/Waypoint.h | 2 +- src/Mod/Robot/App/WaypointPyImp.cpp | 2 +- src/Mod/Robot/Gui/AppRobotGui.cpp | 2 +- src/Mod/Robot/Gui/Command.cpp | 2 +- src/Mod/Robot/Gui/CommandExport.cpp | 2 +- src/Mod/Robot/Gui/CommandInsertRobot.cpp | 2 +- src/Mod/Robot/Gui/CommandTrajectory.cpp | 2 +- src/Mod/Robot/Gui/PreCompiled.cpp | 2 +- src/Mod/Robot/Gui/PreCompiled.h | 2 +- src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp | 2 +- src/Mod/Robot/Gui/TaskDlgEdge2Trac.h | 2 +- src/Mod/Robot/Gui/TaskDlgSimulate.cpp | 2 +- src/Mod/Robot/Gui/TaskDlgSimulate.h | 2 +- .../Robot/Gui/TaskDlgTrajectoryCompound.cpp | 2 +- src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h | 2 +- .../Robot/Gui/TaskDlgTrajectoryDressUp.cpp | 2 +- src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h | 2 +- src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp | 2 +- src/Mod/Robot/Gui/TaskEdge2TracParameter.h | 2 +- src/Mod/Robot/Gui/TaskRobot6Axis.cpp | 20 +- src/Mod/Robot/Gui/TaskRobot6Axis.h | 2 +- src/Mod/Robot/Gui/TaskRobotControl.cpp | 2 +- src/Mod/Robot/Gui/TaskRobotControl.h | 2 +- src/Mod/Robot/Gui/TaskRobotMessages.cpp | 2 +- src/Mod/Robot/Gui/TaskRobotMessages.h | 2 +- src/Mod/Robot/Gui/TaskTrajectory.cpp | 2 +- src/Mod/Robot/Gui/TaskTrajectory.h | 2 +- .../Gui/TaskTrajectoryDressUpParameter.cpp | 2 +- .../Gui/TaskTrajectoryDressUpParameter.h | 2 +- src/Mod/Robot/Gui/TaskWatcher.cpp | 2 +- src/Mod/Robot/Gui/TaskWatcher.h | 2 +- src/Mod/Robot/Gui/TrajectorySimulate.cpp | 2 +- src/Mod/Robot/Gui/TrajectorySimulate.h | 2 +- .../Robot/Gui/ViewProviderEdge2TracObject.cpp | 2 +- .../Robot/Gui/ViewProviderEdge2TracObject.h | 2 +- src/Mod/Robot/Gui/ViewProviderRobotObject.cpp | 2 +- src/Mod/Robot/Gui/ViewProviderRobotObject.h | 2 +- src/Mod/Robot/Gui/ViewProviderTrajectory.cpp | 2 +- src/Mod/Robot/Gui/ViewProviderTrajectory.h | 2 +- .../Gui/ViewProviderTrajectoryCompound.cpp | 2 +- .../Gui/ViewProviderTrajectoryCompound.h | 2 +- .../Gui/ViewProviderTrajectoryDressUp.cpp | 2 +- .../Robot/Gui/ViewProviderTrajectoryDressUp.h | 2 +- src/Mod/Sandbox/Gui/TaskPanelView.cpp | 2 +- src/Mod/Sandbox/Gui/TaskPanelView.h | 2 +- src/Mod/Sketcher/App/AppSketcher.cpp | 2 +- src/Mod/Sketcher/App/AppSketcherPy.cpp | 2 +- src/Mod/Sketcher/App/Constraint.cpp | 2 +- src/Mod/Sketcher/App/Constraint.h | 2 +- src/Mod/Sketcher/App/ConstraintPyImp.cpp | 2 +- src/Mod/Sketcher/App/PreCompiled.cpp | 2 +- src/Mod/Sketcher/App/PreCompiled.h | 2 +- .../Sketcher/App/PropertyConstraintList.cpp | 2 +- src/Mod/Sketcher/App/PropertyConstraintList.h | 2 +- src/Mod/Sketcher/App/Sketch.h | 2 +- src/Mod/Sketcher/App/SketchObject.cpp | 2 +- src/Mod/Sketcher/App/SketchObjectPyImp.cpp | 2 +- src/Mod/Sketcher/App/SketchObjectSF.cpp | 2 +- src/Mod/Sketcher/App/SketchObjectSF.h | 2 +- src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp | 2 +- src/Mod/Sketcher/App/SketchPyImp.cpp | 2 +- src/Mod/Sketcher/Gui/AppSketcherGui.cpp | 2 +- src/Mod/Sketcher/Gui/Command.cpp | 2 +- src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp | 2 +- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 2 +- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 2 +- src/Mod/Sketcher/Gui/DrawSketchHandler.cpp | 2 +- src/Mod/Sketcher/Gui/DrawSketchHandler.h | 2 +- src/Mod/Sketcher/Gui/PreCompiled.cpp | 2 +- src/Mod/Sketcher/Gui/PreCompiled.h | 2 +- .../Sketcher/Gui/SketchOrientationDialog.cpp | 2 +- .../Sketcher/Gui/SketchOrientationDialog.h | 2 +- src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp | 2 +- src/Mod/Sketcher/Gui/TaskDlgEditSketch.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherConstrains.h | 2 +- .../Gui/TaskSketcherCreateCommands.cpp | 2 +- .../Sketcher/Gui/TaskSketcherCreateCommands.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 2 +- src/Mod/Sketcher/Gui/TaskSketcherGeneral.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp | 2 +- src/Mod/Sketcher/Gui/TaskSketcherMessages.h | 2 +- src/Mod/Sketcher/Gui/Workbench.cpp | 2 +- src/Mod/Spreadsheet/App/PreCompiled.cpp | 2 +- src/Mod/Spreadsheet/App/PreCompiled.h | 2 +- src/Mod/Spreadsheet/Gui/Command.cpp | 2 +- src/Mod/Spreadsheet/Gui/PreCompiled.cpp | 2 +- src/Mod/Spreadsheet/Gui/PreCompiled.h | 2 +- src/Mod/Start/App/AppStart.cpp | 2 +- src/Mod/Start/App/AppStartPy.cpp | 2 +- src/Mod/Start/App/PreCompiled.cpp | 2 +- src/Mod/Start/App/PreCompiled.h | 2 +- src/Mod/Start/App/StartConfiguration.h | 2 +- src/Mod/Start/Gui/AppStartGui.cpp | 2 +- src/Mod/Start/Gui/Command.cpp | 2 +- src/Mod/Start/Gui/PreCompiled.cpp | 2 +- src/Mod/Start/Gui/PreCompiled.h | 2 +- src/Mod/Web/Gui/AppWebGui.cpp | 2 +- src/Mod/Web/Gui/BrowserView.cpp | 2 +- src/Mod/Web/Gui/BrowserView.h | 2 +- src/Mod/Web/Gui/Command.cpp | 2 +- src/Mod/Web/Gui/PreCompiled.cpp | 2 +- src/Mod/Web/Gui/PreCompiled.h | 2 +- src/Tools/ImageTools/ImageConv/main.cpp | 2 +- src/Tools/MakeNewBuildNbr.py | 4 +- src/Tools/generate.py | 2 +- src/Tools/thumbs/ThumbnailProvider/FCConfig.h | 2 +- src/zipios++/backbuffer.h | 2 +- src/zipios++/basicentry.cpp | 2 +- src/zipios++/basicentry.h | 2 +- src/zipios++/collcoll.cpp | 2 +- src/zipios++/collcoll.h | 2 +- src/zipios++/deflateoutputstreambuf.cpp | 2 +- src/zipios++/deflateoutputstreambuf.h | 2 +- src/zipios++/dircoll.cpp | 2 +- src/zipios++/dircoll.h | 2 +- src/zipios++/fcoll.cpp | 2 +- src/zipios++/fcoll.h | 2 +- src/zipios++/fcollexceptions.cpp | 2 +- src/zipios++/fcollexceptions.h | 2 +- src/zipios++/fileentry.cpp | 2 +- src/zipios++/fileentry.h | 2 +- src/zipios++/filepath.cpp | 2 +- src/zipios++/filepath.h | 2 +- src/zipios++/filterinputstreambuf.cpp | 2 +- src/zipios++/filterinputstreambuf.h | 2 +- src/zipios++/filteroutputstreambuf.cpp | 2 +- src/zipios++/filteroutputstreambuf.h | 2 +- src/zipios++/gzipoutputstream.cpp | 2 +- src/zipios++/gzipoutputstream.h | 2 +- src/zipios++/gzipoutputstreambuf.cpp | 2 +- src/zipios++/gzipoutputstreambuf.h | 2 +- src/zipios++/inflateinputstreambuf.cpp | 2 +- src/zipios++/inflateinputstreambuf.h | 2 +- src/zipios++/meta-iostreams.h | 2 +- src/zipios++/outputstringstream.h | 2 +- src/zipios++/simplesmartptr.h | 2 +- src/zipios++/virtualseeker.h | 2 +- src/zipios++/zipfile.cpp | 2 +- src/zipios++/zipfile.h | 2 +- src/zipios++/ziphead.cpp | 2 +- src/zipios++/ziphead.h | 2 +- src/zipios++/zipheadio.cpp | 2 +- src/zipios++/zipheadio.h | 2 +- src/zipios++/zipinputstream.cpp | 2 +- src/zipios++/zipinputstream.h | 2 +- src/zipios++/zipinputstreambuf.cpp | 2 +- src/zipios++/zipinputstreambuf.h | 2 +- src/zipios++/zipios-config.h | 2 +- src/zipios++/zipios_common.h | 2 +- src/zipios++/zipios_defs.h | 2 +- src/zipios++/zipoutputstream.cpp | 2 +- src/zipios++/zipoutputstream.h | 2 +- src/zipios++/zipoutputstreambuf.cpp | 2 +- src/zipios++/zipoutputstreambuf.h | 2 +- 674 files changed, 1154 insertions(+), 1154 deletions(-) mode change 100755 => 100644 src/Mod/Fem/App/AppFem.cpp mode change 100755 => 100644 src/Mod/Fem/App/AppFemPy.cpp mode change 100755 => 100644 src/Mod/Fem/App/FemMesh.cpp mode change 100755 => 100644 src/Mod/Fem/App/FemMesh.h mode change 100755 => 100644 src/Mod/Fem/App/FemMeshObject.cpp mode change 100755 => 100644 src/Mod/Fem/App/FemMeshObject.h mode change 100755 => 100644 src/Mod/Fem/App/FemMeshProperty.cpp mode change 100755 => 100644 src/Mod/Fem/App/FemMeshProperty.h mode change 100755 => 100644 src/Mod/Fem/App/FemMeshPyImp.cpp mode change 100755 => 100644 src/Mod/Fem/App/PreCompiled.cpp mode change 100755 => 100644 src/Mod/Fem/App/PreCompiled.h mode change 100755 => 100644 src/Mod/Fem/Gui/AppFemGui.cpp mode change 100755 => 100644 src/Mod/Fem/Gui/Command.cpp mode change 100755 => 100644 src/Mod/Fem/Gui/PreCompiled.cpp mode change 100755 => 100644 src/Mod/Fem/Gui/PreCompiled.h mode change 100755 => 100644 src/Mod/Fem/Gui/ViewProviderFemMesh.cpp mode change 100755 => 100644 src/Mod/Fem/Gui/ViewProviderFemMesh.h diff --git a/src/3rdParty/CxImage/CxImage/ximadsp.cpp b/src/3rdParty/CxImage/CxImage/ximadsp.cpp index 68695db813..839314cdb1 100644 --- a/src/3rdParty/CxImage/CxImage/ximadsp.cpp +++ b/src/3rdParty/CxImage/CxImage/ximadsp.cpp @@ -3319,7 +3319,7 @@ int CxImage::OptimalThreshold(long method, RECT * pBox, CxImage* pContrastMask) } //potential difference (based on Electrostatic Binarization method by J. Acharya & G. Sreechakra) - // L=-fabs(vdiff/vsum); è molto selettivo, sembra che L=-fabs(vdiff) o L=-(vsum) + // L=-fabs(vdiff/vsum); è molto selettivo, sembra che L=-fabs(vdiff) o L=-(vsum) // abbiano lo stesso valore di soglia... il che semplificherebbe molto la routine double vdiff = 0; for (k=gray_min;k<=i;k++) diff --git a/src/3rdParty/CxImage/CxImage/ximainfo.cpp b/src/3rdParty/CxImage/CxImage/ximainfo.cpp index fd453f2f77..4ee9f13775 100644 --- a/src/3rdParty/CxImage/CxImage/ximainfo.cpp +++ b/src/3rdParty/CxImage/CxImage/ximainfo.cpp @@ -538,7 +538,7 @@ void CxImage::SetOffset(long x,long y) //////////////////////////////////////////////////////////////////////////////// /** * \sa SetJpegQuality, GetJpegQualityF - * \author [DP]; changes [Stefan Schürmans] + * \author [DP]; changes [Stefan Schürmans] */ BYTE CxImage::GetJpegQuality() const { @@ -547,7 +547,7 @@ BYTE CxImage::GetJpegQuality() const //////////////////////////////////////////////////////////////////////////////// /** * \sa SetJpegQuality, GetJpegQuality - * \author [Stefan Schürmans] + * \author [Stefan Schürmans] */ float CxImage::GetJpegQualityF() const { @@ -557,7 +557,7 @@ float CxImage::GetJpegQualityF() const /** * quality level for JPEG and JPEG2000 * \param q: can be from 0 to 100 - * \author [DP]; changes [Stefan Schürmans] + * \author [DP]; changes [Stefan Schürmans] */ void CxImage::SetJpegQuality(BYTE q){ info.fQuality = (float)q; @@ -567,7 +567,7 @@ void CxImage::SetJpegQuality(BYTE q){ * quality level for JPEG and JPEG2000 * necessary for JPEG2000 when quality is between 0.0 and 1.0 * \param q: can be from 0.0 to 100.0 - * \author [Stefan Schürmans] + * \author [Stefan Schürmans] */ void CxImage::SetJpegQualityF(float q){ if (q>0) info.fQuality = q; diff --git a/src/3rdParty/CxImage/CxImage/ximaint.cpp b/src/3rdParty/CxImage/CxImage/ximaint.cpp index 89e1bacc9e..20b3c68b6a 100644 --- a/src/3rdParty/CxImage/CxImage/ximaint.cpp +++ b/src/3rdParty/CxImage/CxImage/ximaint.cpp @@ -689,7 +689,7 @@ float CxImage::KernelBSpline(const float x) return (0.16666666666666666667f * (a - (4.0f * b) + (6.0f * c) - (4.0f * d))); - /* equivalent + /* equivalent if (x < -2.0) return(0.0f); if (x < -1.0) @@ -722,7 +722,7 @@ float CxImage::KernelLinear(const float t) // if (-1<=t && t<0) return 1+t; // return 0; - // + // if (t < -1.0f) return 0.0f; if (t < 0.0f) diff --git a/src/3rdParty/CxImage/CxImage/ximawnd.cpp b/src/3rdParty/CxImage/CxImage/ximawnd.cpp index 9e75a37737..8b9249ad69 100644 --- a/src/3rdParty/CxImage/CxImage/ximawnd.cpp +++ b/src/3rdParty/CxImage/CxImage/ximawnd.cpp @@ -230,7 +230,7 @@ bool CxImage::CreateFromHANDLE(HANDLE hMem) SetYDPI((long)floor(head.biYPelsPerMeter * 254.0 / 10000.0 + 0.5)); /*//copy the pixels (old way) - if((pHead->biCompression != BI_RGB) || (pHead->biBitCount == 32)){ // + if((pHead->biCompression != BI_RGB) || (pHead->biBitCount == 32)){ // // BITFIELD case // set the internal header in the dib memcpy(pDib,&head,sizeof(head)); @@ -1378,7 +1378,7 @@ void CxImage::InitTextInfo( CXTEXTINFO *txt ) txt->b_outline = 0; // default: no outline (OUTLINE NOT IMPLEMENTED AT THIS TIME) txt->b_round = 20; // default: rounding radius is 20% of the rectangle height // the text - _stprintf( txt->text, _T("Sample Text 01234õû")); // text use TCHAR mappings + _stprintf( txt->text, _T("Sample Text 01234õû")); // text use TCHAR mappings txt->align = DT_CENTER; return; } diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_Octree.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Octree.cpp index 63457088e7..01fde5160e 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_Octree.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_Octree.cpp @@ -22,7 +22,7 @@ // SMESH SMESH_Octree : global Octree implementation // File : SMESH_Octree.cxx // Created : Tue Jan 16 16:00:00 2007 -// Author : Nicolas Geimer & Aurélien Motteux(OCC) +// Author : Nicolas Geimer & Aurélien Motteux(OCC) // Module : SMESH // #include "SMESH_Octree.hxx" diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp index 9a74d71bd7..926b387ff1 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp @@ -24,7 +24,7 @@ // // File : SMESH_OctreeNode.cxx // Created : Tue Jan 16 16:00:00 2007 -// Author : Nicolas Geimer & Aurélien Motteux (OCC) +// Author : Nicolas Geimer & Aurélien Motteux (OCC) // Module : SMESH #include "SMESH_OctreeNode.hxx" diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Hexa_3D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Hexa_3D.cpp index 8eb1ae4b01..622d4106e9 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Hexa_3D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Hexa_3D.cpp @@ -200,9 +200,9 @@ static bool findIJ (const SMDS_MeshNode* node, const FaceQuadStruct * quad, int& * -0. - shape and face mesh verification * -1. - identify faces and vertices of the "cube" * -2. - Algorithm from: - * "Application de l'interpolation transfinie à la création de maillages + * "Application de l'interpolation transfinie à la création de maillages * C0 ou G1 continus sur des triangles, quadrangles, tetraedres, pentaedres - * et hexaedres déformés." + * et hexaedres déformés." * Alain PERONNET - 8 janvier 1999 */ //============================================================================= diff --git a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp index cfa3a44c98..98729b8500 100644 --- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp +++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp @@ -812,10 +812,10 @@ bool StdMeshers_Quadrangle_2D::SetNormalizedGrid (SMESH_Mesh & aMesh, const TopoDS_Shape& aShape, FaceQuadStruct* & quad) //throw (SMESH_Exception) { - // Algorithme décrit dans "Génération automatique de maillages" - // P.L. GEORGE, MASSON, § 6.4.1 p. 84-85 - // traitement dans le domaine paramétrique 2d u,v - // transport - projection sur le carré unité + // Algorithme décrit dans "Génération automatique de maillages" + // P.L. GEORGE, MASSON, § 6.4.1 p. 84-85 + // traitement dans le domaine paramétrique 2d u,v + // transport - projection sur le carré unité // MESSAGE("StdMeshers_Quadrangle_2D::SetNormalizedGrid"); // const TopoDS_Face& F = TopoDS::Face(aShape); diff --git a/src/App/Application.h b/src/App/Application.h index b1e64c213e..fcea1d7dc6 100644 --- a/src/App/Application.h +++ b/src/App/Application.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/ComplexGeoData.cpp b/src/App/ComplexGeoData.cpp index 76deff74c1..e427ccb799 100644 --- a/src/App/ComplexGeoData.cpp +++ b/src/App/ComplexGeoData.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h index 8b6de86c0d..3641266d2b 100644 --- a/src/App/ComplexGeoData.h +++ b/src/App/ComplexGeoData.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/ComplexGeoDataPyImp.cpp b/src/App/ComplexGeoDataPyImp.cpp index 1cef19c3fc..9b95b4a859 100644 --- a/src/App/ComplexGeoDataPyImp.cpp +++ b/src/App/ComplexGeoDataPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 175abbed0b..3988c3607b 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Document.h b/src/App/Document.h index 8f10cb4a67..b82a381935 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/DocumentObject.cpp b/src/App/DocumentObject.cpp index 32c68eaa86..0ce416ee9e 100644 --- a/src/App/DocumentObject.cpp +++ b/src/App/DocumentObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/DocumentObject.h b/src/App/DocumentObject.h index 52973c30be..8a9406a98c 100644 --- a/src/App/DocumentObject.h +++ b/src/App/DocumentObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/DocumentObjectFileIncluded.cpp b/src/App/DocumentObjectFileIncluded.cpp index b7de28eb51..78577eeec0 100644 --- a/src/App/DocumentObjectFileIncluded.cpp +++ b/src/App/DocumentObjectFileIncluded.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/DocumentObjectFileIncluded.h b/src/App/DocumentObjectFileIncluded.h index 79c4384204..a8bbc58238 100644 --- a/src/App/DocumentObjectFileIncluded.h +++ b/src/App/DocumentObjectFileIncluded.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/DocumentObjectPyImp.cpp b/src/App/DocumentObjectPyImp.cpp index be010e6825..03550c39b6 100644 --- a/src/App/DocumentObjectPyImp.cpp +++ b/src/App/DocumentObjectPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/DocumentPyImp.cpp b/src/App/DocumentPyImp.cpp index da7b7d07aa..7e931ff3cb 100644 --- a/src/App/DocumentPyImp.cpp +++ b/src/App/DocumentPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/FeaturePython.cpp b/src/App/FeaturePython.cpp index c5c794c376..6c7d845a9d 100644 --- a/src/App/FeaturePython.cpp +++ b/src/App/FeaturePython.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/FeaturePython.h b/src/App/FeaturePython.h index 5450210ed0..86247f6671 100644 --- a/src/App/FeaturePython.h +++ b/src/App/FeaturePython.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/FeatureTest.cpp b/src/App/FeatureTest.cpp index 00f1d3dae4..4d4017e267 100644 --- a/src/App/FeatureTest.cpp +++ b/src/App/FeatureTest.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/FeatureTest.h b/src/App/FeatureTest.h index b5316315d7..c48173aa63 100644 --- a/src/App/FeatureTest.h +++ b/src/App/FeatureTest.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/GeoFeature.cpp b/src/App/GeoFeature.cpp index 9c92f7d35d..053e0e2cf4 100644 --- a/src/App/GeoFeature.cpp +++ b/src/App/GeoFeature.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/GeoFeature.h b/src/App/GeoFeature.h index fa79bdeecb..ba9f9d88d4 100644 --- a/src/App/GeoFeature.h +++ b/src/App/GeoFeature.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Material.cpp b/src/App/Material.cpp index e7101f0b71..6239097b71 100644 --- a/src/App/Material.cpp +++ b/src/App/Material.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Material.h b/src/App/Material.h index b48c39c7cb..2a25409821 100644 --- a/src/App/Material.h +++ b/src/App/Material.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/MaterialObject.cpp b/src/App/MaterialObject.cpp index 512e3d618a..af77fd11a8 100644 --- a/src/App/MaterialObject.cpp +++ b/src/App/MaterialObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/MaterialObject.h b/src/App/MaterialObject.h index 23f22da168..d9500533a4 100644 --- a/src/App/MaterialObject.h +++ b/src/App/MaterialObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Placement.cpp b/src/App/Placement.cpp index 75307d7027..b75e00bd32 100644 --- a/src/App/Placement.cpp +++ b/src/App/Placement.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Placement.h b/src/App/Placement.h index af52c73c57..d3665efe20 100644 --- a/src/App/Placement.h +++ b/src/App/Placement.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Plane.cpp b/src/App/Plane.cpp index 0e01419f14..4e4ba42b5d 100644 --- a/src/App/Plane.cpp +++ b/src/App/Plane.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Plane.h b/src/App/Plane.h index f5bbd5b23b..33a1d5e7f4 100644 --- a/src/App/Plane.h +++ b/src/App/Plane.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PreCompiled.cpp b/src/App/PreCompiled.cpp index 9006db2cbf..cad1e1578a 100644 --- a/src/App/PreCompiled.cpp +++ b/src/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h index 9133711813..d6fd57b3a7 100644 --- a/src/App/PreCompiled.h +++ b/src/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/Property.h b/src/App/Property.h index 1be6e9599d..26236a8037 100644 --- a/src/App/Property.h +++ b/src/App/Property.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyContainer.cpp b/src/App/PropertyContainer.cpp index 6a4f9ad83f..1450d79315 100644 --- a/src/App/PropertyContainer.cpp +++ b/src/App/PropertyContainer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h index 34907c2976..7bb54dfb10 100644 --- a/src/App/PropertyContainer.h +++ b/src/App/PropertyContainer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyContainerPyImp.cpp b/src/App/PropertyContainerPyImp.cpp index e118c4afea..478c087201 100644 --- a/src/App/PropertyContainerPyImp.cpp +++ b/src/App/PropertyContainerPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyFile.cpp b/src/App/PropertyFile.cpp index d9b6f378a7..4e68baf87c 100644 --- a/src/App/PropertyFile.cpp +++ b/src/App/PropertyFile.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyFile.h b/src/App/PropertyFile.h index 1578512092..329a1b8f48 100644 --- a/src/App/PropertyFile.h +++ b/src/App/PropertyFile.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyGeo.cpp b/src/App/PropertyGeo.cpp index 668edc7df9..6765be8a9b 100644 --- a/src/App/PropertyGeo.cpp +++ b/src/App/PropertyGeo.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyGeo.h b/src/App/PropertyGeo.h index 4b16db382d..337f6db1a4 100644 --- a/src/App/PropertyGeo.h +++ b/src/App/PropertyGeo.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index fb888c2da3..b366faea78 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index c79657c5a1..98d3adccd0 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp index abce4a8da0..062a9f3904 100644 --- a/src/App/PropertyStandard.cpp +++ b/src/App/PropertyStandard.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h index ab71a316de..7e2d783428 100644 --- a/src/App/PropertyStandard.h +++ b/src/App/PropertyStandard.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp index 7f1b2c1dc9..90865ff1fd 100644 --- a/src/App/PropertyUnits.cpp +++ b/src/App/PropertyUnits.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h index 749e80ba9f..e2ee9f0627 100644 --- a/src/App/PropertyUnits.h +++ b/src/App/PropertyUnits.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Base64.cpp b/src/Base/Base64.cpp index 5211f002c4..e3ab802cea 100644 --- a/src/Base/Base64.cpp +++ b/src/Base/Base64.cpp @@ -1,7 +1,7 @@ /* base64.cpp and base64.h - Copyright (C) 2004-2008 René Nyffenegger + Copyright (C) 2004-2008 René Nyffenegger This source code is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages @@ -21,7 +21,7 @@ 3. This notice may not be removed or altered from any source distribution. - René Nyffenegger rene.nyffenegger@adp-gmbh.ch + René Nyffenegger rene.nyffenegger@adp-gmbh.ch */ #include "PreCompiled.h" diff --git a/src/Base/Base64.h b/src/Base/Base64.h index 43ff6c7037..fbea6be625 100644 --- a/src/Base/Base64.h +++ b/src/Base/Base64.h @@ -1,7 +1,7 @@ /* base64.cpp and base64.h - Copyright (C) 2004-2008 René Nyffenegger + Copyright (C) 2004-2008 René Nyffenegger This source code is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages @@ -21,7 +21,7 @@ 3. This notice may not be removed or altered from any source distribution. - René Nyffenegger rene.nyffenegger@adp-gmbh.ch + René Nyffenegger rene.nyffenegger@adp-gmbh.ch */ #ifndef BASE_BASE64_H diff --git a/src/Base/BaseClassPyImp.cpp b/src/Base/BaseClassPyImp.cpp index a11c8aa9a9..10a0259a36 100644 --- a/src/Base/BaseClassPyImp.cpp +++ b/src/Base/BaseClassPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/BoundBox.h b/src/Base/BoundBox.h index dcbfcbcaf7..f9d686d33a 100644 --- a/src/Base/BoundBox.h +++ b/src/Base/BoundBox.h @@ -71,7 +71,7 @@ public: /// Assignment operator inline BoundBox3<_Precision>& operator = (const BoundBox3<_Precision> &rcBound); - /** Methods for intersection, cuttíng and union of bounding boxes */ + /** Methods for intersection, cuttíng and union of bounding boxes */ //@{ /** Checks for intersection. */ inline bool operator && (const BoundBox3<_Precision> &rcBB) const; diff --git a/src/Base/Builder3D.h b/src/Base/Builder3D.h index be4f932f3b..11e5a25104 100644 --- a/src/Base/Builder3D.h +++ b/src/Base/Builder3D.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Console.cpp b/src/Base/Console.cpp index 084f477cab..d103440504 100644 --- a/src/Base/Console.cpp +++ b/src/Base/Console.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Console.h b/src/Base/Console.h index 1a19c62457..90713cf5dc 100644 --- a/src/Base/Console.h +++ b/src/Base/Console.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Exception.cpp b/src/Base/Exception.cpp index 58bbf3f6bf..479a0f8c2d 100644 --- a/src/Base/Exception.cpp +++ b/src/Base/Exception.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Exception.h b/src/Base/Exception.h index 26272da60c..3770223570 100644 --- a/src/Base/Exception.h +++ b/src/Base/Exception.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Factory.cpp b/src/Base/Factory.cpp index 5e52afb816..0edfb94006 100644 --- a/src/Base/Factory.cpp +++ b/src/Base/Factory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Factory.h b/src/Base/Factory.h index 54992e397d..f7969b781d 100644 --- a/src/Base/Factory.h +++ b/src/Base/Factory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/FileInfo.cpp b/src/Base/FileInfo.cpp index 6efb485f02..589a3f674f 100644 --- a/src/Base/FileInfo.cpp +++ b/src/Base/FileInfo.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/FileInfo.h b/src/Base/FileInfo.h index 52fd77548e..e4289b30ee 100644 --- a/src/Base/FileInfo.h +++ b/src/Base/FileInfo.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Handle.cpp b/src/Base/Handle.cpp index ff9c813f59..dec0240809 100644 --- a/src/Base/Handle.cpp +++ b/src/Base/Handle.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Handle.h b/src/Base/Handle.h index 6615b315ae..8b63795188 100644 --- a/src/Base/Handle.h +++ b/src/Base/Handle.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/InputSource.h b/src/Base/InputSource.h index deea9eb49a..57bdfbbe6b 100644 --- a/src/Base/InputSource.h +++ b/src/Base/InputSource.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp index e3df2662bd..ff883ae01c 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Interpreter.h b/src/Base/Interpreter.h index 2a1497503a..3a219e001e 100644 --- a/src/Base/Interpreter.h +++ b/src/Base/Interpreter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/MemDebug.cpp b/src/Base/MemDebug.cpp index 59ccb62473..20fa8dc05c 100644 --- a/src/Base/MemDebug.cpp +++ b/src/Base/MemDebug.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/MemDebug.h b/src/Base/MemDebug.h index f6f523d75e..ad157c0f17 100644 --- a/src/Base/MemDebug.h +++ b/src/Base/MemDebug.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel * + * Copyright (c) Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Observer.h b/src/Base/Observer.h index 0aabd0be25..4c827d71df 100644 --- a/src/Base/Observer.h +++ b/src/Base/Observer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp index b17f2001f6..34355dfeb5 100644 --- a/src/Base/Parameter.cpp +++ b/src/Base/Parameter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Parameter.h b/src/Base/Parameter.h index 8c0100bcb1..a62e90aac2 100644 --- a/src/Base/Parameter.h +++ b/src/Base/Parameter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/ParameterPy.cpp b/src/Base/ParameterPy.cpp index 128453fbcb..f0d3154a67 100644 --- a/src/Base/ParameterPy.cpp +++ b/src/Base/ParameterPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/PersistencePyImp.cpp b/src/Base/PersistencePyImp.cpp index f911bc348b..ac2d4c79b0 100644 --- a/src/Base/PersistencePyImp.cpp +++ b/src/Base/PersistencePyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/PreCompiled.cpp b/src/Base/PreCompiled.cpp index 30bd57848c..dc409a0d42 100644 --- a/src/Base/PreCompiled.cpp +++ b/src/Base/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/PreCompiled.h b/src/Base/PreCompiled.h index 5043da9a5c..68e61c0b36 100644 --- a/src/Base/PreCompiled.h +++ b/src/Base/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/PyExport.cpp b/src/Base/PyExport.cpp index 6dc22be547..ac81ebe498 100644 --- a/src/Base/PyExport.cpp +++ b/src/Base/PyExport.cpp @@ -6,7 +6,7 @@ */ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/PyExport.h b/src/Base/PyExport.h index b9e599184f..2131015e59 100644 --- a/src/Base/PyExport.h +++ b/src/Base/PyExport.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/PyObjectBase.cpp b/src/Base/PyObjectBase.cpp index f44440da04..3c0e4c2a04 100644 --- a/src/Base/PyObjectBase.cpp +++ b/src/Base/PyObjectBase.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/PyObjectBase.h b/src/Base/PyObjectBase.h index e2350e178b..36d668f51e 100644 --- a/src/Base/PyObjectBase.h +++ b/src/Base/PyObjectBase.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp index 93c5c50d1b..25ee34ad92 100644 --- a/src/Base/QuantityPyImp.cpp +++ b/src/Base/QuantityPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2013 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2013 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Reader.h b/src/Base/Reader.h index 0560c264ea..0de40d18cc 100644 --- a/src/Base/Reader.h +++ b/src/Base/Reader.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Sequencer.h b/src/Base/Sequencer.h index df6312a6e3..346d6402d5 100644 --- a/src/Base/Sequencer.h +++ b/src/Base/Sequencer.h @@ -228,7 +228,7 @@ protected: virtual void setProgress(size_t); /** * Resets internal data. - * If you want to reimplement this method, it is very important to call it ín + * If you want to reimplement this method, it is very important to call it ín * the re-implemented method. */ virtual void resetData(); diff --git a/src/Base/StackWalker.cpp b/src/Base/StackWalker.cpp index fc75c955d2..2689ffcb64 100644 --- a/src/Base/StackWalker.cpp +++ b/src/Base/StackWalker.cpp @@ -659,7 +659,7 @@ private: pGMI = (tGMI) GetProcAddress( hPsapi, "GetModuleInformation" ); if ( (pEPM == NULL) || (pGMFNE == NULL) || (pGMBN == NULL) || (pGMI == NULL) ) { - // we couldn´t find all functions + // we couldn´t find all functions FreeLibrary(hPsapi); return FALSE; } diff --git a/src/Base/Uuid.cpp b/src/Base/Uuid.cpp index 1fac7ac949..b5d77cee1d 100644 --- a/src/Base/Uuid.cpp +++ b/src/Base/Uuid.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/Uuid.h b/src/Base/Uuid.h index 414a613b52..3ec4e9af97 100644 --- a/src/Base/Uuid.h +++ b/src/Base/Uuid.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * @@ -32,7 +32,7 @@ namespace Base { /** Creates a Uuid - * \author Jürgen Riegel + * \author Jürgen Riegel */ class BaseExport Uuid { diff --git a/src/Base/Writer.h b/src/Base/Writer.h index 8027930147..0940e35faa 100644 --- a/src/Base/Writer.h +++ b/src/Base/Writer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Base/XMLTools.h b/src/Base/XMLTools.h index fc1c3ebe9a..abcef1c718 100644 --- a/src/Base/XMLTools.h +++ b/src/Base/XMLTools.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) * + * (c) Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/FCConfig.h b/src/FCConfig.h index 449425ee00..2b89fe942c 100644 --- a/src/FCConfig.h +++ b/src/FCConfig.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index e2a36d431b..5cf1485034 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Application.h b/src/Gui/Application.h index d2e85f9ef2..8b6d41a279 100644 --- a/src/Gui/Application.h +++ b/src/Gui/Application.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -46,7 +46,7 @@ class ViewProvider; /** The Applcation main class * This is the central class of the GUI - * @author Jürgen Riegel, Werner Mayer + * @author Jürgen Riegel, Werner Mayer */ class GuiExport Application { diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp index c0226ccf90..57d5c1ec4a 100644 --- a/src/Gui/BitmapFactory.cpp +++ b/src/Gui/BitmapFactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/BitmapFactory.h b/src/Gui/BitmapFactory.h index f506e07c0a..34400df77e 100644 --- a/src/Gui/BitmapFactory.h +++ b/src/Gui/BitmapFactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -38,7 +38,7 @@ namespace Gui { * the main purpose is to collect all build in Bitmaps and * hold all paths for the extern bitmaps (files) to serve * as a single point of accessing bitmaps in FreeCAD - * \author Werner Mayer, Jürgen Riegel + * \author Werner Mayer, Jürgen Riegel */ class BitmapFactoryInstP; class GuiExport BitmapFactoryInst : public Base::Factory diff --git a/src/Gui/CombiView.cpp b/src/Gui/CombiView.cpp index 5d5c1ce016..ca840c8ba4 100644 --- a/src/Gui/CombiView.cpp +++ b/src/Gui/CombiView.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/CombiView.h b/src/Gui/CombiView.h index 69103e316b..e2a00906b3 100644 --- a/src/Gui/CombiView.h +++ b/src/Gui/CombiView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp index b79ce16cb3..faeb24c63f 100644 --- a/src/Gui/Command.cpp +++ b/src/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Command.h b/src/Gui/Command.h index 119d137834..8bd9a73c37 100644 --- a/src/Gui/Command.h +++ b/src/Gui/Command.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -145,7 +145,7 @@ protected: * - anything else, especially altering the document must be done on application level. See doCommand() for details. * * @see CommandManager - * @author Jürgen Riegel + * @author Jürgen Riegel */ class GuiExport Command : public CommandBase { @@ -318,7 +318,7 @@ private: * passing between the C++ and the Python world. This includes everything like setting resources such as * bitmaps, activation or bindings to the user interface. * @see CommandManager - * @author Jürgen Riegel + * @author Jürgen Riegel */ class PythonCommand: public Command { @@ -474,7 +474,7 @@ protected: * on are handles here. Further the Building of Toolbars and (Context) * menus (connecting to a QAction) is done here. * @see Command - * @author Jürgen Riegel + * @author Jürgen Riegel */ class GuiExport CommandManager { @@ -542,7 +542,7 @@ private: /** The Command Macro Standard * This macro makes it easier to define a new command. * The parameters are the class name. - * @author Jürgen Riegel + * @author Jürgen Riegel */ #define DEF_STD_CMD(X) class X : public Gui::Command \ {\ @@ -557,7 +557,7 @@ protected: \ /** The Command Macro Standard + isActive() * This macro makes it easier to define a new command. * The parameters are the class name - * @author Jürgen Riegel + * @author Jürgen Riegel */ #define DEF_STD_CMD_A(X) class X : public Gui::Command \ {\ @@ -574,7 +574,7 @@ protected: \ /** The Command Macro Standard + createAction() * This macro makes it easier to define a new command. * The parameters are the class name - * @author Jürgen Riegel + * @author Jürgen Riegel */ #define DEF_STD_CMD_C(X) class X : public Gui::Command \ {\ @@ -669,7 +669,7 @@ protected: \ * This macro makes it easier to define a new command for the 3D View * It activate the command only when a 3DView is active. * The parameters are the class name - * @author Jürgen Riegel + * @author Jürgen Riegel */ #define DEF_3DV_CMD(X) class X : public Gui::Command \ {\ diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp index 76c7501ac9..572b6a9992 100644 --- a/src/Gui/CommandDoc.cpp +++ b/src/Gui/CommandDoc.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/CommandFeat.cpp b/src/Gui/CommandFeat.cpp index c2d7302f71..d3e37ec540 100644 --- a/src/Gui/CommandFeat.cpp +++ b/src/Gui/CommandFeat.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index 5f178bfaf4..46802c3b9b 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/CommandTest.cpp b/src/Gui/CommandTest.cpp index 245c0d6be7..49ce61f956 100644 --- a/src/Gui/CommandTest.cpp +++ b/src/Gui/CommandTest.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 7056906e3b..1430654e6f 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgDisplayPropertiesImp.cpp b/src/Gui/DlgDisplayPropertiesImp.cpp index f90f3b33c2..3c29cfe3d9 100644 --- a/src/Gui/DlgDisplayPropertiesImp.cpp +++ b/src/Gui/DlgDisplayPropertiesImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgDisplayPropertiesImp.h b/src/Gui/DlgDisplayPropertiesImp.h index 2e89b465eb..76a7ce8b4f 100644 --- a/src/Gui/DlgDisplayPropertiesImp.h +++ b/src/Gui/DlgDisplayPropertiesImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -47,7 +47,7 @@ typedef boost::signals::connection DlgDisplayPropertiesImp_Connection; /** * The DlgDisplayPropertiesImp class implements a dialog containing all available document * templates to create a new document. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgDisplayPropertiesImp : public QDialog, public Ui_DlgDisplayProperties, public Gui::SelectionSingleton::ObserverType diff --git a/src/Gui/DlgEditFileIncludeProptertyExternal.cpp b/src/Gui/DlgEditFileIncludeProptertyExternal.cpp index 5d66d274de..9d62ec5d56 100644 --- a/src/Gui/DlgEditFileIncludeProptertyExternal.cpp +++ b/src/Gui/DlgEditFileIncludeProptertyExternal.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgEditFileIncludeProptertyExternal.h b/src/Gui/DlgEditFileIncludeProptertyExternal.h index ac3a7b0e63..33449e4a3d 100644 --- a/src/Gui/DlgEditFileIncludeProptertyExternal.h +++ b/src/Gui/DlgEditFileIncludeProptertyExternal.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -32,7 +32,7 @@ namespace Dialog { /** * - * \author Jürgen Riegel + * \author Jürgen Riegel */ class GuiExport DlgEditFileIncludePropertyExternal : public DlgRunExternal { diff --git a/src/Gui/DlgMacroExecuteImp.cpp b/src/Gui/DlgMacroExecuteImp.cpp index 5fb73a211a..1c5f75bbe1 100644 --- a/src/Gui/DlgMacroExecuteImp.cpp +++ b/src/Gui/DlgMacroExecuteImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgMacroExecuteImp.h b/src/Gui/DlgMacroExecuteImp.h index 7ac3c7a5e8..6a8dac4dcc 100644 --- a/src/Gui/DlgMacroExecuteImp.h +++ b/src/Gui/DlgMacroExecuteImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -33,7 +33,7 @@ namespace Dialog { /** * The DlgMacroExecuteImp class implements a dialog to execute or edit a * recorded macro. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgMacroExecuteImp : public QDialog, public Ui_DlgMacroExecute, public Gui::WindowParameter { diff --git a/src/Gui/DlgMacroRecordImp.cpp b/src/Gui/DlgMacroRecordImp.cpp index d0b1571cc3..af40b1ed96 100644 --- a/src/Gui/DlgMacroRecordImp.cpp +++ b/src/Gui/DlgMacroRecordImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgMacroRecordImp.h b/src/Gui/DlgMacroRecordImp.h index 17c56dcd3d..a7f9f8b2a1 100644 --- a/src/Gui/DlgMacroRecordImp.h +++ b/src/Gui/DlgMacroRecordImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -34,7 +34,7 @@ namespace Dialog { /** * The DlgMacroRecordImp class implements a dialog to record a macro. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgMacroRecordImp : public QDialog, public Ui_DlgMacroRecord, public Gui::WindowParameter { diff --git a/src/Gui/DlgParameterImp.cpp b/src/Gui/DlgParameterImp.cpp index ee2ab82b86..d08dd6747b 100644 --- a/src/Gui/DlgParameterImp.cpp +++ b/src/Gui/DlgParameterImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgParameterImp.h b/src/Gui/DlgParameterImp.h index d040fcd99b..b4f2631d06 100644 --- a/src/Gui/DlgParameterImp.h +++ b/src/Gui/DlgParameterImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -35,7 +35,7 @@ namespace Dialog { /** * The DlgParameterImp class implements a dialog showing all parameters in a list view. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgParameterImp : public QDialog, public Ui_DlgParameter { @@ -186,7 +186,7 @@ private: * associated FCTreeLabel which controls the visibility * and the functions of the Label. * - * \author Jürgen Riegel + * \author Jürgen Riegel */ class ParameterGroupItem : public QTreeWidgetItem { diff --git a/src/Gui/DlgPreferencesImp.cpp b/src/Gui/DlgPreferencesImp.cpp index 6f4fa500bd..5c32e8659f 100644 --- a/src/Gui/DlgPreferencesImp.cpp +++ b/src/Gui/DlgPreferencesImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgPreferencesImp.h b/src/Gui/DlgPreferencesImp.h index 39fbfc1fc9..23b7ae4fd8 100644 --- a/src/Gui/DlgPreferencesImp.h +++ b/src/Gui/DlgPreferencesImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -102,7 +102,7 @@ class Ui_DlgPreferences; * new PrefPageProducer (QT_TR_NOOP("My category")); * * \see PrefWidget - * \author Werner Mayer, Jürgen Riegel + * \author Werner Mayer, Jürgen Riegel */ class GuiExport DlgPreferencesImp : public QDialog { diff --git a/src/Gui/DlgRunExternal.cpp b/src/Gui/DlgRunExternal.cpp index 7291aff659..d11f2870ce 100644 --- a/src/Gui/DlgRunExternal.cpp +++ b/src/Gui/DlgRunExternal.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgRunExternal.h b/src/Gui/DlgRunExternal.h index 4a08f5ccec..232b854596 100644 --- a/src/Gui/DlgRunExternal.h +++ b/src/Gui/DlgRunExternal.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -34,7 +34,7 @@ class Ui_DlgRunExternal; /** * The DlgRunExternal class implements a dialog to start and control external * programms to edit FreeCAD controled content. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class GuiExport DlgRunExternal : public QDialog { diff --git a/src/Gui/DlgSettings3DViewImp.cpp b/src/Gui/DlgSettings3DViewImp.cpp index 0a5fc1c311..d3eb4c5282 100644 --- a/src/Gui/DlgSettings3DViewImp.cpp +++ b/src/Gui/DlgSettings3DViewImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgSettings3DViewImp.h b/src/Gui/DlgSettings3DViewImp.h index a49f21864e..55a4aec19e 100644 --- a/src/Gui/DlgSettings3DViewImp.h +++ b/src/Gui/DlgSettings3DViewImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -33,7 +33,7 @@ namespace Dialog { /** * The DlgSettings3DViewImp class implements a preference page to change settings * for the Inventor viewer. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgSettings3DViewImp : public PreferencePage, public Ui_DlgSettings3DView { diff --git a/src/Gui/DlgSettingsDocumentImp.cpp b/src/Gui/DlgSettingsDocumentImp.cpp index 81c074ade5..cf95f8ed9d 100644 --- a/src/Gui/DlgSettingsDocumentImp.cpp +++ b/src/Gui/DlgSettingsDocumentImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgSettingsDocumentImp.h b/src/Gui/DlgSettingsDocumentImp.h index 9f174f968b..3049233738 100644 --- a/src/Gui/DlgSettingsDocumentImp.h +++ b/src/Gui/DlgSettingsDocumentImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -33,7 +33,7 @@ namespace Dialog { /** * The DlgSettingsDocumentImp class implements a preference page to change settings * for the document. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgSettingsDocumentImp : public PreferencePage, public Ui_DlgSettingsDocument { diff --git a/src/Gui/DlgSettingsMacroImp.cpp b/src/Gui/DlgSettingsMacroImp.cpp index afc9fb7e37..2911540e19 100644 --- a/src/Gui/DlgSettingsMacroImp.cpp +++ b/src/Gui/DlgSettingsMacroImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgSettingsMacroImp.h b/src/Gui/DlgSettingsMacroImp.h index 4d4a68eaf8..cb0d5ff872 100644 --- a/src/Gui/DlgSettingsMacroImp.h +++ b/src/Gui/DlgSettingsMacroImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -33,7 +33,7 @@ namespace Dialog { /** * The DlgSettingsMacroImp class implements a preference page to change settings * for macro stuff. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgSettingsMacroImp : public PreferencePage, public Ui_DlgSettingsMacro { diff --git a/src/Gui/DlgSettingsUnitsImp.cpp b/src/Gui/DlgSettingsUnitsImp.cpp index f7cbe00959..5022bfb5f5 100644 --- a/src/Gui/DlgSettingsUnitsImp.cpp +++ b/src/Gui/DlgSettingsUnitsImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgSettingsUnitsImp.h b/src/Gui/DlgSettingsUnitsImp.h index ff7f0330c8..a4ecdd5c16 100644 --- a/src/Gui/DlgSettingsUnitsImp.h +++ b/src/Gui/DlgSettingsUnitsImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -32,7 +32,7 @@ namespace Dialog { /** * The DlgSettingsUnitsImp class implements a preference page to change settings * for the Unit system. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class Ui_DlgSettingsUnits; class DlgSettingsUnitsImp : public PreferencePage diff --git a/src/Gui/DlgUnitsCalculatorImp.cpp b/src/Gui/DlgUnitsCalculatorImp.cpp index c1d216ed9c..a2eefde939 100644 --- a/src/Gui/DlgUnitsCalculatorImp.cpp +++ b/src/Gui/DlgUnitsCalculatorImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel * + * Copyright (c) 2013 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DlgUnitsCalculatorImp.h b/src/Gui/DlgUnitsCalculatorImp.h index 70090bd8c6..32fe80debd 100644 --- a/src/Gui/DlgUnitsCalculatorImp.h +++ b/src/Gui/DlgUnitsCalculatorImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel * + * Copyright (c) 2013 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DockWindow.h b/src/Gui/DockWindow.h index a616e70e70..6cd9d2a286 100644 --- a/src/Gui/DockWindow.h +++ b/src/Gui/DockWindow.h @@ -42,7 +42,7 @@ class Application; * @see TreeView * @see Gui::Document * @see Application - * @author Jürgen Riegel + * @author Jürgen Riegel */ class GuiExport DockWindow : public QWidget, public BaseView { diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 4d06082234..57f829ec7d 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Document.h b/src/Gui/Document.h index 0648fcb63f..e3e8f6c6bf 100644 --- a/src/Gui/Document.h +++ b/src/Gui/Document.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -58,7 +58,7 @@ class DocumentPy; * All handled views on the document must inherit from MDIView * @see App::Document * @see MDIView - * @author Jürgen Riegel + * @author Jürgen Riegel */ class GuiExport Document : public Base::Persistence { diff --git a/src/Gui/DownloadDialog.cpp b/src/Gui/DownloadDialog.cpp index 1c20d829d4..708a726bfa 100644 --- a/src/Gui/DownloadDialog.cpp +++ b/src/Gui/DownloadDialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/DownloadDialog.h b/src/Gui/DownloadDialog.h index 36bcb9b338..45e6b682f8 100644 --- a/src/Gui/DownloadDialog.h +++ b/src/Gui/DownloadDialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel * + * Copyright (c) 2011 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/GuiConsole.cpp b/src/Gui/GuiConsole.cpp index 31ce32d592..99016273ec 100644 --- a/src/Gui/GuiConsole.cpp +++ b/src/Gui/GuiConsole.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/GuiConsole.h b/src/Gui/GuiConsole.h index 60b47879a6..d76c6e415d 100644 --- a/src/Gui/GuiConsole.h +++ b/src/Gui/GuiConsole.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -38,7 +38,7 @@ namespace Gui { * massages. The class must not used directly! Only the * over the FCConsole class is allowed! * @see FCConsole - * \author Jürgen Riegel + * \author Jürgen Riegel */ class GuiExport GUIConsole :public Base::ConsoleObserver { diff --git a/src/Gui/InventorAll.h b/src/Gui/InventorAll.h index 3ce0c7b0ce..f759b0f8d2 100644 --- a/src/Gui/InventorAll.h +++ b/src/Gui/InventorAll.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/MDIView.h b/src/Gui/MDIView.h index fa7ebcb884..f854369d57 100644 --- a/src/Gui/MDIView.h +++ b/src/Gui/MDIView.h @@ -41,7 +41,7 @@ class Document; * @see TreeView * @see Gui::Document * @see Application - * @author Jürgen Riegel, Werner Mayer + * @author Jürgen Riegel, Werner Mayer */ class GuiExport MDIView : public QMainWindow, public BaseView { diff --git a/src/Gui/Macro.cpp b/src/Gui/Macro.cpp index faa7d5a727..d077cafbd5 100644 --- a/src/Gui/Macro.cpp +++ b/src/Gui/Macro.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Macro.h b/src/Gui/Macro.h index ba7667d255..e61c44c0dc 100644 --- a/src/Gui/Macro.h +++ b/src/Gui/Macro.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -39,7 +39,7 @@ class PythonDebugger; /** Macro recording and play back management * The purpos of this class is to handle record function calls from a command and save it in * a macro file (so far). - * \author Jürgen Riegel + * \author Jürgen Riegel */ class GuiExport MacroManager : public Base::Observer { diff --git a/src/Gui/ManualAlignment.cpp b/src/Gui/ManualAlignment.cpp index 8425a75b52..b673aeddb6 100644 --- a/src/Gui/ManualAlignment.cpp +++ b/src/Gui/ManualAlignment.cpp @@ -857,7 +857,7 @@ void ManualAlignment::finish() } /** - * Cancels the process and clöses the windows without performing an alignment. + * Cancels the process and clöses the windows without performing an alignment. */ void ManualAlignment::cancel() { diff --git a/src/Gui/MouseSelection.h b/src/Gui/MouseSelection.h index 7fe42a6881..e24b4c1257 100644 --- a/src/Gui/MouseSelection.h +++ b/src/Gui/MouseSelection.h @@ -50,7 +50,7 @@ class View3DInventorViewer; * In derived classes you must implement the methods @ref initialize() and @ref terminate() * For all drawing stuff you just have to reimplement the @ref draw() method. * In general you need not to do anything else. - * \author Werner Mayer and Jürgen Riegel + * \author Werner Mayer and Jürgen Riegel */ class GuiExport AbstractMouseSelection { @@ -106,7 +106,7 @@ protected: /** * The standard mouse selection class - * \author Jürgen Riegel + * \author Jürgen Riegel */ class GuiExport BaseMouseSelection : public AbstractMouseSelection { diff --git a/src/Gui/PreCompiled.cpp b/src/Gui/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Gui/PreCompiled.cpp +++ b/src/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h index 35fb43f88c..71a79d7009 100644 --- a/src/Gui/PreCompiled.h +++ b/src/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ProjectView.cpp b/src/Gui/ProjectView.cpp index 0a67e2bc9c..66b6a30cef 100644 --- a/src/Gui/ProjectView.cpp +++ b/src/Gui/ProjectView.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2012 Jürgen Riegel * + * Copyright (c) 2012 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ProjectView.h b/src/Gui/ProjectView.h index fb584e2561..7b45386184 100644 --- a/src/Gui/ProjectView.h +++ b/src/Gui/ProjectView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2012 Jürgen Riegel * + * Copyright (c) 2012 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/PropertyView.h b/src/Gui/PropertyView.h index b0aaacf748..383d58c30a 100644 --- a/src/Gui/PropertyView.h +++ b/src/Gui/PropertyView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Qt4All.h b/src/Gui/Qt4All.h index 64aec3034f..195b0b6dee 100644 --- a/src/Gui/Qt4All.h +++ b/src/Gui/Qt4All.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2006 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/SelectionView.cpp b/src/Gui/SelectionView.cpp index 62aec0f8dd..7ed1a9b7f9 100644 --- a/src/Gui/SelectionView.cpp +++ b/src/Gui/SelectionView.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/SelectionView.h b/src/Gui/SelectionView.h index 9c2e8bc9aa..585e6eb003 100644 --- a/src/Gui/SelectionView.h +++ b/src/Gui/SelectionView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/SoAxisCrossKit.cpp b/src/Gui/SoAxisCrossKit.cpp index c417559b56..a079ae271e 100644 --- a/src/Gui/SoAxisCrossKit.cpp +++ b/src/Gui/SoAxisCrossKit.cpp @@ -196,7 +196,7 @@ SoAxisCrossKit::createAxes() setPart("yAxis.shape", shape); setPart("zAxis.shape", shape); - // Place the axes ând heads + // Place the axes ând heads set("yAxis.transform", "rotation 0 0 1 1.5707999"); set("zAxis.transform", "rotation 0 1 0 -1.5707999"); diff --git a/src/Gui/SoFCSelection.cpp b/src/Gui/SoFCSelection.cpp index 282ebd98f7..9ecb857c98 100644 --- a/src/Gui/SoFCSelection.cpp +++ b/src/Gui/SoFCSelection.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2005 Jürgen Riegel * + * Copyright (c) 2005 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/SoFCSelection.h b/src/Gui/SoFCSelection.h index 93196a6ad0..96aefd9443 100644 --- a/src/Gui/SoFCSelection.h +++ b/src/Gui/SoFCSelection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2005 Jürgen Riegel * + * Copyright (c) 2005 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -48,7 +48,7 @@ namespace Gui { /** Selection node * This node does the complete highlighting and selection together with the viewer - * \author Jürgen Riegel + * \author Jürgen Riegel */ class GuiExport SoFCSelection : public SoGroup { typedef SoGroup inherited; diff --git a/src/Gui/SoFCSelectionAction.cpp b/src/Gui/SoFCSelectionAction.cpp index 4628143283..a692728e84 100644 --- a/src/Gui/SoFCSelectionAction.cpp +++ b/src/Gui/SoFCSelectionAction.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * - * Copyright (c) 2005 Jürgen Riegel * + * Copyright (c) 2005 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/SoFCSelectionAction.h b/src/Gui/SoFCSelectionAction.h index 1930fa1858..08ca6a6d0b 100644 --- a/src/Gui/SoFCSelectionAction.h +++ b/src/Gui/SoFCSelectionAction.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2005 Jürgen Riegel * + * Copyright (c) 2005 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -41,7 +41,7 @@ class SelectionChanges; /** * The SoFCSelectionAction class is used to inform an SoFCSelection node * whether an object gets selected. - * @author Jürgen Riegel + * @author Jürgen Riegel */ class GuiExport SoFCSelectionAction : public SoAction { diff --git a/src/Gui/SoFCUnifiedSelection.cpp b/src/Gui/SoFCUnifiedSelection.cpp index 0834d8d003..f8aae4b9e4 100644 --- a/src/Gui/SoFCUnifiedSelection.cpp +++ b/src/Gui/SoFCUnifiedSelection.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2005 Jürgen Riegel * + * Copyright (c) 2005 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/SoFCUnifiedSelection.h b/src/Gui/SoFCUnifiedSelection.h index 4e3cf69fdb..acada3ff01 100644 --- a/src/Gui/SoFCUnifiedSelection.h +++ b/src/Gui/SoFCUnifiedSelection.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2005 Jürgen Riegel * + * Copyright (c) 2005 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -56,7 +56,7 @@ class Document; * gradually remove all the low level selection nodes in the view * provider. The handling of the highlighting and the selection will * be unified here. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class GuiExport SoFCUnifiedSelection : public SoSeparator { typedef SoSeparator inherited; diff --git a/src/Gui/TaskDlgRelocation.cpp b/src/Gui/TaskDlgRelocation.cpp index 4521ec7f26..ce04380a5b 100644 --- a/src/Gui/TaskDlgRelocation.cpp +++ b/src/Gui/TaskDlgRelocation.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskDlgRelocation.h b/src/Gui/TaskDlgRelocation.h index 327cdeddc1..f58db4becc 100644 --- a/src/Gui/TaskDlgRelocation.h +++ b/src/Gui/TaskDlgRelocation.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskAppearance.cpp b/src/Gui/TaskView/TaskAppearance.cpp index d89cbb3244..0ab538a66f 100644 --- a/src/Gui/TaskView/TaskAppearance.cpp +++ b/src/Gui/TaskView/TaskAppearance.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskAppearance.h b/src/Gui/TaskView/TaskAppearance.h index 572fe64c5c..cdcbe1faff 100644 --- a/src/Gui/TaskView/TaskAppearance.h +++ b/src/Gui/TaskView/TaskAppearance.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskDialog.cpp b/src/Gui/TaskView/TaskDialog.cpp index f539080566..c389d3a3d1 100644 --- a/src/Gui/TaskView/TaskDialog.cpp +++ b/src/Gui/TaskView/TaskDialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskDialog.h b/src/Gui/TaskView/TaskDialog.h index 67a25f5141..6772575bce 100644 --- a/src/Gui/TaskView/TaskDialog.h +++ b/src/Gui/TaskView/TaskDialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskEditControl.cpp b/src/Gui/TaskView/TaskEditControl.cpp index 9c1a764888..31c5d26cc4 100644 --- a/src/Gui/TaskView/TaskEditControl.cpp +++ b/src/Gui/TaskView/TaskEditControl.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskEditControl.h b/src/Gui/TaskView/TaskEditControl.h index cb1abb84d5..a8d3364c56 100644 --- a/src/Gui/TaskView/TaskEditControl.h +++ b/src/Gui/TaskView/TaskEditControl.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.cpp b/src/Gui/TaskView/TaskSelectLinkProperty.cpp index d144cf42a3..f7c8b19e40 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.cpp +++ b/src/Gui/TaskView/TaskSelectLinkProperty.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskSelectLinkProperty.h b/src/Gui/TaskView/TaskSelectLinkProperty.h index 6b6d64a4fc..9a80699c81 100644 --- a/src/Gui/TaskView/TaskSelectLinkProperty.h +++ b/src/Gui/TaskView/TaskSelectLinkProperty.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskView.cpp b/src/Gui/TaskView/TaskView.cpp index e7496d9ffc..38640f2a12 100644 --- a/src/Gui/TaskView/TaskView.cpp +++ b/src/Gui/TaskView/TaskView.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskView.h b/src/Gui/TaskView/TaskView.h index ae73e41d93..7491d6e8d9 100644 --- a/src/Gui/TaskView/TaskView.h +++ b/src/Gui/TaskView/TaskView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskWatcher.cpp b/src/Gui/TaskView/TaskWatcher.cpp index e3143ddfe9..4c6f99d634 100644 --- a/src/Gui/TaskView/TaskWatcher.cpp +++ b/src/Gui/TaskView/TaskWatcher.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/TaskView/TaskWatcher.h b/src/Gui/TaskView/TaskWatcher.h index bf02bfafcc..613bec7ecb 100644 --- a/src/Gui/TaskView/TaskWatcher.h +++ b/src/Gui/TaskView/TaskWatcher.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index 9c249d2865..4656f4b842 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Tree.h b/src/Gui/Tree.h index 73e855d9ae..9319e6bc73 100644 --- a/src/Gui/Tree.h +++ b/src/Gui/Tree.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -133,7 +133,7 @@ private: /** The link between the tree and a document. * Every document in the application gets its associated DocumentItem which controls * the visibility and the functions of the document. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DocumentItem : public QTreeWidgetItem { diff --git a/src/Gui/View.cpp b/src/Gui/View.cpp index b30d811bc0..81d9af564f 100644 --- a/src/Gui/View.cpp +++ b/src/Gui/View.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index 4f0e0e0f25..764c746b71 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/View3DInventorExamples.cpp b/src/Gui/View3DInventorExamples.cpp index a6931262ae..9102681b8c 100644 --- a/src/Gui/View3DInventorExamples.cpp +++ b/src/Gui/View3DInventorExamples.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/View3DInventorExamples.h b/src/Gui/View3DInventorExamples.h index 86f3f774cf..59c910951b 100644 --- a/src/Gui/View3DInventorExamples.h +++ b/src/Gui/View3DInventorExamples.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/View3DInventorRiftViewer.cpp b/src/Gui/View3DInventorRiftViewer.cpp index 705c5e00be..5d3393f0fe 100644 --- a/src/Gui/View3DInventorRiftViewer.cpp +++ b/src/Gui/View3DInventorRiftViewer.cpp @@ -103,7 +103,7 @@ void View3DInventorRiftViewer::setSceneGraph(SoNode *sceneGraph) void View3DInventorRiftViewer::keyPressEvent(QKeyEvent *event) { static const float increment = 0.02; // move two centimeter per key - static const float rotIncrement = M_PI/4; // move two 90° per key + static const float rotIncrement = M_PI/4; // move two 90° per key if (event->key() == Qt::Key_Plus) { diff --git a/src/Gui/View3DPy.cpp b/src/Gui/View3DPy.cpp index ebe47611ec..128c21800a 100644 --- a/src/Gui/View3DPy.cpp +++ b/src/Gui/View3DPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/View3DPy.h b/src/Gui/View3DPy.h index f0f451e18e..b87f8fdf37 100644 --- a/src/Gui/View3DPy.h +++ b/src/Gui/View3DPy.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp index aadedbc823..5d0d7c1d6e 100644 --- a/src/Gui/ViewProvider.cpp +++ b/src/Gui/ViewProvider.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index 6520f3fcfc..f410ffaea7 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderDocumentObject.cpp b/src/Gui/ViewProviderDocumentObject.cpp index a5700d4ac9..d1f81ee669 100644 --- a/src/Gui/ViewProviderDocumentObject.cpp +++ b/src/Gui/ViewProviderDocumentObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderDocumentObject.h b/src/Gui/ViewProviderDocumentObject.h index 2845eb1ff5..924dff83c0 100644 --- a/src/Gui/ViewProviderDocumentObject.h +++ b/src/Gui/ViewProviderDocumentObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderExtern.cpp b/src/Gui/ViewProviderExtern.cpp index 05c2dfac4f..de341f5217 100644 --- a/src/Gui/ViewProviderExtern.cpp +++ b/src/Gui/ViewProviderExtern.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderExtern.h b/src/Gui/ViewProviderExtern.h index 191f19106c..6be47c868c 100644 --- a/src/Gui/ViewProviderExtern.h +++ b/src/Gui/ViewProviderExtern.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderFeature.cpp b/src/Gui/ViewProviderFeature.cpp index 9232574496..0cf8496e70 100644 --- a/src/Gui/ViewProviderFeature.cpp +++ b/src/Gui/ViewProviderFeature.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderFeature.h b/src/Gui/ViewProviderFeature.h index 076c43e3ff..ad3906ce7c 100644 --- a/src/Gui/ViewProviderFeature.h +++ b/src/Gui/ViewProviderFeature.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderMaterialObject.cpp b/src/Gui/ViewProviderMaterialObject.cpp index 39004411a7..c4a0344cab 100644 --- a/src/Gui/ViewProviderMaterialObject.cpp +++ b/src/Gui/ViewProviderMaterialObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderMaterialObject.h b/src/Gui/ViewProviderMaterialObject.h index 5990bdd880..76c4a6b58c 100644 --- a/src/Gui/ViewProviderMaterialObject.h +++ b/src/Gui/ViewProviderMaterialObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderPlacement.cpp b/src/Gui/ViewProviderPlacement.cpp index 43ee983854..2d94c730b3 100644 --- a/src/Gui/ViewProviderPlacement.cpp +++ b/src/Gui/ViewProviderPlacement.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderPlacement.h b/src/Gui/ViewProviderPlacement.h index 02ff9fd43e..d4a44f625b 100644 --- a/src/Gui/ViewProviderPlacement.h +++ b/src/Gui/ViewProviderPlacement.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderPlane.cpp b/src/Gui/ViewProviderPlane.cpp index 49376cb9cd..2363f03805 100644 --- a/src/Gui/ViewProviderPlane.cpp +++ b/src/Gui/ViewProviderPlane.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/ViewProviderPlane.h b/src/Gui/ViewProviderPlane.h index 9cef63ac4c..fef1575f32 100644 --- a/src/Gui/ViewProviderPlane.h +++ b/src/Gui/ViewProviderPlane.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2012 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp index 5dbc0762ee..d7e353f2b4 100644 --- a/src/Gui/Window.cpp +++ b/src/Gui/Window.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/Window.h b/src/Gui/Window.h index d9d05a2a7c..add6df1c6a 100644 --- a/src/Gui/Window.h +++ b/src/Gui/Window.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -32,7 +32,7 @@ namespace Gui { /** Adapter class to the parameter of FreeCAD for all windows * Retrieve the parameter group of the specific window by the windowname. - * @author Jürgen Riegel + * @author Jürgen Riegel */ class GuiExport WindowParameter : public ParameterGrp::ObserverType { diff --git a/src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp b/src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp index 5e697802c6..48f94c2493 100644 --- a/src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp +++ b/src/Gui/iisTaskPanel/src/iisfreecadscheme.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Gui/iisTaskPanel/src/iisfreecadscheme.h b/src/Gui/iisTaskPanel/src/iisfreecadscheme.h index 2c37b89a86..67bc10c3cd 100644 --- a/src/Gui/iisTaskPanel/src/iisfreecadscheme.h +++ b/src/Gui/iisTaskPanel/src/iisfreecadscheme.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Main/MainCmd.cpp b/src/Main/MainCmd.cpp index b70d5259f2..03ce38757a 100644 --- a/src/Main/MainCmd.cpp +++ b/src/Main/MainCmd.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp index a598a6ea68..5f76a079c0 100644 --- a/src/Main/MainGui.cpp +++ b/src/Main/MainGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Assembly/App/AppAssembly.cpp b/src/Mod/Assembly/App/AppAssembly.cpp index e2b4282404..724a1e17e6 100644 --- a/src/Mod/Assembly/App/AppAssembly.cpp +++ b/src/Mod/Assembly/App/AppAssembly.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Assembly/App/AppAssemblyPy.cpp b/src/Mod/Assembly/App/AppAssemblyPy.cpp index 4fa87be2e0..5d2997e5e0 100644 --- a/src/Mod/Assembly/App/AppAssemblyPy.cpp +++ b/src/Mod/Assembly/App/AppAssemblyPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Assembly/App/PreCompiled.cpp b/src/Mod/Assembly/App/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/Assembly/App/PreCompiled.cpp +++ b/src/Mod/Assembly/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Assembly/App/PreCompiled.h b/src/Mod/Assembly/App/PreCompiled.h index d814802f5b..ef82449af4 100644 --- a/src/Mod/Assembly/App/PreCompiled.h +++ b/src/Mod/Assembly/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Assembly/Gui/AppAssemblyGui.cpp b/src/Mod/Assembly/Gui/AppAssemblyGui.cpp index c10b02ad36..86d1bf7007 100644 --- a/src/Mod/Assembly/Gui/AppAssemblyGui.cpp +++ b/src/Mod/Assembly/Gui/AppAssemblyGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Assembly/Gui/Command.cpp b/src/Mod/Assembly/Gui/Command.cpp index 421be1fedd..a763d90d41 100644 --- a/src/Mod/Assembly/Gui/Command.cpp +++ b/src/Mod/Assembly/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Assembly/Gui/PreCompiled.cpp b/src/Mod/Assembly/Gui/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/Assembly/Gui/PreCompiled.cpp +++ b/src/Mod/Assembly/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Assembly/Gui/PreCompiled.h b/src/Mod/Assembly/Gui/PreCompiled.h index 04e8f4a46a..402f58d47b 100644 --- a/src/Mod/Assembly/Gui/PreCompiled.h +++ b/src/Mod/Assembly/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Cam/App/AppCam.cpp b/src/Mod/Cam/App/AppCam.cpp index ba6be63676..97699d4c58 100644 --- a/src/Mod/Cam/App/AppCam.cpp +++ b/src/Mod/Cam/App/AppCam.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * Copyright (c) 2007 * * Joachim Zettler * - * Jürgen Riegel * - * Jürgen Riegel C return NULL; // NULL triggers exception - TopoShapePy *pcShape = static_cast(pcObj); //Surface oder Step-File wird übergeben + TopoShapePy *pcShape = static_cast(pcObj); //Surface oder Step-File wird übergeben Base::Builder3D aBuild; @@ -251,7 +251,7 @@ static PyObject * best_fit_coarse(PyObject *self, PyObject *args) PY_TRY { - TopoShapePy *pcShape = static_cast(pcObj2); //Shape wird übergeben + TopoShapePy *pcShape = static_cast(pcObj2); //Shape wird übergeben TopoDS_Shape cad = pcShape->getTopoShapePtr()->_Shape; // Input CAD @@ -287,7 +287,7 @@ static PyObject * best_fit_coarse(PyObject *self, PyObject *args) // if (!PyArg_ParseTuple(args, "O!", &(TopoShapePyOld::Type), &pcObj)) // convert args: Python->C // return NULL; // NULL triggers exception // -// TopoShapePyOld *pcShape = static_cast(pcObj); //Surface wird übergeben +// TopoShapePyOld *pcShape = static_cast(pcObj); //Surface wird übergeben //// TopoShapePyOld *pcShape2 = static_cast(pcObj2); //Cut-Curve // PY_TRY // { @@ -365,7 +365,7 @@ static PyObject * offset(PyObject *self,PyObject *args) if (!PyArg_ParseTuple(args, "O!d",&(TopoShapePy::Type), &pcObj,&offset )) return NULL; - TopoShapePy *pcShape = static_cast(pcObj); //Original-Shape wird hier übergeben + TopoShapePy *pcShape = static_cast(pcObj); //Original-Shape wird hier übergeben PY_TRY { @@ -385,7 +385,7 @@ static PyObject * cut(PyObject *self, PyObject *args) { PyObject *pcObj; double z_pitch; - //double rGap = 1000.0; //Rand um die Bounding Box für ein sauberes Ergebnis + //double rGap = 1000.0; //Rand um die Bounding Box für ein sauberes Ergebnis if (!PyArg_ParseTuple(args, "O!d", &(TopoShapePyOld::Type), &pcObj,&z_pitch)) // convert args: Python->C return NULL; // NULL triggers exception @@ -405,10 +405,10 @@ static PyObject * cut(PyObject *self, PyObject *args) Jetzt die eigentlichen Schnitte erzeugen: 1. Wenn die oberste Ebene ein flacher Bereich ist, werden von dort die Bounding Wires genommen - Ermittlung über die Bounding Box - 2. Anschließend über die Differenz von zwei Flat-Bereichen die Anzahl von Schnitten ermitteln mit gegebenem Abstand - 3. Die Edges bzw. Wires in B-Spline Kurven wandeln und anschließend evaluieren - 4. Abfahrreihenfolge festlegen und Output für die Simulation bzw. Versuch vorbereiten + Ermittlung über die Bounding Box + 2. Anschließend über die Differenz von zwei Flat-Bereichen die Anzahl von Schnitten ermitteln mit gegebenem Abstand + 3. Die Edges bzw. Wires in B-Spline Kurven wandeln und anschließend evaluieren + 4. Abfahrreihenfolge festlegen und Output für die Simulation bzw. Versuch vorbereiten @@ -3334,7 +3334,7 @@ static PyObject * offset_mesh(PyObject *self, PyObject *args) normal.Set(0.0,0.0,0.0); - // Iteriere über die Dreiecke zu jedem Punkt + // Iteriere über die Dreiecke zu jedem Punkt for (std::set::const_iterator it = faceSet.begin(); it != faceSet.end(); ++it) { // Einmal derefernzieren, um an das MeshFacet zu kommen und dem Kernel uebergeben, dass er ein MeshGeomFacet liefert @@ -3402,7 +3402,7 @@ static PyObject * offset_mesh(PyObject *self, PyObject *args) // return NULL; // NULL triggers exception // // -// TopoShapePyOld *pcShape = static_cast(pcObj); //Surface wird übergeben +// TopoShapePyOld *pcShape = static_cast(pcObj); //Surface wird übergeben // // TopExp_Explorer Ex; // Ex.Init(pcShape->getShape(),TopAbs_FACE); // initialisiere cad-geometrie (trimmed surface) @@ -3445,7 +3445,7 @@ static PyObject * offset_mesh(PyObject *self, PyObject *args) // // for (;Ex.More();Ex.Next()) // { -// // übergebe die einzelnen patches +// // übergebe die einzelnen patches // atopo_surface = TopoDS::Face (Ex.Current()); // adaptor_surface.Initialize(atopo_surface); // @@ -3649,7 +3649,7 @@ static PyObject * best_fit_complete(PyObject *self, PyObject *args) gp_Pnt orig; pcObject = (MeshPy*)pcObj; - TopoShapePy *pcShape = static_cast(pcObj2); //Shape wird übergeben + TopoShapePy *pcShape = static_cast(pcObj2); //Shape wird übergeben TopoDS_Shape cad = pcShape->getTopoShapePtr()->_Shape; // Input CAD MeshCore::MeshKernel mesh = pcObject->getMeshObjectPtr()->getKernel(); // Input Mesh @@ -3682,7 +3682,7 @@ static PyObject * best_fit_test(PyObject *self, PyObject *args) PY_TRY { - TopoShapePy *pcShape = static_cast(pcObj); //Shape wird übergeben + TopoShapePy *pcShape = static_cast(pcObj); //Shape wird übergeben TopoDS_Shape aShape = pcShape->getTopoShapePtr()->_Shape; TopExp_Explorer anExplorer; TopExp_Explorer aFaceExplorer; @@ -3755,7 +3755,7 @@ static PyObject * best_fit_test(PyObject *self, PyObject *args) } GeomAPI_PointsToBSplineSurface *Approx_Surface = new GeomAPI_PointsToBSplineSurface(Input, 3, 8, GeomAbs_C1,0.1); Handle(Geom_BSplineSurface) Final_Approx = Approx_Surface->Surface () ; - //Jetzt die Wires vom ursprünglichen Face offsettieren. + //Jetzt die Wires vom ursprünglichen Face offsettieren. TopExp_Explorer asecondFaceExplorer; TopoDS_Wire aFaceWire; for (asecondFaceExplorer.Init(first,TopAbs_WIRE);asecondFaceExplorer.More();asecondFaceExplorer.Next()) @@ -3860,7 +3860,7 @@ static PyObject * shape2orig(PyObject *self, PyObject *args) GProp_PrincipalProps pprop; gp_Pnt orig; - TopoShapePy *pcShape = static_cast(pcObj); //shape wird übergeben + TopoShapePy *pcShape = static_cast(pcObj); //shape wird übergeben TopoDS_Shape cad = pcShape->getTopoShapePtr()->_Shape; // Input CAD // best_fit befi(cad); @@ -3892,7 +3892,7 @@ static PyObject * spring_back(PyObject *self, PyObject *args) gp_Pnt orig; pcObject = (MeshPy*)pcObj; - TopoShapePy *pcShape = static_cast(pcObj2); //Shape wird übergeben + TopoShapePy *pcShape = static_cast(pcObj2); //Shape wird übergeben TopoDS_Shape cad = pcShape->getTopoShapePtr()->_Shape; // Input CAD MeshObject* anObject = pcObject->getMeshObjectPtr(); // Input Mesh MeshCore::MeshKernel mesh = anObject->getKernel(); @@ -3934,7 +3934,7 @@ static PyObject * tess_shape(PyObject *self, PyObject *args) PY_TRY { - TopoShapePy *pcShape = static_cast(pcObj); //shape wird übergeben + TopoShapePy *pcShape = static_cast(pcObj); //shape wird übergeben TopoDS_Shape cad = pcShape->getTopoShapePtr()->_Shape; // Input CAD //best_fit befi(cad); @@ -4033,7 +4033,7 @@ static PyObject * fit_iter(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "O!O!; Need exatly one Mesh object", &(MeshPy::Type), &pcObj, &(TopoShapePy::Type), &pcObj2)) // convert args: Python->C return NULL; // NULL triggers exception - TopoShapePy *pcShape = static_cast(pcObj2); //Surface wird übergeben + TopoShapePy *pcShape = static_cast(pcObj2); //Surface wird übergeben TopoDS_Shape cad = pcShape->getTopoShapePtr()->_Shape; TopExp_Explorer Ex; @@ -4090,7 +4090,7 @@ static PyObject * fit_iter(PyObject *self, PyObject *args) normal.Set(0.0,0.0,0.0); - // Iteriere über die Dreiecke zu jedem Punkt + // Iteriere über die Dreiecke zu jedem Punkt for (std::set::const_iterator it = faceSet.begin(); it != faceSet.end(); ++it) { // Einmal derefernzieren, um an das MeshFacet zu kommen und dem Kernel uebergeben, dass er ein MeshGeomFacet liefert diff --git a/src/Mod/Cam/App/Approx.cpp b/src/Mod/Cam/App/Approx.cpp index f821dcec89..3fc299701a 100644 --- a/src/Mod/Cam/App/Approx.cpp +++ b/src/Mod/Cam/App/Approx.cpp @@ -402,7 +402,7 @@ void Approximate::ParameterBoundary() g++; } - //Secure the counters and reinitialize´the things we needed + //Secure the counters and reinitialize´the things we needed g = temp1; temp2 = g; Pointdistance.clear(); @@ -437,7 +437,7 @@ void Approximate::ParameterBoundary() g++; } - //Secure the counters and reinitialize´the things we needed + //Secure the counters and reinitialize´the things we needed g = temp1; temp2 = g; Pointdistance.clear(); @@ -480,7 +480,7 @@ void Approximate::ParameterBoundary() g++; } - //Secure the counters and reinitialize´the things we needed + //Secure the counters and reinitialize´the things we needed g = temp1; temp2 = g; Pointdistance.clear(); diff --git a/src/Mod/Cam/App/SpringbackCorrection.cpp b/src/Mod/Cam/App/SpringbackCorrection.cpp index 5a9c944901..41feb05bdb 100644 --- a/src/Mod/Cam/App/SpringbackCorrection.cpp +++ b/src/Mod/Cam/App/SpringbackCorrection.cpp @@ -198,7 +198,7 @@ bool SpringbackCorrection::CalcCurv() m_MeshStruct.resize(m_CadMesh.CountPoints()); MeanVec.resize(m_CadMesh.CountPoints(), 0); - // Fülle Map mit Punkten (Key) und deren, zur Basistriangulierung korrespondierenden, Indizes + // Fülle Map mit Punkten (Key) und deren, zur Basistriangulierung korrespondierenden, Indizes MeshPnts = m_CadMesh.GetPoints(); MeshPntsCop = MeshPnts; MeshFacets2 = m_CadMesh.GetFacets(); @@ -409,7 +409,7 @@ bool SpringbackCorrection::CalcCurv() char text[10]; int w; - // übergebe krümmungswerte an m_MeshStruct + // übergebe krümmungswerte an m_MeshStruct for (meshIt = MeshMap.begin(); meshIt != MeshMap.end(); ++meshIt) { w = meshIt->second.index; @@ -429,7 +429,7 @@ bool SpringbackCorrection::CalcCurv() if (MeanVec[w] == 1) log3d.addSinglePoint(m_MeshStruct[w].pnt,4,0,0,0); // innere punkte - > schwarz else if (MeanVec[w] == 2) - log3d.addSinglePoint(m_MeshStruct[w].pnt,4,1,1,1); // edge-punkte - > weiß + log3d.addSinglePoint(m_MeshStruct[w].pnt,4,1,1,1); // edge-punkte - > weiß else log3d.addSinglePoint(m_MeshStruct[w].pnt,4,1,0,0); // eck-punkte - > rot @@ -774,7 +774,7 @@ MeshCore::MeshKernel SpringbackCorrection::BuildMesh(Handle_Poly_Triangulation a int SpringbackCorrection::GetBoundary(const MeshCore::MeshKernel &mesh, MeshCore::MeshPointArray &meshPnts) { // get mesh-boundary - // zweck: nur für die inneren punkte wird der curvature wert über die edge abstände berechnet + // zweck: nur für die inneren punkte wird der curvature wert über die edge abstände berechnet std::list< std::vector > BoundariesIndex; std::list< std::vector >::iterator bInd; @@ -1235,10 +1235,10 @@ bool SpringbackCorrection::Perform(int deg_Tol, bool out) //GetFaceAng(m_CadMesh, deg_Tol+1); //cout << "Init" << endl; //Init(); // tesseliere shape -> Basistriangulierung CAD-Mesh - // EdgeMap wird hier gefüllt + // EdgeMap wird hier gefüllt Base::Vector3f nullvec(0.0,0.0,0.0); - m_dist_vec.resize(m_CadMesh.CountPoints(), nullvec); // fülle mit Nullvektoren + m_dist_vec.resize(m_CadMesh.CountPoints(), nullvec); // fülle mit Nullvektoren cout << "SetFixEdges" << endl; @@ -1251,10 +1251,10 @@ bool SpringbackCorrection::Perform(int deg_Tol, bool out) if (!CalcCurv()) return false; - // berechne Krümmungswerte über Edgekrümmungen - // MeshMap wird hier gefüllt + // berechne Krümmungswerte über Edgekrümmungen + // MeshMap wird hier gefüllt - const MeshCore::MeshKernel RefMesh = m_CadMesh; // übegebe CAD-Mesh vor der Verformung + const MeshCore::MeshKernel RefMesh = m_CadMesh; // übegebe CAD-Mesh vor der Verformung /*Base::Builder3D log; Base::Vector3f gpnt, normal; @@ -1290,7 +1290,7 @@ bool SpringbackCorrection::Perform(int deg_Tol, bool out) //logo.saveToFile("c:/normals.iv"); - // übergebe Normalen und CAD-Mesh für Fehlerberechnng + // übergebe Normalen und CAD-Mesh für Fehlerberechnng best_fit befi; befi.m_normals = m_normals; befi.m_CadMesh = m_CadMesh; @@ -1346,7 +1346,7 @@ bool SpringbackCorrection::Perform(int deg_Tol, bool out) m_dist_vec[i] = m_normals[i]; } - if(out==true) //hier werden die Outputvektoren für Catia geschrieben + if(out==true) //hier werden die Outputvektoren für Catia geschrieben { MeshCore::MeshPointArray mpts = RefMesh23.GetPoints(); @@ -1435,7 +1435,7 @@ bool SpringbackCorrection::Perform(int deg_Tol, bool out) MeshCore::MeshPointArray mPoints = m_CadMesh.GetPoints(); int num = mFacets.size(); - for (int i=0; i aRegion; @@ -1723,8 +1723,8 @@ std::vector< std::pair > SpringbackCorrection::RegionEval std::vector< std::pair > dists; std::vector< std::pair< unsigned long, double> > skals; - MeshCore::MeshAlgorithm algo(mesh); // übergebe mesh - algo.GetFacetBorders(RegionFacets, Borders); // speichert ränder der region in Borders + MeshCore::MeshAlgorithm algo(mesh); // übergebe mesh + algo.GetFacetBorders(RegionFacets, Borders); // speichert ränder der region in Borders MeshCore::MeshFacetArray facets = mesh.GetFacets(); MeshCore::MeshPointArray points = mesh.GetPoints(); @@ -1742,7 +1742,7 @@ std::vector< std::pair > SpringbackCorrection::RegionEval } - // berechne distanzen der regionenpunkte zu den rändern + // berechne distanzen der regionenpunkte zu den rändern Base::Vector3f distVec; // speichert abstandsvektor double distVal; // speichert maximalen abstandswert zum rand @@ -1821,7 +1821,7 @@ bool SpringbackCorrection::FacetRegionGrowing(MeshCore::MeshKernel &mesh, // Base::Builder3D log; // Base::Vector3f p1,p2; // double curv; -// // Triangulate Shape (vorläufig) +// // Triangulate Shape (vorläufig) // best_fit::Tesselate_Shape(m_Shape, m_Mesh, 1); // // MeshCurvature(m_Mesh); @@ -1877,10 +1877,10 @@ bool SpringbackCorrection::GetCurvature(TopoDS_Face aFace) GeomAPI_ProjectPointOnSurf aProjection(proPnt,geom_surface); aProjection.LowerDistanceParameters(u_par,v_par); - // Berechne Krümmung + // Berechne Krümmung geom_surface->D2(u_par,v_par,proPnt,D1U,D1V,D2U,D2V,D2UV); - // erste & zweite Hauptkrümmung + // erste & zweite Hauptkrümmung k1 = D1U.CrossMagnitude(D2U) / D1U.Magnitude(); k2 = D1V.CrossMagnitude(D2V) / D1V.Magnitude(); @@ -1987,7 +1987,7 @@ std::vector SpringbackCorrection::MeshCurvature(const TopoDS_Face& aFace gp_Pnt2d par; gp_Pnt P; gp_Vec D1U, D1V, D2U, D2V, D2UV, nor, xvv, xuv, xuu; - double H,K; // Gaußsche- und mittlere Krümmung + double H,K; // Gaußsche- und mittlere Krümmung std::vector aMaxCurve, aMinCurve; std::vector curv(2); @@ -2080,7 +2080,7 @@ std::vector SpringbackCorrection::MeshCurvature(const TopoDS_Face& aFace - //Krümmung auf Netzbasis + //Krümmung auf Netzbasis for(int i=0; i error) nei.clear(); - // falls boundary-point tue nichts bzw. gehe zum nächsten punkt + // falls boundary-point tue nichts bzw. gehe zum nächsten punkt if (FacetNei.size() != PntNei.size()) { PointArray[ind[j]]._ucFlag = 5; - m_CurvMax[ind[j]] = abs(error[ind[j]]); // vorübergehend + m_CurvMax[ind[j]] = abs(error[ind[j]]); // vorübergehend continue; } @@ -2621,7 +2621,7 @@ bool SpringbackCorrection::MirrorMesh(std::vector error) for (unsigned int i=0; i Neib , ublas::matrix A(3, 3); ublas::matrix b(1, 3); - // 2. Spalte bleibt unverändert + // 2. Spalte bleibt unverändert A(0,2) = -Normal[0].x; A(1,2) = -Normal[0].y; A(2,2) = -Normal[0].z; @@ -2917,7 +2917,7 @@ double SpringbackCorrection::GlobalCorrection(std::vector NeiLoc std::vector ConvComb = FillConvex(NeiLoc,NorLoc,20); - // füge schwerpunkte der umgebenden faces hinzu + // füge schwerpunkte der umgebenden faces hinzu std::set FacetNei; std::set::iterator face_it; MeshCore::MeshFacetIterator f_it (MeshRef); diff --git a/src/Mod/Cam/App/UniGridApprox.cpp b/src/Mod/Cam/App/UniGridApprox.cpp index 7d27914bcb..d58c8c1637 100644 --- a/src/Mod/Cam/App/UniGridApprox.cpp +++ b/src/Mod/Cam/App/UniGridApprox.cpp @@ -115,13 +115,13 @@ bool UniGridApprox::MeshOffset() MeshCore::MeshPointIterator p_it(m_Mesh); - //vorläufige Lösung bis CAD-Normalen verwendet werden können + //vorläufige Lösung bis CAD-Normalen verwendet werden können std::vector normals = best_fit::Comp_Normals(m_Mesh); double x_max=-(1e+10),y_max=-(1e+10),z_max=-(1e+10),x_min=1e+10,y_min=1e+10,st_x,st_y; int n = normals.size(); - // führe verschiebung durch + // führe verschiebung durch //for(int i=0; iyy; } - // gittergrößen bestimmung über die bounding-box + // gittergrößen bestimmung über die bounding-box n_x = int((x_max - x_min)/(y_max - y_min)*sqrt((x_max - x_min)*(y_max - y_min))); n_y = int((y_max - y_min)/(x_max - x_min)*sqrt((x_max - x_min)*(y_max - y_min))); @@ -431,7 +431,7 @@ bool UniGridApprox::CompKnots(int u_CP, int v_CP) bool UniGridApprox::MatComp(int u_CP, int v_CP) { - // hier wird schließlich approximiert + // hier wird schließlich approximiert int r = n_x; int s = n_y; @@ -516,7 +516,7 @@ bool UniGridApprox::MatComp(int u_CP, int v_CP) atlas::gemm(CblasTrans,CblasNoTrans, 1.0, Nv_left,Nv_left, 0.0,Nv); // Nv_left'*Nv_left = Nv !!! Achtung !!! std::vector upiv(n - 1); // pivotelement - atlas::lu_factor(Nu,upiv); // führt LU-Zerlegung durch + atlas::lu_factor(Nu,upiv); // führt LU-Zerlegung durch std::vector vpiv(m - 1); atlas::lu_factor(Nv,vpiv); @@ -710,7 +710,7 @@ bool UniGridApprox::MatComp(int u_CP, int v_CP) ublas::matrix Tmp = CPz; - //glättung des kontrollpunktnetzes + //glättung des kontrollpunktnetzes for (int i=1; i del_x(3,0.0); std::vector x(3,0.0); // Startparameter entspricht Nullvektor - Base::Vector3f centr_l,centr_r, cent; // Schwerpunkte der Punktesätze + Base::Vector3f centr_l,centr_r, cent; // Schwerpunkte der Punktesätze - // Newton Verfahren: 1. Löse H*del_x = -J + // Newton Verfahren: 1. Löse H*del_x = -J // 2. Setze x = x + del_x std::vector Jac(3); // 1.Ableitung der Fehlerfunktion (Jacobi-Matrix) @@ -482,25 +482,25 @@ bool best_fit::LSM() //m_Mesh = m_MeshWork; // Fehlerberechnung vom CAD -> Mesh - //tmp = CompError_GetPnts(m_pnts, m_normals); // hier: - Berechnung der LS-Punktesätze - // CompTotalError() // - Berechnung der zugehörigen Gewichtungen + //tmp = CompError_GetPnts(m_pnts, m_normals); // hier: - Berechnung der LS-Punktesätze + // CompTotalError() // - Berechnung der zugehörigen Gewichtungen delta = delta_tmp; delta_tmp = ANN(); // gibt durchschnittlichen absoluten Fehler aus delta = delta - delta_tmp ; // hier wird die Fehlerverbesserung zum vorigen Iterationsschritt gespeichert if (c==maxIter || delta < ERR_TOL && c>1) break; // Abbruchkriterium (falls maximale Iterationsschrite erreicht - // oder falls Fehleränderung unsignifikant gering) + // oder falls Fehleränderung unsignifikant gering) seconds2 = time(NULL); anOutputFile << c << ", " << delta_tmp << ", " << delta << " - Time: " << seconds2 - seconds1 << " sec" << endl; seconds1 = time(NULL); sec1 = time(NULL); - for (unsigned int i=0; i zurück zum Ursprung + // CAD-Mesh -> zurück zum Ursprung m_cad2orig.SetX(-orig.X()); m_cad2orig.SetY(-orig.Y()); m_cad2orig.SetZ(-orig.Z()); @@ -1522,7 +1522,7 @@ std::vector best_fit::Comp_Normals(MeshCore::MeshKernel &M) fArea = 0.0; normal.Set(0.0,0.0,0.0); - // Iteriere über die Dreiecke zu jedem Punkt + // Iteriere über die Dreiecke zu jedem Punkt for (std::set::const_iterator it = faceSet.begin(); it != faceSet.end(); ++it) { // Zweimal derefernzieren, um an das MeshFacet zu kommen und dem Kernel uebergeben, dass er ein MeshGeomFacet liefert diff --git a/src/Mod/Cam/App/best_fit.h b/src/Mod/Cam/App/best_fit.h index db4a0798e8..8ac690e9e0 100644 --- a/src/Mod/Cam/App/best_fit.h +++ b/src/Mod/Cam/App/best_fit.h @@ -38,7 +38,7 @@ #define SMALL_NUM 1e-6 -#define ERR_TOL 0.001 // Abbruchkriterium für Least-Square-Matching (Fehleränderung zweier aufeinanderfolgenden Iterationsschritten) +#define ERR_TOL 0.001 // Abbruchkriterium für Least-Square-Matching (Fehleränderung zweier aufeinanderfolgenden Iterationsschritten) /*! \brief The main class for the best_fit routine @@ -168,13 +168,13 @@ public: std::vector m_error; /*! \brief Stores the point-sets computed with the function ANN() */ - std::vector > m_LSPnts; // zu fittende Punktesätze für den Least-Square + std::vector > m_LSPnts; // zu fittende Punktesätze für den Least-Square /*! \brief Stores the weights computed with the function Comp_Weights() */ - std::vector m_weights; // gewichtungen für den Least-Square bzgl. allen Netzpunkte + std::vector m_weights; // gewichtungen für den Least-Square bzgl. allen Netzpunkte /*! \brief A working-copy of m_weights */ - std::vector m_weights_loc; // gewichtungen für den Least-Square bzgl. den projezierten Netzpunkten + std::vector m_weights_loc; // gewichtungen für den Least-Square bzgl. den projezierten Netzpunkten /*! \brief Translation-vector from the function ShapeFit_Coarse() */ gp_Vec m_cad2orig; // Translationsvektor welche die CAD-Geometrie um den Ursprung zentriert diff --git a/src/Mod/Cam/App/cutting_tools.cpp b/src/Mod/Cam/App/cutting_tools.cpp index 28205a1991..f32bf70b52 100644 --- a/src/Mod/Cam/App/cutting_tools.cpp +++ b/src/Mod/Cam/App/cutting_tools.cpp @@ -275,7 +275,7 @@ bool cutting_tools::fillFaceBBoxes() //float urange = LastUParameter - FirstUParameter; //float vrange = LastVParameter - FirstVParameter; ////Jetzt ein 10x10 Grid pro Face machen und so die BBox bestimmen -////Zunächst mal die BoundingBox auf Null setzen +////Zunächst mal die BoundingBox auf Null setzen //Bnd_Box currentBBox; // //for(int i=0;i<10;++i) @@ -319,14 +319,14 @@ bool cutting_tools::arrangecuts_ZLEVEL() { //We have to fill the required maps first fillFaceWireMap(); - //Zunächst wieder checken ob CAD oder nicht + //Zunächst wieder checken ob CAD oder nicht if (m_cad==false) { //Cast um die Nachkommastellen wegzuschneiden int cutnumber = (int)fabs((m_maxlevel-m_minlevel)/m_pitch); //m_pitch leicht korrigieren um wirklich auf die letzte Ebene zu kommen m_pitch = fabs(m_maxlevel-m_minlevel)/cutnumber; - //Jetzt die Schnitte machen. Die höchste Ebene fällt weg, da hier noch kein Blech gedrückt wird + //Jetzt die Schnitte machen. Die höchste Ebene fällt weg, da hier noch kein Blech gedrückt wird float z_level,z_level_corrected; TopoDS_Shape aCutShape; for (int i=1;i<=cutnumber;++i) @@ -347,7 +347,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() //Wenn wir mehrere Faces haben oder eine CAD-Geometrie vorhanden ist else { - //Über die MachiningOrder wird jetzt die Cutting-Folge festgelegt + //Über die MachiningOrder wird jetzt die Cutting-Folge festgelegt std::vector >::iterator MOrderIt; if (m_MachiningOrder.size()<2) return false; //Did not select at least two Levels //Now take two levels and perform the Cutting Stuff @@ -387,7 +387,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() cut(z_level,temp_min, aCutShape,z_level_corrected); if (z_level_corrected != z_level) std::cout << "Somehow we couldnt cut" << std::endl; - //Jetzt nur das gewünschte Resultat in den vector schieben (von oben nach unten große usw.) + //Jetzt nur das gewünschte Resultat in den vector schieben (von oben nach unten große usw.) Edgesort aCuttingShapeSorter(aCutShape); tempPair.first = z_level_corrected; if (m_direction) @@ -426,8 +426,8 @@ bool cutting_tools::arrangecuts_ZLEVEL() //} // std::map >::iterator zl_wire_it; -// //Wir holen uns jetzt den nächsten Z-Level raus. Wir müssen was kleineres -// //wie den höchsten Wert nehmen sonst gibt er immer den höchsten Wert aus +// //Wir holen uns jetzt den nächsten Z-Level raus. Wir müssen was kleineres +// //wie den höchsten Wert nehmen sonst gibt er immer den höchsten Wert aus // zl_wire_it = m_zl_wire_combination.upper_bound(temp_max-0.1); // if (zl_wire_it->first == temp_max) // { @@ -444,7 +444,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() // int cutnumber = (int)fabs((temp_max-temp_min)/m_pitch); // //m_pitch leicht korrigieren um wirklich auf die letzte Ebene zu kommen // m_pitch = fabs(temp_max-temp_min)/cutnumber; -// //Jetzt die Schnitte machen. Die höchste Ebene fällt weg, da hier noch kein Blech gedrückt wird +// //Jetzt die Schnitte machen. Die höchste Ebene fällt weg, da hier noch kein Blech gedrückt wird // float z_level,z_level_corrected; // TopoDS_Shape aCutShape; // //Jetzt schneiden (die oberste Ebene auslassen) @@ -459,7 +459,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() // //tempPair.second = result; // //m_ordered_cuts.push_back(tempPair); // cut(z_level,temp_min, aCutShape,z_level_corrected); -// //Jetzt die gefüllte Wire in den vector schieben +// //Jetzt die gefüllte Wire in den vector schieben // std::pair tempPair; // tempPair.first = z_level_corrected; // tempPair.second = aCutShape; @@ -525,7 +525,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() // aTempPair.second.clear(); // std::pair aTempBBoxPair; // -// //Z-Wert vom flachen Bereich in ein temporäres pair pushen +// //Z-Wert vom flachen Bereich in ein temporäres pair pushen // aTempPair.first = ((first.Z()+second.Z()+third.Z())/3); // //Jetzt durch das Face gehen und die Wires rausfiltern // TopExp_Explorer Explore_Face; @@ -566,7 +566,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() // //Aktuellen Punkt holen // gp_Pnt currentPoint = aProp.Value(i); // projectPointContainer aTempContainer; -// //checken auf welches Face wir projezieren könnnen +// //checken auf welches Face wir projezieren könnnen // for(m_face_bb_it = m_face_bboxes.begin();m_face_bb_it!=m_face_bboxes.end();++m_face_bb_it) // { // //Wenn der aktuelle Punkt in der BBox enthalten ist, dann machen wir mit der Projection weiter @@ -575,9 +575,9 @@ bool cutting_tools::arrangecuts_ZLEVEL() // atopo_surface = m_face_bb_it->first; // geom_surface = BRep_Tool::Surface(atopo_surface); // GeomAPI_ProjectPointOnSurf aPPS(currentPoint,geom_surface,0.001); -// //Wenn nichts projeziert werden kann, gehts gleich weiter zum nächsten Face bzw. der nächsten BBox +// //Wenn nichts projeziert werden kann, gehts gleich weiter zum nächsten Face bzw. der nächsten BBox // if (aPPS.NbPoints() == 0) continue; -// //Jetzt muss das aktuelle Face gespeichert werden, da es eventuell das face ist, welches am nächsten ist +// //Jetzt muss das aktuelle Face gespeichert werden, da es eventuell das face ist, welches am nächsten ist // double length = aPPS.LowerDistance(); // if(lowestdistance>length) // { @@ -589,16 +589,16 @@ bool cutting_tools::arrangecuts_ZLEVEL() // } // gp_Vec Uvec,Vvec,normalVec; // geom_surface = BRep_Tool::Surface(atopo_surface_shortest); -// //Das Face welches am nächsten ist in der temp-struct speichern +// //Das Face welches am nächsten ist in der temp-struct speichern // aTempContainer.face = atopo_surface_shortest; // geom_surface->D1(Umin,Vmin,aTempContainer.point,Uvec,Vvec); -// //Jetzt den Normalenvector auf die Fläche ausrechnen +// //Jetzt den Normalenvector auf die Fläche ausrechnen // normalVec = Uvec; // normalVec.Cross(Vvec); // normalVec.Normalize(); // //Jetzt ist die Normale berechnet und auch normalisiert // //Jetzt noch checken ob die Normale auch wirklich wie alle anderen auf die gleiche Seite zeigt. -// //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) +// //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) // if(normalVec.Z()<0) normalVec.Multiply(-1.0); // //Mal kurz den Winkel zur Grund-Ebene ausrechnen // aTempContainer.normalvector = normalVec; @@ -611,7 +611,7 @@ bool cutting_tools::arrangecuts_ZLEVEL() TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) { - //Bisher funktioniert das Ganze nur für Schnitte welche nur einmal rundherum laufen und noch nicht für Inseln + //Bisher funktioniert das Ganze nur für Schnitte welche nur einmal rundherum laufen und noch nicht für Inseln TopExp_Explorer exploreShape; exploreShape.Init(aShape,TopAbs_EDGE); int k=0; @@ -620,7 +620,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) k++; } //Jetzt die Edges alle in eine Wire packen (mit Add) und schauen ob ein Fehler kommt. - //Wenn ja, dann die nächste Edge. Solange bis alle Edges drin sind. + //Wenn ja, dann die nächste Edge. Solange bis alle Edges drin sind. if (k<1) { @@ -637,7 +637,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) listofedge.clear(); listofedge_tmp.clear(); exploreShape.ReInit(); - //Edge-Liste füllen + //Edge-Liste füllen for (; exploreShape.More(); exploreShape.Next()) { a_edge_container.edge = TopoDS::Edge(exploreShape.Current()); @@ -662,7 +662,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) } else { - //Abstände ausrechnen + //Abstände ausrechnen double abstand1=sqrt((*it_edge).firstPoint.SquareDistance(lastpointoflastedge)); double abstand2=sqrt((*it_edge).lastPoint.SquareDistance(lastpointoflastedge)); double abstand3=sqrt((*it_edge).firstPoint.SquareDistance(firstpointoflastedge)); @@ -726,7 +726,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) // outfile.open("c:/atest.out"); // // -// //Die ordered_cuts sind ein Vector wo für jede Ebene ein Pair existiert +// //Die ordered_cuts sind ein Vector wo für jede Ebene ein Pair existiert // for(m_ordered_cuts_it = m_ordered_cuts.begin();m_ordered_cuts_it!=m_ordered_cuts.end();++m_ordered_cuts_it) // { // float current_z_level = m_ordered_cuts_it->first; @@ -743,7 +743,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) // //Aktuellen Punkt holen // gp_Pnt currentPoint(avector_it->x,avector_it->y,avector_it->z); // gp_Pnt nearest_Point; -// //checken auf welches Face wir projezieren könnnen +// //checken auf welches Face wir projezieren könnnen // for(m_face_bb_it = m_face_bboxes.begin();m_face_bb_it!=m_face_bboxes.end();++m_face_bb_it) // { // //Wenn der aktuelle Punkt in der BBox enthalten ist, dann machen wir mit der Projection weiter @@ -752,9 +752,9 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) // atopo_surface = m_face_bb_it->first; // geom_surface = BRep_Tool::Surface(atopo_surface); // GeomAPI_ProjectPointOnSurf aPPS(currentPoint,geom_surface,0.001); -// //Wenn nichts projeziert werden kann, gehts gleich weiter zum nächsten Face bzw. der nächsten BBox +// //Wenn nichts projeziert werden kann, gehts gleich weiter zum nächsten Face bzw. der nächsten BBox // if (aPPS.NbPoints() == 0) continue; -// //Jetzt muss das aktuelle Face gespeichert werden, da es eventuell das face ist, welches am nächsten ist +// //Jetzt muss das aktuelle Face gespeichert werden, da es eventuell das face ist, welches am nächsten ist // double length = aPPS.LowerDistance(); // if(lowestdistance>length) // { @@ -765,7 +765,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) // } // } // } -// //Für eine saubere Projection auf der aktuellen Ebene wird jetzt der Richtungsvector +// //Für eine saubere Projection auf der aktuellen Ebene wird jetzt der Richtungsvector // //aus dem projezierten Punkt und dem Ursprungspunkt gebildet // //und dieser dann hergenommen um damit nochmal in dessen Richtung zu projezieren // gp_Vec aVec(currentPoint,nearest_Point); @@ -776,7 +776,7 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) // IntCurvesFace_ShapeIntersector aFaceIntSect; // aFaceIntSect.Load(m_Shape, 0.001); // aFaceIntSect.PerformNearest(aLine,-RealLast(), +RealLast()); -// //Jetzt holen wir uns auf der Fläche den U und V Wert um dann D1 und D2 bestimmen zu können +// //Jetzt holen wir uns auf der Fläche den U und V Wert um dann D1 und D2 bestimmen zu können // gp_Pnt projectedPoint,OffsetPoint; // gp_Pnt testpoint,testpoint2; // float abstand,abstand_old; @@ -802,9 +802,9 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) // normalVec.Normalize(); // //Jetzt ist die Surface-Normale berechnet und auch normalisiert // //Jetzt noch checken ob die Normale auch wirklich wie alle anderen auf die gleiche Seite zeigt. -// //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) +// //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) // if(normalVec.Z()<0) normalVec.Multiply(-1.0); -// //Jetzt die Normale auf die Radiuslänge verlängern +// //Jetzt die Normale auf die Radiuslänge verlängern // normalVec.Multiply(radius); // //Jetzt die Z-Komponente auf 0 setzen // normalVec.SetZ(0.0); @@ -904,12 +904,12 @@ TopoDS_Wire cutting_tools::ordercutShape(const TopoDS_Shape &aShape) // distance = (finalPoints[j+i].point).SquareDistance(finalPoints[j].point); // if(distance(175.0/180.0*D_PI)) return true; else @@ -1069,7 +1069,7 @@ bool cutting_tools::OffsetWires_Standard() //Version wo nur in X,Y-Ebene verscho gp_Pnt lastPoint(0.0,0.0,0.0); //Initialize the first Point to the Origin current_flat_level = m_ordered_cuts.begin(); bool slave_is_wire= false; //Necessary if the slave is a wire while the master is not... - //Nicht beim höchsten Anfangen, da wir den nicht mit dem Master fahren wollen + //Nicht beim höchsten Anfangen, da wir den nicht mit dem Master fahren wollen for (m_ordered_cuts_it = m_ordered_cuts.begin()+1;m_ordered_cuts_it!=m_ordered_cuts.end();++m_ordered_cuts_it) { std::vector > MasterPointContainer; @@ -1278,13 +1278,13 @@ bool cutting_tools::OffsetWires_Standard() //Version wo nur in X,Y-Ebene verscho GeomAdaptor_Surface aGeom_Adaptor(aSurface); int t = aGeom_Adaptor.GetType(); aGeom_Adaptor.D1(a2dParaPoint.X(),a2dParaPoint.Y(),aSurfacePoint,Uvec,Vvec); - //Jetzt den Normalenvector auf die Fläche ausrechnen + //Jetzt den Normalenvector auf die Fläche ausrechnen normalVec = Uvec; normalVec.Cross(Vvec); normalVec.Normalize(); //Jetzt ist die Normale berechnet und auch normalisiert //Jetzt noch checken ob die Normale auch wirklich auf die saubere Seite zeigt - //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) + //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) if (normalVec.Z()<0) normalVec.Multiply(-1.0); //Mal kurz den Winkel zur Grund-Ebene ausrechnen @@ -1296,11 +1296,11 @@ bool cutting_tools::OffsetWires_Standard() //Version wo nur in X,Y-Ebene verscho //Jetzt die Z-Komponente auf 0 setzen //normalVec.SetZ(0.0); normalVec.Normalize(); - //Jetzt die Normale mit folgender Formel multiplizieren für den Master + //Jetzt die Normale mit folgender Formel multiplizieren für den Master //double multiply = m_UserSettings.master_radius*(1-sin(PointContactPair.second))/cos(PointContactPair.second); double multiply = m_UserSettings.master_radius; normalVec.Multiply(multiply); - //und hier für den Slave + //und hier für den Slave NormalVecSlave.Normalize(); multiply = m_UserSettings.sheet_thickness+m_UserSettings.slave_radius; NormalVecSlave.Multiply(multiply); @@ -1312,7 +1312,7 @@ bool cutting_tools::OffsetWires_Standard() //Version wo nur in X,Y-Ebene verscho SlavePoint.SetXYZ(aSurfacePoint.XYZ() + NormalVecSlave.XYZ()); //PointContactPair.first.SetZ(PointContactPair.first.Z() + m_UserSettings.master_radius); //Damit wir keine Punkte bekommen die zu nahe beieinander liegen - //Den letzten hinzugefügten Punkt suchen + //Den letzten hinzugefügten Punkt suchen if (MasterPointContainer.size()>0 && (MasterPointContainer.rbegin()->first.SquareDistance(PointContactPair.first)>0.001)) { MasterPointContainer.push_back(PointContactPair); @@ -1646,13 +1646,13 @@ bool cutting_tools::OffsetWires_Standard() //Version wo nur in X,Y-Ebene verscho GeomAdaptor_Surface aGeom_Adaptor(aSurface); int t = aGeom_Adaptor.GetType(); aGeom_Adaptor.D1(a2dParaPoint.X(),a2dParaPoint.Y(),aSurfacePoint,Uvec,Vvec); - //Jetzt den Normalenvector auf die Fläche ausrechnen + //Jetzt den Normalenvector auf die Fläche ausrechnen normalVec = Uvec; normalVec.Cross(Vvec); normalVec.Normalize(); //Jetzt ist die Normale berechnet und auch normalisiert //Jetzt noch checken ob die Normale auch wirklich auf die saubere Seite zeigt - //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) + //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) if (normalVec.Z()<0) normalVec.Multiply(-1.0); //Mal kurz den Winkel zur Grund-Ebene ausrechnen @@ -1664,12 +1664,12 @@ bool cutting_tools::OffsetWires_Standard() //Version wo nur in X,Y-Ebene verscho //Jetzt die Z-Komponente auf 0 setzen //normalVec.SetZ(0.0); normalVec.Normalize(); - //Jetzt die Normale mit folgender Formel multiplizieren für den Master + //Jetzt die Normale mit folgender Formel multiplizieren für den Master //double multiply = (m_UserSettings.slave_radius*(1-sin(PointContactPair.second))/cos(PointContactPair.second))+m_UserSettings.sheet_thickness; double multiply = m_UserSettings.slave_radius + m_UserSettings.sheet_thickness; //As the Master is now the Slave we have to multiply it also by -1.0 normalVec.Multiply(-multiply); - //und hier für den Slave + //und hier für den Slave NormalVecSlave.Normalize(); multiply = m_UserSettings.master_radius; NormalVecSlave.Multiply(multiply); @@ -1678,7 +1678,7 @@ bool cutting_tools::OffsetWires_Standard() //Version wo nur in X,Y-Ebene verscho SlavePoint.SetXYZ(aSurfacePoint.XYZ() + NormalVecSlave.XYZ()); //PointContactPair.first.SetZ(PointContactPair.first.Z() - m_UserSettings.slave_radius); //Damit wir keine Punkte bekommen die zu nahe beieinander liegen - //Den letzten hinzugefügten Punkt suchen + //Den letzten hinzugefügten Punkt suchen if (MasterPointContainer.size()>0 && (MasterPointContainer.rbegin()->first.SquareDistance(PointContactPair.first)>(Precision::Confusion()*Precision::Confusion()))) { MasterPointContainer.push_back(PointContactPair); @@ -1868,7 +1868,7 @@ bool cutting_tools::calculateAccurateSlaveZLevel(std::vector m_MachiningOrder[1].first.z) { //Wir sind von oben nach unten im ersten Teil @@ -2081,7 +2081,7 @@ bool cutting_tools::OffsetWires_Spiral() bool just_started = true; // gp_Vec direction_vector(0.0,0.0,1.0),last_direction_vector(0.0,0.0,1.0);//Just to initialize them bool direction = true; //for the Robot, this tells the algo that we have to switch the direction - //Nicht beim höchsten Anfangen, da wir den nicht mit dem Master fahren wollen + //Nicht beim höchsten Anfangen, da wir den nicht mit dem Master fahren wollen for (m_ordered_cuts_it = m_ordered_cuts.begin()+1;m_ordered_cuts_it!=m_ordered_cuts.end();++m_ordered_cuts_it) { std::vector OffsetSpiralPoints,TempSpiralPoints; @@ -2161,13 +2161,13 @@ bool cutting_tools::OffsetWires_Spiral() } GeomAdaptor_Surface aGeom_Adaptor(aSurface); aGeom_Adaptor.D1(a2dParaPoint.X(),a2dParaPoint.Y(),aSurfacePoint,Uvec,Vvec); - //Jetzt den Normalenvector auf die Fläche ausrechnen + //Jetzt den Normalenvector auf die Fläche ausrechnen normalVec = Uvec; normalVec.Cross(Vvec); normalVec.Normalize(); //Jetzt ist die Normale berechnet und auch normalisiert //Jetzt noch checken ob die Normale auch wirklich auf die saubere Seite zeigt - //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) + //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) if (normalVec.Z()<0) normalVec.Multiply(-1.0); @@ -2257,7 +2257,7 @@ bool cutting_tools::OffsetWires_Spiral() direction_vector.Normalize(); direction_vector.Multiply(1.0); //Zum testen bauen wir keinen Offset ein //switch the Spiral-direction if the clockwise flag is checked and the - //angle between the last and current round is more then 90° + //angle between the last and current round is more then 90° double angle = direction_vector.Angle(last_direction_vector); if (m_UserSettings.clockwise && angle<(D_PI*0.5)) direction = true; //We are already in the wright direction @@ -2477,13 +2477,13 @@ bool cutting_tools::OffsetWires_Spiral() } GeomAdaptor_Surface aGeom_Adaptor(aSurface); aGeom_Adaptor.D1(a2dParaPoint.X(),a2dParaPoint.Y(),aSurfacePoint,Uvec,Vvec); - //Jetzt den Normalenvector auf die Fläche ausrechnen + //Jetzt den Normalenvector auf die Fläche ausrechnen normalVec = Uvec; normalVec.Cross(Vvec); normalVec.Normalize(); //Jetzt ist die Normale berechnet und auch normalisiert //Jetzt noch checken ob die Normale auch wirklich auf die saubere Seite zeigt - //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) + //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) if (normalVec.Z()<0) normalVec.Multiply(-1.0); @@ -2560,7 +2560,7 @@ bool cutting_tools::OffsetWires_Spiral() direction_vector.Normalize(); direction_vector.Multiply(10.0); //switch the Spiral-direction if the clockwise flag is checked and the - //angle between the last and current round is more then 90° + //angle between the last and current round is more then 90° double angle = direction_vector.Angle(last_direction_vector); if (m_UserSettings.clockwise && angle<(D_PI*0.5)) @@ -2762,7 +2762,7 @@ bool cutting_tools::OffsetWires_FeatureBased() gp_Pnt lastPoint(0.0,0.0,0.0); //Initialize the first Point to the Origin current_flat_level = m_ordered_cuts.begin(); bool slave_done= false; //Necessary if the slave is already put out - //Nicht beim höchsten Anfangen, da wir den nicht mit dem Master fahren wollen + //Nicht beim höchsten Anfangen, da wir den nicht mit dem Master fahren wollen for (m_ordered_cuts_it = m_ordered_cuts.begin()+1;m_ordered_cuts_it!=m_ordered_cuts.end();++m_ordered_cuts_it) { std::vector > MasterPointContainer; @@ -2938,13 +2938,13 @@ bool cutting_tools::OffsetWires_FeatureBased() GeomAdaptor_Surface aGeom_Adaptor(aSurface); int t = aGeom_Adaptor.GetType(); aGeom_Adaptor.D1(a2dParaPoint.X(),a2dParaPoint.Y(),aSurfacePoint,Uvec,Vvec); - //Jetzt den Normalenvector auf die Fläche ausrechnen + //Jetzt den Normalenvector auf die Fläche ausrechnen normalVec = Uvec; normalVec.Cross(Vvec); normalVec.Normalize(); //Jetzt ist die Normale berechnet und auch normalisiert //Jetzt noch checken ob die Normale auch wirklich auf die saubere Seite zeigt - //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) + //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) if (normalVec.Z()<0) normalVec.Multiply(-1.0); //Mal kurz den Winkel zur Grund-Ebene ausrechnen @@ -2955,14 +2955,14 @@ bool cutting_tools::OffsetWires_FeatureBased() //Jetzt die Z-Komponente auf 0 setzen //normalVec.SetZ(0.0); normalVec.Normalize(); - //Jetzt die Normale mit folgender Formel multiplizieren für den Master + //Jetzt die Normale mit folgender Formel multiplizieren für den Master //double multiply = m_UserSettings.master_radius*(1-sin(PointContactPair.second))/cos(PointContactPair.second); double multiply = m_UserSettings.master_radius; normalVec.Multiply(multiply); //Jetzt den OffsetPunkt berechnen PointContactPair.first.SetXYZ(aSurfacePoint.XYZ() + normalVec.XYZ()); //Damit wir keine Punkte bekommen die zu nahe beieinander liegen - //Den letzten hinzugefügten Punkt suchen + //Den letzten hinzugefügten Punkt suchen if (MasterPointContainer.size()>0 && (MasterPointContainer.rbegin()->first.SquareDistance(PointContactPair.first)>0.001)) { MasterPointContainer.push_back(PointContactPair); @@ -3216,13 +3216,13 @@ bool cutting_tools::OffsetWires_FeatureBased() GeomAdaptor_Surface aGeom_Adaptor(aSurface); int t = aGeom_Adaptor.GetType(); aGeom_Adaptor.D1(a2dParaPoint.X(),a2dParaPoint.Y(),aSurfacePoint,Uvec,Vvec); - //Jetzt den Normalenvector auf die Fläche ausrechnen + //Jetzt den Normalenvector auf die Fläche ausrechnen normalVec = Uvec; normalVec.Cross(Vvec); normalVec.Normalize(); //Jetzt ist die Normale berechnet und auch normalisiert //Jetzt noch checken ob die Normale auch wirklich auf die saubere Seite zeigt - //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) + //dazu nur checken ob der Z-Wert der Normale größer Null ist (dann im 1.und 2. Quadranten) if (normalVec.Z()<0) normalVec.Multiply(-1.0); //Mal kurz den Winkel zur Grund-Ebene ausrechnen @@ -3233,7 +3233,7 @@ bool cutting_tools::OffsetWires_FeatureBased() //Jetzt die Z-Komponente auf 0 setzen //normalVec.SetZ(0.0); normalVec.Normalize(); - //Jetzt die Normale mit folgender Formel multiplizieren für den Master + //Jetzt die Normale mit folgender Formel multiplizieren für den Master //double multiply = m_UserSettings.master_radius*(1-sin(PointContactPair.second))/cos(PointContactPair.second); double multiply = m_UserSettings.slave_radius + m_UserSettings.sheet_thickness; normalVec.Multiply(multiply); @@ -3241,7 +3241,7 @@ bool cutting_tools::OffsetWires_FeatureBased() //Jetzt den OffsetPunkt berechnen PointContactPair.first.SetXYZ(aSurfacePoint.XYZ() + normalVec.XYZ()); //Damit wir keine Punkte bekommen die zu nahe beieinander liegen - //Den letzten hinzugefügten Punkt suchen + //Den letzten hinzugefügten Punkt suchen if (MasterPointContainer.size()>0 && (MasterPointContainer.rbegin()->first.SquareDistance(PointContactPair.first)>0.001)) { MasterPointContainer.push_back(PointContactPair); @@ -3347,7 +3347,7 @@ bool cutting_tools::cut_Mesh(float z_level, float min_level, std::list=1) factor = float(0.95); - //Wenn wir das erste Mal eine Korrektur machen müssen gehts zunächst mal mit Minus rein + //Wenn wir das erste Mal eine Korrektur machen müssen gehts zunächst mal mit Minus rein if (direction) { z_level_plane.z = (z_level-(m_pitch*factor)); @@ -3397,7 +3397,7 @@ bool cutting_tools::cut(float z_level, float min_level, TopoDS_Shape &aCutShape, gp_Pnt aPlanePnt(0,0,z_level); gp_Dir aPlaneDir(0,0,1); bool cutok; - //Die Richtung für die Korrektur wird hier festgelegt + //Die Richtung für die Korrektur wird hier festgelegt bool correction=true; float factor = 0.0; do @@ -3420,10 +3420,10 @@ bool cutting_tools::cut(float z_level, float min_level, TopoDS_Shape &aCutShape, if (!exploreShape.More()) { cutok = false; - //Jedes Mal ein wenig mehr Abstand für die Korrektur einfügen + //Jedes Mal ein wenig mehr Abstand für die Korrektur einfügen factor = factor+float(0.05); if (factor>=1) factor = float(0.95); - //Wenn wir das erste Mal eine Korrektur machen müssen gehts zunächst mal mit Minus rein + //Wenn wir das erste Mal eine Korrektur machen müssen gehts zunächst mal mit Minus rein if (correction) { aPlanePnt.SetZ(z_level-(m_pitch*factor)); @@ -3439,7 +3439,7 @@ bool cutting_tools::cut(float z_level, float min_level, TopoDS_Shape &aCutShape, continue; } } - //Das Shape, welches per Referenz übergeben wird jetzt mit dem geordneten Schnitt füllen + //Das Shape, welches per Referenz übergeben wird jetzt mit dem geordneten Schnitt füllen aCutShape = mkCut.Shape(); } @@ -3480,7 +3480,7 @@ bool cutting_tools::classifyShape() //Falls wir nur ein Face haben und keine flachen Bereiche if (m_all_cuts.empty()) { - //Schnitte über die Bounding Box bestimmen + //Schnitte über die Bounding Box bestimmen Bnd_Box currentBBox; Standard_Real XMin, YMin, ZMin, XMax, YMax, ZMax; @@ -3492,8 +3492,8 @@ bool cutting_tools::classifyShape() int cutnumber = fabs((maxlevel-minlevel)/m_pitch);//Cast um die Nachkommastellen wegzuschneiden m_pitch = fabs(maxlevel-minlevel)/cutnumber;//m_pitch leicht korrigieren um wirklich auf die letzte Ebene zu kommen - //Aktuell wird die letzte Ebene bei selbst approxmierten Flächen nicht als Bahnkurve betrachtet - //Auch die erste Ebene fällt komplett weg, da unwichtig. Lediglich für die untere Maschine ist die Bahn sinnvoll falls überhaupt noch flache Bereiche vorhanden sind + //Aktuell wird die letzte Ebene bei selbst approxmierten Flächen nicht als Bahnkurve betrachtet + //Auch die erste Ebene fällt komplett weg, da unwichtig. Lediglich für die untere Maschine ist die Bahn sinnvoll falls überhaupt noch flache Bereiche vorhanden sind for (int i=0;iX2Max && Y1Min < Y2Min && Y1Max>Y2Max) //1 ist größer + if(X1MinX2Max && Y1Min < Y2Min && Y1Max>Y2Max) //1 ist größer { if(m_it == m_all_cuts.begin())//Wenn wir auf der obersten Ebene sind.... { atemp_storage.push_back(*(m_it+1)); - m_it++;//Wir überspringen damit das nächste //Damit haben wir nur noch ein Problem falls wir mehr als zwei Wires auf einer ebene haben. + m_it++;//Wir überspringen damit das nächste //Damit haben wir nur noch ein Problem falls wir mehr als zwei Wires auf einer ebene haben. } else { @@ -3570,10 +3570,10 @@ bool cutting_tools::classifyShape() InitialPlaneLevels.push_back((*m_it).first); } } - //Jetzt die flachen Bereiche der Höhe nach sortieren + //Jetzt die flachen Bereiche der Höhe nach sortieren std::sort(InitialPlaneLevels.begin(),InitialPlaneLevels.end(),FloatHuge); - //Die Schnitte müssen jetzt zwischen die flachen Stücke einsortiert werden + //Die Schnitte müssen jetzt zwischen die flachen Stücke einsortiert werden for (temp_it=InitialPlaneLevels.begin();temp_it #include -#define curvTOL 30.0 // gibt maximalen Krümmungsradius an ab welchem eine Unterteilung der Kurve erfolgt -#define TolDist 1.0 // entspricht der Samplingschrittweite der Kurvenpunkte für den Roboter-Output +#define curvTOL 30.0 // gibt maximalen Krümmungsradius an ab welchem eine Unterteilung der Kurve erfolgt +#define TolDist 1.0 // entspricht der Samplingschrittweite der Kurvenpunkte für den Roboter-Output /* Konstruktor mit zwei Bahnfolgen (master tool & supporting die) als Input */ path_simulate::path_simulate(const std::vector &BSplineTop, @@ -49,7 +49,7 @@ path_simulate::path_simulate(const std::vector &BSplin m_single = false; - if(m_pretension > 0) beam = true; // flag für "write_output_***" generierung + if(m_pretension > 0) beam = true; // flag für "write_output_***" generierung else beam = false; //Initialize the Iterators @@ -130,7 +130,7 @@ double path_simulate::GetLength(GeomAdaptor_Curve& curve, const Standard_Real st } - return GCPnts_AbscissaPoint::Length(curve,sParam,eParam); // genauigkeitssteuerung über parameter TOL nach eParam + return GCPnts_AbscissaPoint::Length(curve,sParam,eParam); // genauigkeitssteuerung über parameter TOL nach eParam } */ @@ -154,7 +154,7 @@ double path_simulate::FindParamAt(GeomAdaptor_Curve& curve, double dist, double /* Hier wird die absolute Geschwindigkeitsfunktion definiert und liefert die Geschwindigkeit zur Zeiteingabe . Die Funktion gliedert sich in drei Abschnitte mit den Parametergrenzen , , , welche z.B. mittels path_simulate::ParameterCalculation() ermittelt werden kann. -Die Start- und Endgeschwindigkeit müssen vorher in und bestimmt werden. +Die Start- und Endgeschwindigkeit müssen vorher in und bestimmt werden. Die maximale Geschwindigkeit welche zwischen und erreicht werden soll, entspricht hier */ double path_simulate::GetVelocity(double t) { @@ -197,7 +197,7 @@ double path_simulate::GetVelocity(double t) return vel; } -/* Diese Funktion liefert den zurückgelegten Weg zur Zeiteingabe und entspricht +/* Diese Funktion liefert den zurückgelegten Weg zur Zeiteingabe und entspricht dem Integral der Funktion GetVelocity(t)*/ double path_simulate::GetDistance(double t) { @@ -258,7 +258,7 @@ double path_simulate::GetWireLength(TopoDS_Wire &aWire) } */ -/*Parameterberechnung der Geschwindigkeitsfunktion für eine gerade Strecke der Länge */ +/*Parameterberechnung der Geschwindigkeitsfunktion für eine gerade Strecke der Länge */ bool path_simulate::ParameterCalculation_Line(double S1) { if (S1 == 0.0) // hier gibts nichts zu tun @@ -273,7 +273,7 @@ bool path_simulate::ParameterCalculation_Line(double S1) m_v[1] = sqrt(m_a*S1/2.0); // Geschwindigkeit die notwendig ist damit der Weg zur Zeit erreicht wird m_v[2] = 0.0; // Endgeschwindigkeit wird auf Null gesetzt - while(m_v[1] > m_vmax) // maximale Geschwindigkeit darf nicht überschritten werden + while(m_v[1] > m_vmax) // maximale Geschwindigkeit darf nicht überschritten werden { m_a /= 2; // Versuchs erneut mit halber Beschleunigung m_v[1] = sqrt(m_a*S1/2.0); // Geschwindigkeit die notwendig ist damit der Weg zur Zeit erreicht wird @@ -288,7 +288,7 @@ bool path_simulate::ParameterCalculation_Line(double S1) } /*Parameterberechnung der Geschwindigkeitsfunktion (definiert in path_simulate::GetVelocity()) -für einen Kurvenabschnitt der Länge . Aufruf muss stets vor der Funktion path_simulate::GetVelocity() erfolgen*/ +für einen Kurvenabschnitt der Länge . Aufruf muss stets vor der Funktion path_simulate::GetVelocity() erfolgen*/ bool path_simulate::ParameterCalculation_Curve(double S1) { // Berechnung der Zeitgrenzen @@ -297,7 +297,7 @@ bool path_simulate::ParameterCalculation_Curve(double S1) m_T = m_t1 + 2*(abs(m_v[1]-m_v[2]))/m_a; double tmp, v_tmp; - tmp = GetDistance(m_T); // liefert den Weg zurück, der unter den gegebenen Parametereinstellungen, + tmp = GetDistance(m_T); // liefert den Weg zurück, der unter den gegebenen Parametereinstellungen, // zum hoch- und runterbeschleunigen, midestens notwendig ist if (tmp <= S1) // d.h. der Weg reicht aus @@ -333,7 +333,7 @@ bool path_simulate::ParameterCalculation_Curve(double S1) v_tmp = (m_vmax - std::min(m_v[1],m_v[2]))/2.0; while(tmp > S1) // hier wird die Geschwindigkeit solange in Richtung vekleinert bis - // der Weg schließlich ausreicht + // der Weg schließlich ausreicht { m_v[1] = std::min(m_v[1],m_v[2]) + v_tmp; @@ -349,12 +349,12 @@ bool path_simulate::ParameterCalculation_Curve(double S1) } } - m_T = m_t2 + 2*(abs(m_v[1]-m_v[2]))/m_a; // Endzeit lässt sich jetzt berechnen + m_T = m_t2 + 2*(abs(m_v[1]-m_v[2]))/m_a; // Endzeit lässt sich jetzt berechnen return true; } -/* setzt die Outputvektoren und den Beschleunigungsparameter zurück. Die Startzeit wird aktualisiert*/ +/* setzt die Outputvektoren und den Beschleunigungsparameter zurück. Die Startzeit wird aktualisiert*/ bool path_simulate::UpdateParam() { m_Output.clear(); @@ -368,7 +368,7 @@ bool path_simulate::UpdateParam() return true; } -/* Hilfsfunktion für die Zustellung. Rückgabewert legt fest ob zuerst in z- oder in xy-Richtung zugestellt wird*/ +/* Hilfsfunktion für die Zustellung. Rückgabewert legt fest ob zuerst in z- oder in xy-Richtung zugestellt wird*/ bool path_simulate::CheckConnect() { gp_Pnt tmp; @@ -379,7 +379,7 @@ bool path_simulate::CheckConnect() m_StartPnts1.clear(); m_StartPnts2.clear(); - // Berechne neue Verbindungspunkte für die Zustellung - MASTER - + // Berechne neue Verbindungspunkte für die Zustellung - MASTER - m_it1--; (*m_it1)->D0((*m_it1)->LastParameter(),tmp); // Speichert Endpunkt der vorigen Master-Kurve in @@ -390,9 +390,9 @@ bool path_simulate::CheckConnect() (*m_it1)->D0((*m_it1)->FirstParameter(),tmp); // Speichert Startpunkt der vorigen Master-Kurve in m_StartPnts1.push_back(tmp); // Pushe Startpunkt der aktuellen Master-Kurve - if (m_single == false) // Falls beidseitig gefahren wird, mache dasselbe, wie für den Slave (s.o.) + if (m_single == false) // Falls beidseitig gefahren wird, mache dasselbe, wie für den Slave (s.o.) { - // Berechne neue Verbindungspunkte für die Zustellung - SLAVE - + // Berechne neue Verbindungspunkte für die Zustellung - SLAVE - m_it2--; (*m_it2)->D0((*m_it2)->LastParameter(),tmp); // Speichert Startpunkt der vorigen Slave-Kurve in @@ -413,7 +413,7 @@ bool path_simulate::CheckConnect() else return false; // Zustellung in positiver z-Richtung } -/* Hilfsfunktion für die Zustellung. Rückgabewert legt fest ob zuerst in z- oder in xy-Richtung zugestellt wird*/ +/* Hilfsfunktion für die Zustellung. Rückgabewert legt fest ob zuerst in z- oder in xy-Richtung zugestellt wird*/ bool path_simulate::CheckConnect(bool tool) { gp_Pnt tmp; @@ -421,7 +421,7 @@ bool path_simulate::CheckConnect(bool tool) // ab dem 2. lauf if (m_it1 != m_BSplineTop.begin() || m_it2 != m_BSplineBottom.begin()) { - if (m_Feat == true) // Für den Feature-Basierten Fall werden die Zustellungen von Master und Slave seperat behandelt + if (m_Feat == true) // Für den Feature-Basierten Fall werden die Zustellungen von Master und Slave seperat behandelt { if (!tool) { @@ -457,11 +457,11 @@ bool path_simulate::CheckConnect(bool tool) } } - // Ab hier: Berechnung der Zustellungsvektoren für die synchrone Zustellung von Master und Slave + // Ab hier: Berechnung der Zustellungsvektoren für die synchrone Zustellung von Master und Slave m_StartPnts1.clear(); m_StartPnts2.clear(); - // Berechne neue Verbindungspunkte für die Zustellung - MASTER + // Berechne neue Verbindungspunkte für die Zustellung - MASTER m_it1--; (*m_it1)->D0((*m_it1)->LastParameter(),tmp); @@ -474,7 +474,7 @@ bool path_simulate::CheckConnect(bool tool) if (m_single == false) { - // Berechne neue Verbindungspunkte für die Zustellung - SLAVE + // Berechne neue Verbindungspunkte für die Zustellung - SLAVE m_it2--; (*m_it2)->D0((*m_it2)->LastParameter(),tmp); @@ -495,7 +495,7 @@ bool path_simulate::CheckConnect(bool tool) else return false; } -/* Füllt die Outputvektoren für die erste Zustellung. Der Eingabeparameter legt den Ausgabetyp fest*/ +/* Füllt die Outputvektoren für die erste Zustellung. Der Eingabeparameter legt den Ausgabetyp fest*/ bool path_simulate::ConnectPaths_xy(bool brob) { int N; @@ -612,11 +612,11 @@ bool path_simulate::ConnectPaths_xy(bool brob) m_Output.push_back(tmp2); m_Output2.push_back(tmp2); } - else // Roboter Output für den beidseitigen Fall + else // Roboter Output für den beidseitigen Fall { bool con = false; - // hier wird die Anzahl der Punkte für die Diskretisierung der Zustellungslinie berechnet + // hier wird die Anzahl der Punkte für die Diskretisierung der Zustellungslinie berechnet if (vec_11.Magnitude() > vec_21.Magnitude()) N = std::max(2, int(ceil(vec_21.Magnitude()/TolDist))); else N = std::max(2, int(ceil(vec_11.Magnitude()/TolDist))); @@ -738,7 +738,7 @@ bool path_simulate::ConnectPaths_xy(bool brob) return true; } -/* Füllt die Outputvektoren für die zweite Zustellung. Der Eingabeparameter legt den Ausgabetyp fest*/ +/* Füllt die Outputvektoren für die zweite Zustellung. Der Eingabeparameter legt den Ausgabetyp fest*/ bool path_simulate::ConnectPaths_z(bool brob) { int N; @@ -860,7 +860,7 @@ bool path_simulate::ConnectPaths_z(bool brob) { /*MASTER*/ - // Erzeuge Outputvektor für die Zustellung in Z-Richtung + // Erzeuge Outputvektor für die Zustellung in Z-Richtung tmp.x = m_StartPnts1[m_conn].X(); tmp.y = m_StartPnts1[m_conn].Y(); tmp.z = m_StartPnts1[0].Z() + (double(i)*vec_11.Y())/double(N-1); @@ -874,14 +874,14 @@ bool path_simulate::ConnectPaths_z(bool brob) if (m_it1 == m_BSplineTop.begin() && m_it2 == m_BSplineBottom.begin()) { - // Erzeuge Outputvektor für die Zustellung in Z-Richtung (nur im allerersten Schritt) + // Erzeuge Outputvektor für die Zustellung in Z-Richtung (nur im allerersten Schritt) tmp.x = m_StartPnts2[1].X(); tmp.y = m_StartPnts2[1].Y(); tmp.z = m_StartPnts2[0].Z() + (double(i)*vec_12.Y())/double(N-1); } else { - // Erzeuge Outputvektor für die Zustellung in XY-Richtung + // Erzeuge Outputvektor für die Zustellung in XY-Richtung tmp.x = m_StartPnts2[0].X() + (double(i)*vec_12.X())/double(N-1); tmp.y = m_StartPnts2[0].Y() + (double(i)*vec_12.Y())/double(N-1); tmp.z = m_StartPnts2[m_conn].Z(); @@ -945,7 +945,7 @@ bool path_simulate::ConnectPaths_z(bool brob) for (int i=0; i legt den Ausgabetyp fest*/ bool path_simulate::ConnectPaths_Feat(bool tool, // Tool (Master, Slave) bool brob, // Ausgabetyp (Roboter, Simulation) @@ -1080,7 +1080,7 @@ bool path_simulate::ConnectPaths_Feat(bool tool, // Tool (Master, Sla else m_Output_robo2.push_back(tmp); // Slave } - ConnPnts[0].SetCoord(tmp.x , tmp.y, tmp.z); // Setze Startpunkt = Endpunkt für die nächste Iteration + ConnPnts[0].SetCoord(tmp.x , tmp.y, tmp.z); // Setze Startpunkt = Endpunkt für die nächste Iteration } return true; @@ -1108,7 +1108,7 @@ bool path_simulate::ConnectPaths_Feat(bool tool, // Tool (Master, Sla tmp.z = vec[i].Z()*vel; tmp2.push_back(tmp); - Out.push_back(tmp2); // Fülle temporären Output-Vektor (wird weiter unten zugewiesen) + Out.push_back(tmp2); // Fülle temporären Output-Vektor (wird weiter unten zugewiesen) t += m_del_t; tmp2.clear(); @@ -1141,12 +1141,12 @@ bool path_simulate::ConnectPaths_Feat(bool tool, // Tool (Master, Sla return true; } -/* Hier wird unter Berücksichtigung der Krümmungstoleranz eine Unterteilung der Kurve vorgenommen. -Die Bereichsgrenzen werden im Rückgabevektor zurückgeliefert. Der Ausgabevektor ist leer wenn die maximale Krümmung -den Toleranzwert nicht überschreitet und somit auch keine Unterteilung notwendig ist */ +/* Hier wird unter Berücksichtigung der Krümmungstoleranz eine Unterteilung der Kurve vorgenommen. +Die Bereichsgrenzen werden im Rückgabevektor zurückgeliefert. Der Ausgabevektor ist leer wenn die maximale Krümmung +den Toleranzwert nicht überschreitet und somit auch keine Unterteilung notwendig ist */ std::vector > path_simulate::CompBounds(bool tool,std::vector knots) { - m_curMax = 0.0; // setze maximale Krümmung initial auf Null + m_curMax = 0.0; // setze maximale Krümmung initial auf Null double cr_bound = 1/curvTOL; double cr_last; gp_Vec dtmp1, dtmp2; @@ -1162,19 +1162,19 @@ std::vector > path_simulate::CompBounds(bool tool,std::vecto double fParam = curve.FirstParameter(), // Erster Kurvenparameter lParam = curve.LastParameter(), // Letzter Kurvenparameter - period = lParam - fParam; // Länge des Parameterbereichs + period = lParam - fParam; // Länge des Parameterbereichs - int n = knots.size(); // Länge des Knotenvektors + int n = knots.size(); // Länge des Knotenvektors bool b = false; - // Hier erfolgt die Berechnung der maximalen Krümmung - // Die Parameter der Bereichsgrenzen an denen die Kurvenkrümmung dem Toleranzwert - // entspricht werden in den Vektor für die weitere Nachbearbeitung gefüllt + // Hier erfolgt die Berechnung der maximalen Krümmung + // Die Parameter der Bereichsgrenzen an denen die Kurvenkrümmung dem Toleranzwert + // entspricht werden in den Vektor für die weitere Nachbearbeitung gefüllt for (int i=0; i= cr_bound && !b) { if(knots[i] >= m_boundTol && knots[i] < lParam - m_boundTol) @@ -1209,18 +1209,18 @@ std::vector > path_simulate::CompBounds(bool tool,std::vecto b = false; } - cr_last = dtmp2.Magnitude(); // Krümmung entspricht hier dem Betrag der zweiten Ableitung + cr_last = dtmp2.Magnitude(); // Krümmung entspricht hier dem Betrag der zweiten Ableitung - if(m_curMax < cr_last) // Speichert maximale Krümmung + if(m_curMax < cr_last) // Speichert maximale Krümmung m_curMax = cr_last; } if(period < 2*m_boundTol || bounds.size() == 0) return CriticalBounds; - if(b) bounds.push_back(lParam - m_boundTol); // Hier muss evtl. noch die letzte Grenze eingefügt werden + if(b) bounds.push_back(lParam - m_boundTol); // Hier muss evtl. noch die letzte Grenze eingefügt werden - n = (int) bounds.size()/2; // hat stets gerade Länge + n = (int) bounds.size()/2; // hat stets gerade Länge for(int i=0; i haben zusammen { single_bound.push_back(bounds[2*i]); @@ -1236,14 +1236,14 @@ std::vector > path_simulate::CompBounds(bool tool,std::vecto return CriticalBounds; } -/* Hier wird die Vorarbeit für die Funktion Gen_Path() geleistet. -Die Vektoren , , werden für die aktuelle Kurve gefüllt.*/ +/* Hier wird die Vorarbeit für die Funktion Gen_Path() geleistet. +Die Vektoren , , werden für die aktuelle Kurve gefüllt.*/ bool path_simulate::CompPath(bool tool) // tool = 0 -> Master // tool = 1 -> Slave { m_boundTol = pow(m_vmax, 2.0)/m_amax; // Toleranzbereich vor kritischen Bereichen (notwendig zum Hochbeschleunigen) - double cur = 1.0/curvTOL, // Krümmungstoleranz für die Kurvenunterteilung + double cur = 1.0/curvTOL, // Krümmungstoleranz für die Kurvenunterteilung pos = 0.0, cur_tmp = 0.0; @@ -1268,11 +1268,11 @@ bool path_simulate::CompPath(bool tool) // tool = 0 -> Master double d2, velo, tetha, len, len_1; - double t0 = m_t0; // Übergibt aktuelle Startzeit + double t0 = m_t0; // Übergibt aktuelle Startzeit int num = Detect_FeatCurve(tool); // Liefert Anzahl der zu fahrenden Kurven (i.d.R. num = 1) - for(int a=0; a Master lParam = curve.LastParameter(); period = lParam - fParam; - // übergibt Starparameter der aktuellen Kurve + // übergibt Starparameter der aktuellen Kurve m_StartParam[tool] = fParam; start = m_StartParam[tool]; @@ -1311,17 +1311,17 @@ bool path_simulate::CompPath(bool tool) // tool = 0 -> Master std::vector > CriticalBounds = CompBounds(tool, knot_vec); // Berechnet auf Basis der aktuellen Kurve, // die kritischen Bereiche im Parameterraum und - // berechnet gleichzeitig die maximale Kurvenkrümmung + // berechnet gleichzeitig die maximale Kurvenkrümmung m_vmid = std::min(m_vmax,sqrt(m_amax/m_curMax)); // Legt Geschwindigkeit fest mit der allen kritischen Bereiche // abgefahren werden -Newtry: // Falls die generierten Weglängen nicht ausreichen, dann wird ein neuer Versuch mit halbem gestartet +Newtry: // Falls die generierten Weglängen nicht ausreichen, dann wird ein neuer Versuch mit halbem gestartet v[0] = 0.0; // starte jede Kurve mit v = 0 int m = 0; - for (unsigned int i=0; iValue(m); @@ -1334,13 +1334,13 @@ Newtry: // Falls die generierten Wegl /*------------------- Gerader Bereich ---------------------*/ - while(pos < CriticalBounds[i][0]) // Berechnung der maximalen Krümmung dieses geraden Bereichs + while(pos < CriticalBounds[i][0]) // Berechnung der maximalen Krümmung dieses geraden Bereichs { curve.D2(pos, pnt0, pnt1, pnt2); - cur_tmp = pnt2.Magnitude(); // Krümmung am aktuellen Punkt + cur_tmp = pnt2.Magnitude(); // Krümmung am aktuellen Punkt if(d2 < cur_tmp) - d2 = cur_tmp; // Speichert maximale Krümmung dieses geraden Bereichs + d2 = cur_tmp; // Speichert maximale Krümmung dieses geraden Bereichs m++; pos = m_Knots->Value(m); @@ -1348,7 +1348,7 @@ Newtry: // Falls die generierten Wegl tetha = 0.6 + 0.25*sqrt(d2/m_curMax); // Setzt tetha-parameter -> (0.6 < tetha < 0.85) velo = std::min(m_vmax, tetha*(sqrt(m_amax/d2))); // Setzt maximale Geschwindigkeit - m_a = m_amax - d2*velo*velo; // wenn zu groß gewählt wurde, kann evtl. negativ werden + m_a = m_amax - d2*velo*velo; // wenn zu groß gewählt wurde, kann evtl. negativ werden // Korrektur while(m_a <= 0.0) @@ -1364,16 +1364,16 @@ Newtry: // Falls die generierten Wegl /*-------------- Korrektur der Geschwindigkeiten (falls der Weg zu lang) -------------*/ - len = CriticalBounds[i][0] - m_StartParam[tool]; // Länge des i. geraden Abschnitts - len_1 = (pow(v[1] - v[0],2.0) + pow(v[1] - m_vmid,2.0))/m_a; // notwendige Länge + len = CriticalBounds[i][0] - m_StartParam[tool]; // Länge des i. geraden Abschnitts + len_1 = (pow(v[1] - v[0],2.0) + pow(v[1] - m_vmid,2.0))/m_a; // notwendige Länge - if(len < pow(v[0] - m_vmid,2.0)/m_a) // für diesen Fall ist keine Korrektur möglich + if(len < pow(v[0] - m_vmid,2.0)/m_a) // für diesen Fall ist keine Korrektur möglich { l_vec.clear(); v_vec.clear(); a_vec.clear(); - m_StartParam[tool] = start; // setze Startparameter zurück + m_StartParam[tool] = start; // setze Startparameter zurück m_vmid = m_vmid/2; // halbiere kritische Durchlaufgeschwindigkeit goto Newtry; } @@ -1388,16 +1388,16 @@ Newtry: // Falls die generierten Wegl /*---Korrekturende---*/ - // Fülle Vektoren - l_vec.push_back(len); // Länge + // Fülle Vektoren + l_vec.push_back(len); // Länge v_vec.push_back(v); // Geschwindigkeiten a_vec.push_back(m_a); // Beschleunigung m_StartParam[tool] += len; // setzt Startparameter neu - /*------------------------ gekrümmter Bereich ------------------------*/ + /*------------------------ gekrümmter Bereich ------------------------*/ - len = CriticalBounds[i][1] - CriticalBounds[i][0]; // Bogenlänge des gekrümmten Bereichs + len = CriticalBounds[i][1] - CriticalBounds[i][0]; // Bogenlänge des gekrümmten Bereichs m_StartParam[tool] += len; // setzt Startparameter neu v[0] = v[2]; // Endgeschwindigkeit wird zur Startgeschwindigkeit @@ -1415,7 +1415,7 @@ Newtry: // Falls die generierten Wegl pos = m_Knots->Value(m); - // Berechnung der maximalen Krümmung für den letzten Abschnitt + // Berechnung der maximalen Krümmung für den letzten Abschnitt while(pos < lParam) { curve.D2(pos, pnt0, pnt1, pnt2); @@ -1435,7 +1435,7 @@ Newtry: // Falls die generierten Wegl v[1] = velo; v[2] = 0.0; - m_a = m_amax - d2*velo*velo; // wenn velo zu groß gewählt wurde, kann m_a negativ werden + m_a = m_amax - d2*velo*velo; // wenn velo zu groß gewählt wurde, kann m_a negativ werden // Korrektur while(m_a <= 0.0) @@ -1447,16 +1447,16 @@ Newtry: // Falls die generierten Wegl d2 = 0; - len = lParam - m_StartParam[tool] + start; // Länge des letzten geraden Abschnitts - len_1 = (pow(v[1] - v[0],2.0) + pow(v[1],2.0))/m_a; // notwendige Länge + len = lParam - m_StartParam[tool] + start; // Länge des letzten geraden Abschnitts + len_1 = (pow(v[1] - v[0],2.0) + pow(v[1],2.0))/m_a; // notwendige Länge - if(len < pow(v[0],2.0)/m_a) // hier keine Korrektur möglich + if(len < pow(v[0],2.0)/m_a) // hier keine Korrektur möglich { l_vec.clear(); v_vec.clear(); a_vec.clear(); - m_StartParam[tool] = start; // setze Startparameter zurück + m_StartParam[tool] = start; // setze Startparameter zurück m_vmid = m_vmid/2; // halbiere kritische Durchlaufgeschwindigkeit und versuchs erneut goto Newtry; } @@ -1467,12 +1467,12 @@ Newtry: // Falls die generierten Wegl len_1 = (pow(v[1] - v[0],2.0) + pow(v[1],2.0))/m_a; } - // Fülle Vektoren - l_vec.push_back(len); // Länge + // Fülle Vektoren + l_vec.push_back(len); // Länge v_vec.push_back(v); // Geschwindigkeiten a_vec.push_back(m_a); // Beschleunignung - // Fülle hier erst die Ausgabevektoren (einmal pro Kurve) + // Fülle hier erst die Ausgabevektoren (einmal pro Kurve) if(tool) { m_length_sl.push_back(l_vec); @@ -1500,7 +1500,7 @@ Newtry: // Falls die generierten Wegl CriticalBounds.clear(); } - // Setze Iterator und Startparameter wieder zurück + // Setze Iterator und Startparameter wieder zurück if (!tool) { for(int i=0; i + // Übergebe Nullvektor zur Endzeit if (tool==false) { m_Output.push_back(tmp2); @@ -1666,7 +1666,7 @@ bool path_simulate::Correction(bool tool) return true; } -// Hier wird der eigentliche Output für den Simulationsprozess generiert unter der Berücksichtigung +// Hier wird der eigentliche Output für den Simulationsprozess generiert unter der Berücksichtigung // der in CompPath() berechneten Vektoren m_velocity, m_accel, m_length bool path_simulate::Gen_Path() { @@ -1680,13 +1680,13 @@ bool path_simulate::Gen_Path() { m_StartPnts2[0] = (*m_it2)->StartPoint(); -/*------------------------------ Berechne Durchlaufzeit für das Master-Tool --------------------------------*/ +/*------------------------------ Berechne Durchlaufzeit für das Master-Tool --------------------------------*/ n = m_velocity_ma.size(); - for(int i=0; i berechnet if(j != m-1) { - length = m_length_sl[i][2*j+1];// Länge des kritischen Abschnitts + length = m_length_sl[i][2*j+1];// Länge des kritischen Abschnitts m_T = m_T + length/m_v[2]; // Berechnet neue Endzeit (kritische Abschnitte werden mit der konstanten // Geschwindigkeit durchlaufen) } @@ -1741,22 +1741,22 @@ bool path_simulate::Gen_Path() } } - t_sl = m_T - t_start; // Entspricht Durchlaufzeit für den Slave - m_t0 = t_start; // Setzt Startzeit zurück + t_sl = m_T - t_start; // Entspricht Durchlaufzeit für den Slave + m_t0 = t_start; // Setzt Startzeit zurück /*----------------------- Synchronisierung von Master und Slave -----------------------------*/ -// Idee: Skaliere die Geschwindigkeiten und Beschleunigungen derjenigen Bahn mit der kürzeren Durchlaufzeit, -// so dass die Durchlaufzeiten für Master und Slave übereinstimmen +// Idee: Skaliere die Geschwindigkeiten und Beschleunigungen derjenigen Bahn mit der kürzeren Durchlaufzeit, +// so dass die Durchlaufzeiten für Master und Slave übereinstimmen if(t_ma <= t_sl) { - // Ab hier: Korrektur für den Master + // Ab hier: Korrektur für den Master lam = t_ma/t_sl; // Skalierungsfaktor 0 < lam <= 1 - // Zunächst werden alle Geschwindigkeiten runterskaliert + // Zunächst werden alle Geschwindigkeiten runterskaliert n = m_velocity_ma.size(); for(int i=0; iEndPoint(); // Setzt Endpunkt, notwendig für die folgende Wegkorrektur - Correction(0); // Wegkorrektur für den Master + m_StartPnts1[1] = (*m_it1)->EndPoint(); // Setzt Endpunkt, notwendig für die folgende Wegkorrektur + Correction(0); // Wegkorrektur für den Master if(m_single == false) { m_t0 = t_tmp; - m_StartPnts2[1] = (*m_it2)->EndPoint(); // Setzt Endpunkt, notwendig für die folgende Wegkorrektur - Correction(1); // Wegkorrektur für den Slave + m_StartPnts2[1] = (*m_it2)->EndPoint(); // Setzt Endpunkt, notwendig für die folgende Wegkorrektur + Correction(1); // Wegkorrektur für den Slave } m_t0 = t_start; @@ -1930,9 +1930,9 @@ bool path_simulate::Gen_Path() return true; } -/* Hier werden die Simulations-Outputvektoren für die jeweiligen Kurvenabschnitte erzeugt */ +/* Hier werden die Simulations-Outputvektoren für die jeweiligen Kurvenabschnitte erzeugt */ bool path_simulate::MakePathSingle(bool brob, // Beschreibt Ausgabeart (Roboter, Simulation) - double length, // Bogenlänge des betrachteten Abschnitts + double length, // Bogenlänge des betrachteten Abschnitts bool part, // Gibt an ob wir einen kritischen Abschnitt betrachten bool tool) // Tool (Master, Slave) { @@ -2012,7 +2012,7 @@ bool path_simulate::MakePathSingle(bool brob, // Beschreibt Ausgabeart (Robo N = std::max(2, (int)((m_T-m_t0)/m_step)); if (N>=100000) - N = 99999; // maximale Anzahl möglicher Outputwerte + N = 99999; // maximale Anzahl möglicher Outputwerte m_del_t = (m_T-m_t0)/double(N); @@ -2032,8 +2032,8 @@ bool path_simulate::MakePathSingle(bool brob, // Beschreibt Ausgabeart (Robo else m_Output_time2.push_back(t); d = m_v[2]*(t-m_t0); - param = m_StartParam[tool] + d; // Kurvenparameter entspricht zurückgelegtem Weg - // für den Fall einer Bogenlängenparametrisierung. + param = m_StartParam[tool] + d; // Kurvenparameter entspricht zurückgelegtem Weg + // für den Fall einer Bogenlängenparametrisierung. // Bei beliebiger Parametrisierung: // param = FindParamAt(anAdaptorCurve, d, m_StartParam[tool]); @@ -2058,7 +2058,7 @@ bool path_simulate::MakePathSingle(bool brob, // Beschreibt Ausgabeart (Robo tmp3.clear(); /* - if (tool == false) // zeichnet den tatsächlichen Weg nach + if (tool == false) // zeichnet den tatsächlichen Weg nach { pnt1 = pnt2; @@ -2085,8 +2085,8 @@ bool path_simulate::MakePathSingle(bool brob, // Beschreibt Ausgabeart (Robo else m_Output_time2.push_back(t); d = GetDistance(t); - param = m_StartParam[tool] + d; // Kurvenparameter entspricht zurückgelegtem Weg - // für den Fall einer Bogenlängenparametrisierung. + param = m_StartParam[tool] + d; // Kurvenparameter entspricht zurückgelegtem Weg + // für den Fall einer Bogenlängenparametrisierung. // Bei beliebiger Parametrisierung: // param = FindParamAt(anAdaptorCurve, d, m_StartParam[tool]); @@ -2111,7 +2111,7 @@ bool path_simulate::MakePathSingle(bool brob, // Beschreibt Ausgabeart (Robo tmp3.clear(); /* - if (tool == false) // zeichnet den tatsächlichen Weg nach + if (tool == false) // zeichnet den tatsächlichen Weg nach { pnt1 = pnt2; @@ -2135,7 +2135,7 @@ bool path_simulate::MakePathSingle(bool brob, // Beschreibt Ausgabeart (Robo return true; } -/* Hauptroutine zur Generierung des Roboteroutputs für den normalen beidseitigen Fall */ +/* Hauptroutine zur Generierung des Roboteroutputs für den normalen beidseitigen Fall */ bool path_simulate::MakePathRobot() { ofstream anOutputFile; @@ -2154,7 +2154,7 @@ bool path_simulate::MakePathRobot() anOutputFile2 << "none" << std::endl; } - // Outputgenerierung über alle Kurven + // Outputgenerierung über alle Kurven for (m_it1 = m_BSplineTop.begin(); m_it1 != m_BSplineTop.end(); ++m_it1) { m_StartParam[0] = ((*m_it1)->FirstParameter()); @@ -2211,7 +2211,7 @@ bool path_simulate::MakePathRobot() } /* Wird nur zu Beginn der Ausschreibung in path_simulate::WriteOurputDouble() aufgerufen und passt die Ausgabevektoren -, so aneinander an, dass die Endzeiten übereinstimmen*/ +, so aneinander an, dass die Endzeiten übereinstimmen*/ bool path_simulate::TimeCorrection() { int N; @@ -2220,9 +2220,9 @@ bool path_simulate::TimeCorrection() vecc.push_back(vec); - if (m_single == false) // Eine Zeitkorrektur macht nur für diesen Fall auch Sinn + if (m_single == false) // Eine Zeitkorrektur macht nur für diesen Fall auch Sinn { - if(m_Output_time.size() == 0 || m_Output_time2.size() == 0) // Sonderbehandlung für diesen Fall + if(m_Output_time.size() == 0 || m_Output_time2.size() == 0) // Sonderbehandlung für diesen Fall { if(m_Output_time.size() > m_Output_time2.size()) { @@ -2230,7 +2230,7 @@ bool path_simulate::TimeCorrection() N = m_Output_time2.size(); m_Output2.resize(N); - for (int i=0; i Werkzeug hat zu warten) + for (int i=0; i Werkzeug hat zu warten) { m_Output[i] = vecc; } @@ -2251,7 +2251,7 @@ bool path_simulate::TimeCorrection() return true; } - return true; //gibt true zurück wenn beide Outputvektoren und leer sein sollten + return true; //gibt true zurück wenn beide Outputvektoren und leer sein sollten } if (m_Output_time[m_Output_time.size()-1] < m_Output_time2[m_Output_time2.size()-1]) @@ -2303,7 +2303,7 @@ bool path_simulate::TimeCorrection() return true; } -/* Hauptroutine zur Generierung des Simulationsoutputs für den feature-basierten und spiral-basierten beidseitigen Fall */ +/* Hauptroutine zur Generierung des Simulationsoutputs für den feature-basierten und spiral-basierten beidseitigen Fall */ bool path_simulate::MakePathSimulate_Feat(const std::vector &flatAreas, bool spiral) { m_Feat = true; @@ -2379,41 +2379,41 @@ bool path_simulate::MakePathSimulate_Feat(const std::vector &flatAreas, b if (*it_1 != (*curves_1).end()-1) { /* ------ Kurve ------*/ - CompPath(0); // Berechne Parameter für den Master - CompPath(1); // Berechne Parameter für den Slave - Gen_Path(); // Erzeuge Output für aktuelle Kurve + CompPath(0); // Berechne Parameter für den Master + CompPath(1); // Berechne Parameter für den Slave + Gen_Path(); // Erzeuge Output für aktuelle Kurve WriteOutputDouble(anOutputFile[0],anOutputFile[1],c[0],c[1],0,beam); // Schreibe Output UpdateParam(); /*------ Zustellung ------*/ - (*it_1)++; // Gehe zur nächsten Kurve - ConnectPaths_Feat(tool, 0, 1); // Erzeuge Output für Zustellung + (*it_1)++; // Gehe zur nächsten Kurve + ConnectPaths_Feat(tool, 0, 1); // Erzeuge Output für Zustellung WriteOutputDouble(anOutputFile[0],anOutputFile[1],c[0],c[1],0,beam); // Schreibe Output UpdateParam(); if (*it_1 == (*curves_1).end()-1 && *it_2 == (*curves_2).end()-1) // Letzter Schritt { /* ------ Kurve ------*/ - CompPath(0); // Berechne Parameter für den Master - CompPath(1); // Berechne Parameter für den Slave - Gen_Path(); // Erzeuge Output für aktuelle Kurve + CompPath(0); // Berechne Parameter für den Master + CompPath(1); // Berechne Parameter für den Slave + Gen_Path(); // Erzeuge Output für aktuelle Kurve WriteOutputDouble(anOutputFile[0],anOutputFile[1],c[0],c[1],0,beam); // Schreibe Output UpdateParam(); break; } - (**it_1)->D0((**it_1)->FirstParameter(),pnt0); // übergebe aktuellen Startpunkt + (**it_1)->D0((**it_1)->FirstParameter(),pnt0); // übergebe aktuellen Startpunkt - if ((pnt0.Z() > (flatAreas[i+1] + rad[tool] - 1e-1)) && // Erreicht der MASTER den nächsten ebenen + if ((pnt0.Z() > (flatAreas[i+1] + rad[tool] - 1e-1)) && // Erreicht der MASTER den nächsten ebenen (pnt0.Z() < (flatAreas[i+1] + rad[tool] + 1e-1))) // Bereich, muss auf den SLAVE gewartet werden { if(!spiral) // Bei Spiralbahnen erfolgt die Zustellung sofort { /* ------ Kurve ------*/ - CompPath(0); // Berechne Parameter für den Master - CompPath(1); // Berechne Parameter für den Slave - Gen_Path(); // Erzeuge Output für aktuelle Kurve + CompPath(0); // Berechne Parameter für den Master + CompPath(1); // Berechne Parameter für den Slave + Gen_Path(); // Erzeuge Output für aktuelle Kurve WriteOutputDouble(anOutputFile[0],anOutputFile[1],c[0],c[1],0,beam); // Schreibe Output UpdateParam(); } @@ -2425,9 +2425,9 @@ bool path_simulate::MakePathSimulate_Feat(const std::vector &flatAreas, b if (*it_2 == (*curves_2).end()-1) // letzter Schritt { /* ------ Kurve ------*/ - CompPath(0); // Berechne Parameter für den Master - CompPath(1); // Berechne Parameter für den Slave - Gen_Path(); // Erzeuge Output für aktuelle Kurve + CompPath(0); // Berechne Parameter für den Master + CompPath(1); // Berechne Parameter für den Slave + Gen_Path(); // Erzeuge Output für aktuelle Kurve WriteOutputDouble(anOutputFile[0],anOutputFile[1],c[0],c[1],0,beam); // Schreibe Output UpdateParam(); break; @@ -2442,12 +2442,12 @@ bool path_simulate::MakePathSimulate_Feat(const std::vector &flatAreas, b /* ------ Zustellung ------*/ if(!spiral) { - (*it_1)++; // gehe zur nächsten Kurve - ConnectPaths_Feat(tool, 0, 1); // Erzeuge Output für die Master-Zustellung + (*it_1)++; // gehe zur nächsten Kurve + ConnectPaths_Feat(tool, 0, 1); // Erzeuge Output für die Master-Zustellung } - (*it_2)++; // gehe zur nächsten Kurve - ConnectPaths_Feat(!tool, 0, 0); // Erzeuge Output für die Slave-Zustellung + (*it_2)++; // gehe zur nächsten Kurve + ConnectPaths_Feat(!tool, 0, 0); // Erzeuge Output für die Slave-Zustellung WriteOutputDouble(anOutputFile[0],anOutputFile[1],c[0],c[1],0,beam); // Schreibe Output UpdateParam(); @@ -2464,7 +2464,7 @@ bool path_simulate::MakePathSimulate_Feat(const std::vector &flatAreas, b return true; } -/* Hauptroutine zur Generierung des Roboteroutputs für den feature-basierten und spiral-basierten beidseitigen Fall */ +/* Hauptroutine zur Generierung des Roboteroutputs für den feature-basierten und spiral-basierten beidseitigen Fall */ bool path_simulate::MakePathRobot_Feat(const std::vector &flatAreas) { m_Feat = true; @@ -2492,7 +2492,7 @@ bool path_simulate::MakePathRobot_Feat(const std::vector &flatAreas) { tool = StartingTool(); // Bestimmt welches tool warten muss - // Setze Startparameter (in unserem Fall unnötig da immer 0) + // Setze Startparameter (in unserem Fall unnötig da immer 0) m_StartParam[0] = ((*m_it1)->FirstParameter()); if (m_single == false) m_StartParam[1] = ((*m_it2)->FirstParameter()); @@ -2521,7 +2521,7 @@ bool path_simulate::MakePathRobot_Feat(const std::vector &flatAreas) // Hauptschleife while (true) { - MakePathSingle(1,0,0,tool); // Bahngenerierung des kontinuierlich fahrenden tools für aktuelle kurve + MakePathSingle(1,0,0,tool); // Bahngenerierung des kontinuierlich fahrenden tools für aktuelle kurve // MASTER if (*it_1 != (*curves_1).end()-1) @@ -2627,8 +2627,8 @@ bool path_simulate::MakePathRobot_Feat(const std::vector &flatAreas) return true; } -// Hilfsfunktion für den Featurebasierten Teil: -// Bestimmt welches Tool wartet, während das andere läuft +// Hilfsfunktion für den Featurebasierten Teil: +// Bestimmt welches Tool wartet, während das andere läuft bool path_simulate::StartingTool() { double z0,z1; @@ -2636,7 +2636,7 @@ bool path_simulate::StartingTool() if(m_it1 != m_BSplineTop.end()-1) { - // z-Abstand zur nächsten Bahn - MASTER + // z-Abstand zur nächsten Bahn - MASTER (*m_it1)->D0((*m_it1)->FirstParameter(),pnt0); m_it1++; (*m_it1)->D0((*m_it1)->FirstParameter(),pnt1); m_it1--; @@ -2648,7 +2648,7 @@ bool path_simulate::StartingTool() if(m_it2 != m_BSplineBottom.end()-1) { - // z-Abstand zur nächsten Bahn - SLAVE + // z-Abstand zur nächsten Bahn - SLAVE (*m_it2)->D0((*m_it2)->FirstParameter(),pnt0); m_it2++; (*m_it2)->D0((*m_it2)->FirstParameter(),pnt1); m_it2--; @@ -2660,8 +2660,8 @@ bool path_simulate::StartingTool() else return true; // Master muss warten } -/* Hier wird geschaut, ob es sich um eine geschlossene Kurve handelt bzw. wieviele Kurven abgefahren werden müssen -um wieder am Anfangspunkt der Kurve anzukommen. Die Anzahl der zu fahrenden Kurven wird als integer zurückgegeben */ +/* Hier wird geschaut, ob es sich um eine geschlossene Kurve handelt bzw. wieviele Kurven abgefahren werden müssen +um wieder am Anfangspunkt der Kurve anzukommen. Die Anzahl der zu fahrenden Kurven wird als integer zurückgegeben */ int path_simulate::Detect_FeatCurve(bool tool) { gp_Pnt pt0,pt1; @@ -2680,7 +2680,7 @@ int path_simulate::Detect_FeatCurve(bool tool) m_it1--; num = 1; - pt1 = pt0; // Damit die äußere while-Schleife verlassen wird + pt1 = pt0; // Damit die äußere while-Schleife verlassen wird } else { @@ -2690,7 +2690,7 @@ int path_simulate::Detect_FeatCurve(bool tool) } } - // Zurück zum Status quo + // Zurück zum Status quo for(int i=1; iFirstParameter()); // speichert Startparameterwert der aktuellen Master-Kurve @@ -2752,8 +2752,8 @@ bool path_simulate::MakePathSimulate() /*Zustellung Start*/ - m_conn = CheckConnect(); // Rückgabewert = 1 bei negativer z-Richtungszustellung - // Rückgabewert = 0 bei positiver z-Richtungszustellung + m_conn = CheckConnect(); // Rückgabewert = 1 bei negativer z-Richtungszustellung + // Rückgabewert = 0 bei positiver z-Richtungszustellung // negative z-Richtung: 1. XY --> 2. Z // positive z-Richtung: 1. Z --> 2. XY @@ -2782,10 +2782,10 @@ bool path_simulate::MakePathSimulate() /*Kurve Start*/ - CompPath(0); // Berechnung der Parameter für den Master + CompPath(0); // Berechnung der Parameter für den Master if (m_single == false) - CompPath(1); // Berechnung der Parameter für den Slave + CompPath(1); // Berechnung der Parameter für den Slave Gen_Path(); // Erzeugung der Outputvektoren @@ -2828,7 +2828,7 @@ bool path_simulate::MakePathSimulate() return true; } -/* Schreibt den Output für den feature- und spiral-basierten beidseitigen Fall */ +/* Schreibt den Output für den feature- und spiral-basierten beidseitigen Fall */ bool path_simulate::WriteOutput_Feat(ofstream &anOutputFile, ofstream &anOutputFile2, int &c, bool brob) { if (m_single == false) @@ -3013,7 +3013,7 @@ bool path_simulate::WriteTimes() } */ -/* Schreibt Output für den normalen einseitigen Fall */ +/* Schreibt Output für den normalen einseitigen Fall */ bool path_simulate::WriteOutputSingle(ofstream &anOutputFile, int &c, bool brob, bool tool, bool beamfl) { std::vector< std::vector > Out_val; @@ -3060,7 +3060,7 @@ bool path_simulate::WriteOutputSingle(ofstream &anOutputFile, int &c, bool brob, n = Out_val.size(); if (n != Out_time.size()) - throw Base::Exception("Outputlängen passen nicht zusammen"); + throw Base::Exception("Outputlängen passen nicht zusammen"); if (n>1) { @@ -3153,7 +3153,7 @@ bool path_simulate::WriteOutputSingle(ofstream &anOutputFile, int &c, bool brob, return true; } -/* Schreibt Output für den normalen beidseitigen Fall */ +/* Schreibt Output für den normalen beidseitigen Fall */ bool path_simulate::WriteOutputDouble(ofstream &anOutputFile, ofstream &anOutputFile2, int &c1, int &c2, bool brob, bool beamfl) { std::pair times; @@ -3187,7 +3187,7 @@ bool path_simulate::WriteOutputDouble(ofstream &anOutputFile, ofstream &anOutput times.first = (float) m_Output_time[0]; times.second = (float) m_Output_time[n-1]; - m_PathTimes_Master.push_back(times); // fülle vektor für curve-times + m_PathTimes_Master.push_back(times); // fülle vektor für curve-times @@ -3198,7 +3198,7 @@ bool path_simulate::WriteOutputDouble(ofstream &anOutputFile, ofstream &anOutput anOutputFile2 << "$# pid dof vad lcid sf vid death birth" << std::endl; anOutputFile2 << pid2 << ",1,0," << c2 << ",1.000000, ," << m_Output_time2[n2-1] << "," << m_Output_time2[0] << std::endl; - if (beamfl) // wenn auf true, dann füge neuen part mit ein + if (beamfl) // wenn auf true, dann füge neuen part mit ein { anOutputFile2 << "*BOUNDARY_PRESCRIBED_MOTION_RIGID" << std::endl; anOutputFile2 << "$# pid dof vad lcid sf vid death birth" << std::endl; @@ -3249,7 +3249,7 @@ bool path_simulate::WriteOutputDouble(ofstream &anOutputFile, ofstream &anOutput anOutputFile2 << "$# pid dof vad lcid sf vid death birth" << std::endl; anOutputFile2 << pid2 << ",2,0," << c2+1 << ",1.000000, ," << m_Output_time2[n2-1] << "," << m_Output_time2[0] << std::endl; - if (beamfl) // wenn auf true, dann füge neuen part mit ein + if (beamfl) // wenn auf true, dann füge neuen part mit ein { anOutputFile2 << "*BOUNDARY_PRESCRIBED_MOTION_RIGID" << std::endl; anOutputFile2 << "$# pid dof vad lcid sf vid death birth" << std::endl; diff --git a/src/Mod/Cam/App/path_simulate.h b/src/Mod/Cam/App/path_simulate.h index 51652c11a6..c86c105f20 100644 --- a/src/Mod/Cam/App/path_simulate.h +++ b/src/Mod/Cam/App/path_simulate.h @@ -240,9 +240,9 @@ private: CuttingToolsSettings m_set; /** @brief iterator for the master-curves*/ - std::vector::iterator m_it1; /* iterator über inner-paths */ + std::vector::iterator m_it1; /* iterator über inner-paths */ /** @brief iterator for the slave-curves*/ - std::vector::iterator m_it2; /* iterator über outer-paths */ + std::vector::iterator m_it2; /* iterator über outer-paths */ /** @brief sheet-thickness */ double m_blech; /** @brief spring-pretension*/ diff --git a/src/Mod/Cam/App/routine.cpp b/src/Mod/Cam/App/routine.cpp index 462b935a9e..9022368a15 100644 --- a/src/Mod/Cam/App/routine.cpp +++ b/src/Mod/Cam/App/routine.cpp @@ -65,7 +65,7 @@ double Routines::TrapezoidIntergration(const std::vector &WithRespectTo, std::vector Routines::NewtonStep(std::vector &F,std::vector > &DF) { - // löst folgendes Gleichungssystem: DF*x = F + // löst folgendes Gleichungssystem: DF*x = F int siz = (int) F.size(); std::vector x_new(siz); std::vector piv(siz); // pivotelement @@ -73,7 +73,7 @@ std::vector Routines::NewtonStep(std::vector &F,std::vector A(siz, siz); ublas::matrix b(1, siz); - // füllt blas-matrizen + // füllt blas-matrizen for (unsigned int i=0; i Routines::NewtonStep(std::vector &F,std::vectorsetEnabled(true); break; case Approx: - /*MeshCore::MeshPointArray pnts = m_Mesh.GetPoints(); // file "kleines.stl" hat spitze über der ebene ... nicht kompatibel mit diesem Algo + /*MeshCore::MeshPointArray pnts = m_Mesh.GetPoints(); // file "kleines.stl" hat spitze über der ebene ... nicht kompatibel mit diesem Algo MeshCore::MeshFacetArray facets = m_Mesh.GetFacets(); for(int i=0; i * + * Copyright (c) 2007 Jürgen Riegel * * * * This file is Drawing of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Drawing/Gui/DrawingView.h b/src/Mod/Drawing/Gui/DrawingView.h index 8ad8c8937e..cebd0d5c3d 100644 --- a/src/Mod/Drawing/Gui/DrawingView.h +++ b/src/Mod/Drawing/Gui/DrawingView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2007 Jürgen Riegel * + * Copyright (c) 2007 Jürgen Riegel * * * * This file is Drawing of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Drawing/Gui/PreCompiled.cpp b/src/Mod/Drawing/Gui/PreCompiled.cpp index 67f0372b6c..90814f0b6c 100644 --- a/src/Mod/Drawing/Gui/PreCompiled.cpp +++ b/src/Mod/Drawing/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Drawing/Gui/PreCompiled.h b/src/Mod/Drawing/Gui/PreCompiled.h index 972c1472ab..92df56bdfc 100644 --- a/src/Mod/Drawing/Gui/PreCompiled.h +++ b/src/Mod/Drawing/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Drawing/Gui/ViewProviderPage.cpp b/src/Mod/Drawing/Gui/ViewProviderPage.cpp index 9f08e2fa4f..f6d4cd32fe 100644 --- a/src/Mod/Drawing/Gui/ViewProviderPage.cpp +++ b/src/Mod/Drawing/Gui/ViewProviderPage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is Drawing of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Drawing/Gui/ViewProviderPage.h b/src/Mod/Drawing/Gui/ViewProviderPage.h index 524583b529..3f8caf6119 100644 --- a/src/Mod/Drawing/Gui/ViewProviderPage.h +++ b/src/Mod/Drawing/Gui/ViewProviderPage.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is Drawing of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Drawing/Gui/ViewProviderView.cpp b/src/Mod/Drawing/Gui/ViewProviderView.cpp index 535642f722..52d2606cef 100644 --- a/src/Mod/Drawing/Gui/ViewProviderView.cpp +++ b/src/Mod/Drawing/Gui/ViewProviderView.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is Drawing of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Drawing/Gui/ViewProviderView.h b/src/Mod/Drawing/Gui/ViewProviderView.h index 6fff56c2cf..43277bd9bd 100644 --- a/src/Mod/Drawing/Gui/ViewProviderView.h +++ b/src/Mod/Drawing/Gui/ViewProviderView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is Drawing of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/AppFem.cpp b/src/Mod/Fem/App/AppFem.cpp old mode 100755 new mode 100644 index 24a7708715..11a9dd4128 --- a/src/Mod/Fem/App/AppFem.cpp +++ b/src/Mod/Fem/App/AppFem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/AppFemPy.cpp b/src/Mod/Fem/App/AppFemPy.cpp old mode 100755 new mode 100644 index 3b3ae7b582..0a4a8bbeaa --- a/src/Mod/Fem/App/AppFemPy.cpp +++ b/src/Mod/Fem/App/AppFemPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * @@ -192,7 +192,7 @@ static PyObject * importer(PyObject *self, PyObject *args) // // std::ifstream inputfile; // -// //Für Debugoutput +// //Für Debugoutput // ofstream anOutput; // anOutput.open("c:/time_measurement.txt"); // time_t seconds1,seconds2; @@ -320,7 +320,7 @@ static PyObject * importer(PyObject *self, PyObject *args) // double perfect_ax=0.0,perfect_ay=0.0,perfect_az=0.0; // // //Do a Monte Carlo approach and start from the Principal Axis System -// //and rotate +/- 60° around each axis in a first iteration +// //and rotate +/- 60° around each axis in a first iteration // double angle_range_min_x=-M_PI/3.0,angle_range_max_x=M_PI/3.0, // angle_range_min_y=-M_PI/3.0,angle_range_max_y=M_PI/3.0, // angle_range_min_z=-M_PI/3.0,angle_range_max_z=M_PI/3.0; @@ -409,8 +409,8 @@ static PyObject * importer(PyObject *self, PyObject *args) // // for(unsigned int i=0;iAddVolumeWithID( // meshds->FindNode(all_elements[i][0]), // meshds->FindNode(all_elements[i][2]), diff --git a/src/Mod/Fem/App/FemAnalysis.cpp b/src/Mod/Fem/App/FemAnalysis.cpp index 39d724000c..1abb701b8e 100644 --- a/src/Mod/Fem/App/FemAnalysis.cpp +++ b/src/Mod/Fem/App/FemAnalysis.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h index 37c34217c8..9c16f49a8f 100644 --- a/src/Mod/Fem/App/FemAnalysis.h +++ b/src/Mod/Fem/App/FemAnalysis.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp old mode 100755 new mode 100644 index 6f574e6771..b4432b18ac --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * * * * This file is part of the FreeCAD CAx development system. * * * @@ -776,8 +776,8 @@ void FemMesh::readNastran(const std::string &Filename) for(unsigned int i=0;iAddVolumeWithID //( // meshds->FindNode(all_elements[i][0]), @@ -1262,8 +1262,8 @@ struct Fem::FemMesh::FemMeshInfo FemMesh::getInfo(void) const{ } // for(unsigned int i=0;iAddVolumeWithID( // meshds->FindNode(all_elements[i][0]), // meshds->FindNode(all_elements[i][2]), diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h old mode 100755 new mode 100644 index 3d1461868d..e8e845ea73 --- a/src/Mod/Fem/App/FemMesh.h +++ b/src/Mod/Fem/App/FemMesh.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshObject.cpp b/src/Mod/Fem/App/FemMeshObject.cpp old mode 100755 new mode 100644 index eb44c8a527..e14d2bd186 --- a/src/Mod/Fem/App/FemMeshObject.cpp +++ b/src/Mod/Fem/App/FemMeshObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshObject.h b/src/Mod/Fem/App/FemMeshObject.h old mode 100755 new mode 100644 index 15f733d8cc..75c2452284 --- a/src/Mod/Fem/App/FemMeshObject.h +++ b/src/Mod/Fem/App/FemMeshObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshProperty.cpp b/src/Mod/Fem/App/FemMeshProperty.cpp old mode 100755 new mode 100644 index ab50cce239..38206bc842 --- a/src/Mod/Fem/App/FemMeshProperty.cpp +++ b/src/Mod/Fem/App/FemMeshProperty.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshProperty.h b/src/Mod/Fem/App/FemMeshProperty.h old mode 100755 new mode 100644 index 7b350ddc44..a72fea4738 --- a/src/Mod/Fem/App/FemMeshProperty.h +++ b/src/Mod/Fem/App/FemMeshProperty.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshPyImp.cpp b/src/Mod/Fem/App/FemMeshPyImp.cpp old mode 100755 new mode 100644 index 20a5b6feb0..f77dba51fb --- a/src/Mod/Fem/App/FemMeshPyImp.cpp +++ b/src/Mod/Fem/App/FemMeshPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp b/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp index 78174893e4..b4b6659401 100644 --- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp +++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h index fca5fc25f0..d784b7d03b 100644 --- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h +++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshShapeObject.cpp b/src/Mod/Fem/App/FemMeshShapeObject.cpp index e8d6b65a89..e872c51107 100644 --- a/src/Mod/Fem/App/FemMeshShapeObject.cpp +++ b/src/Mod/Fem/App/FemMeshShapeObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemMeshShapeObject.h b/src/Mod/Fem/App/FemMeshShapeObject.h index d8b5568213..9ba52c7f4d 100644 --- a/src/Mod/Fem/App/FemMeshShapeObject.h +++ b/src/Mod/Fem/App/FemMeshShapeObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemResultObject.cpp b/src/Mod/Fem/App/FemResultObject.cpp index 7b0a8bc63f..30a0aa4b22 100644 --- a/src/Mod/Fem/App/FemResultObject.cpp +++ b/src/Mod/Fem/App/FemResultObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h index 0f958a3df8..3be0edf6ef 100644 --- a/src/Mod/Fem/App/FemResultObject.h +++ b/src/Mod/Fem/App/FemResultObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetElementsObject.cpp b/src/Mod/Fem/App/FemSetElementsObject.cpp index c0bcb5d2ed..41bfa86f32 100644 --- a/src/Mod/Fem/App/FemSetElementsObject.cpp +++ b/src/Mod/Fem/App/FemSetElementsObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetElementsObject.h b/src/Mod/Fem/App/FemSetElementsObject.h index e5443fc3cf..939fe3c862 100644 --- a/src/Mod/Fem/App/FemSetElementsObject.h +++ b/src/Mod/Fem/App/FemSetElementsObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetFacesObject.cpp b/src/Mod/Fem/App/FemSetFacesObject.cpp index 5d41c7a46c..7b9c3aa569 100644 --- a/src/Mod/Fem/App/FemSetFacesObject.cpp +++ b/src/Mod/Fem/App/FemSetFacesObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetFacesObject.h b/src/Mod/Fem/App/FemSetFacesObject.h index 344c24ad24..569a523e61 100644 --- a/src/Mod/Fem/App/FemSetFacesObject.h +++ b/src/Mod/Fem/App/FemSetFacesObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetGeometryObject.cpp b/src/Mod/Fem/App/FemSetGeometryObject.cpp index e3bfd14d4e..cc3f9967fc 100644 --- a/src/Mod/Fem/App/FemSetGeometryObject.cpp +++ b/src/Mod/Fem/App/FemSetGeometryObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetGeometryObject.h b/src/Mod/Fem/App/FemSetGeometryObject.h index e89040e04f..4ec56959c0 100644 --- a/src/Mod/Fem/App/FemSetGeometryObject.h +++ b/src/Mod/Fem/App/FemSetGeometryObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetNodesObject.cpp b/src/Mod/Fem/App/FemSetNodesObject.cpp index eb6ac514d7..147dfc16bd 100644 --- a/src/Mod/Fem/App/FemSetNodesObject.cpp +++ b/src/Mod/Fem/App/FemSetNodesObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetNodesObject.h b/src/Mod/Fem/App/FemSetNodesObject.h index 7e51f4a327..98d9e443d6 100644 --- a/src/Mod/Fem/App/FemSetNodesObject.h +++ b/src/Mod/Fem/App/FemSetNodesObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetObject.cpp b/src/Mod/Fem/App/FemSetObject.cpp index f5fbcf8764..a429150c95 100644 --- a/src/Mod/Fem/App/FemSetObject.cpp +++ b/src/Mod/Fem/App/FemSetObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/FemSetObject.h b/src/Mod/Fem/App/FemSetObject.h index 3c957d3881..c392dbd280 100644 --- a/src/Mod/Fem/App/FemSetObject.h +++ b/src/Mod/Fem/App/FemSetObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/PreCompiled.cpp b/src/Mod/Fem/App/PreCompiled.cpp old mode 100755 new mode 100644 index 3b2e513af1..46269e9671 --- a/src/Mod/Fem/App/PreCompiled.cpp +++ b/src/Mod/Fem/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/App/PreCompiled.h b/src/Mod/Fem/App/PreCompiled.h old mode 100755 new mode 100644 index 008c381dfd..134ada07e3 --- a/src/Mod/Fem/App/PreCompiled.h +++ b/src/Mod/Fem/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/AppFemGui.cpp b/src/Mod/Fem/Gui/AppFemGui.cpp old mode 100755 new mode 100644 index 7030d9c422..5847349b2a --- a/src/Mod/Fem/Gui/AppFemGui.cpp +++ b/src/Mod/Fem/Gui/AppFemGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp old mode 100755 new mode 100644 index cc2f275736..0353cabede --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/FemSelectionGate.cpp b/src/Mod/Fem/Gui/FemSelectionGate.cpp index 430c71911b..3554582738 100644 --- a/src/Mod/Fem/Gui/FemSelectionGate.cpp +++ b/src/Mod/Fem/Gui/FemSelectionGate.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/FemSelectionGate.h b/src/Mod/Fem/Gui/FemSelectionGate.h index 6c3552b6dd..c6ac7e2915 100644 --- a/src/Mod/Fem/Gui/FemSelectionGate.h +++ b/src/Mod/Fem/Gui/FemSelectionGate.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * This file is part of the FreeCAD CAx development system. * * * * This library is free software; you can redistribute it and/or * diff --git a/src/Mod/Fem/Gui/PreCompiled.cpp b/src/Mod/Fem/Gui/PreCompiled.cpp old mode 100755 new mode 100644 index 3b2e513af1..46269e9671 --- a/src/Mod/Fem/Gui/PreCompiled.cpp +++ b/src/Mod/Fem/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h old mode 100755 new mode 100644 index 9eab34900c..28fd50da97 --- a/src/Mod/Fem/Gui/PreCompiled.h +++ b/src/Mod/Fem/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp index e65f56b119..1641b618a1 100644 --- a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp +++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.h b/src/Mod/Fem/Gui/TaskAnalysisInfo.h index 5dad4edaa9..60d0515bc6 100644 --- a/src/Mod/Fem/Gui/TaskAnalysisInfo.h +++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp index c3e66f2a53..22bdcc0d28 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.h b/src/Mod/Fem/Gui/TaskCreateNodeSet.h index 623973fe33..f5dea9bedb 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.h +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp b/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp index c04d5ffb2a..a915e60c2d 100644 --- a/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp +++ b/src/Mod/Fem/Gui/TaskDlgAnalysis.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskDlgAnalysis.h b/src/Mod/Fem/Gui/TaskDlgAnalysis.h index 185008f214..41003a2a4a 100644 --- a/src/Mod/Fem/Gui/TaskDlgAnalysis.h +++ b/src/Mod/Fem/Gui/TaskDlgAnalysis.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp index 8061c62c24..f0d40a70f2 100644 --- a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp +++ b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h index 4b82cca699..34f084f2bf 100644 --- a/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h +++ b/src/Mod/Fem/Gui/TaskDlgCreateNodeSet.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp index e98a1b79dc..fa1400d2bb 100644 --- a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp +++ b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h index 2391c604e5..195aa652b5 100644 --- a/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h +++ b/src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskDriver.cpp b/src/Mod/Fem/Gui/TaskDriver.cpp index 0ed6ae58cc..948638cb7f 100644 --- a/src/Mod/Fem/Gui/TaskDriver.cpp +++ b/src/Mod/Fem/Gui/TaskDriver.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskDriver.h b/src/Mod/Fem/Gui/TaskDriver.h index c7f0b96af1..edc1fc59f0 100644 --- a/src/Mod/Fem/Gui/TaskDriver.h +++ b/src/Mod/Fem/Gui/TaskDriver.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskObjectName.cpp b/src/Mod/Fem/Gui/TaskObjectName.cpp index a8334cf61a..d8a4a81050 100644 --- a/src/Mod/Fem/Gui/TaskObjectName.cpp +++ b/src/Mod/Fem/Gui/TaskObjectName.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskObjectName.h b/src/Mod/Fem/Gui/TaskObjectName.h index 8cac43043b..e27ea486d9 100644 --- a/src/Mod/Fem/Gui/TaskObjectName.h +++ b/src/Mod/Fem/Gui/TaskObjectName.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskTetParameter.cpp b/src/Mod/Fem/Gui/TaskTetParameter.cpp index 07f54aa062..2707b9e94b 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.cpp +++ b/src/Mod/Fem/Gui/TaskTetParameter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/TaskTetParameter.h b/src/Mod/Fem/Gui/TaskTetParameter.h index 70b10d1792..382f9a8ba0 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.h +++ b/src/Mod/Fem/Gui/TaskTetParameter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp index 121928e5a7..1ad1ab02ef 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h index 4938c2e164..76efc3379b 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp old mode 100755 new mode 100644 index 034aba98f2..92f0a15831 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h old mode 100755 new mode 100644 index 1bc53e2cba..e928151b49 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp index 3fdfecebc4..b9015caaee 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h index 33655999c1..9ba36d8c49 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp index f73bc623b9..8654c9c6c6 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h index 8b4ad7a05d..07763781ee 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderResult.cpp b/src/Mod/Fem/Gui/ViewProviderResult.cpp index 1da43ca270..93d56918e1 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.cpp +++ b/src/Mod/Fem/Gui/ViewProviderResult.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h index bdcdbd3a86..d626981e70 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.h +++ b/src/Mod/Fem/Gui/ViewProviderResult.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.cpp b/src/Mod/Fem/Gui/ViewProviderSetElements.cpp index 46efbc089c..0c169b1c6a 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElements.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetElements.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderSetElements.h b/src/Mod/Fem/Gui/ViewProviderSetElements.h index 2d4495664e..ffc1c938e1 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetElements.h +++ b/src/Mod/Fem/Gui/ViewProviderSetElements.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp b/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp index a814c7024e..2e5733b078 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderSetFaces.h b/src/Mod/Fem/Gui/ViewProviderSetFaces.h index a47b2e8400..45773598ed 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetFaces.h +++ b/src/Mod/Fem/Gui/ViewProviderSetFaces.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp b/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp index 0460fb71ed..3d5f00730d 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h index a049cd9e48..66c067cde2 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetGeometry.h +++ b/src/Mod/Fem/Gui/ViewProviderSetGeometry.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp b/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp index c1d4e75348..af22e3e1cd 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Fem/Gui/ViewProviderSetNodes.h b/src/Mod/Fem/Gui/ViewProviderSetNodes.h index e83f7b56a5..ccdb7f2486 100644 --- a/src/Mod/Fem/Gui/ViewProviderSetNodes.h +++ b/src/Mod/Fem/Gui/ViewProviderSetNodes.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * + * Copyright (c) 2013 Jürgen Riegel (FreeCAD@juergen-riegel.net) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Image/App/AppImage.cpp b/src/Mod/Image/App/AppImage.cpp index 75aead8741..8859b84e94 100644 --- a/src/Mod/Image/App/AppImage.cpp +++ b/src/Mod/Image/App/AppImage.cpp @@ -5,7 +5,7 @@ * published by the Free Software Foundation; either version 2 of the * * License, or (at your option) any later version. * * for detail see the LICENCE text file. * - * Jürgen Riegel 2002 * + * Jürgen Riegel 2002 * * * ***************************************************************************/ diff --git a/src/Mod/Image/App/ImagePlane.cpp b/src/Mod/Image/App/ImagePlane.cpp index a8975db4f7..c131811e5b 100644 --- a/src/Mod/Image/App/ImagePlane.cpp +++ b/src/Mod/Image/App/ImagePlane.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Image/App/ImagePlane.h b/src/Mod/Image/App/ImagePlane.h index 5e735d7b41..a2633e155d 100644 --- a/src/Mod/Image/App/ImagePlane.h +++ b/src/Mod/Image/App/ImagePlane.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Image/App/PreCompiled.cpp b/src/Mod/Image/App/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Image/App/PreCompiled.cpp +++ b/src/Mod/Image/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Image/App/PreCompiled.h b/src/Mod/Image/App/PreCompiled.h index 8ffdb32024..725e6894d8 100644 --- a/src/Mod/Image/App/PreCompiled.h +++ b/src/Mod/Image/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Image/Gui/AppImageGui.cpp b/src/Mod/Image/Gui/AppImageGui.cpp index c817860990..6ca8c54ff3 100644 --- a/src/Mod/Image/Gui/AppImageGui.cpp +++ b/src/Mod/Image/Gui/AppImageGui.cpp @@ -5,7 +5,7 @@ * published by the Free Software Foundation; either version 2 of the * * License, or (at your option) any later version. * * for detail see the LICENCE text file. * - * Jürgen Riegel 2002 * + * Jürgen Riegel 2002 * * * ***************************************************************************/ diff --git a/src/Mod/Image/Gui/Command.cpp b/src/Mod/Image/Gui/Command.cpp index d62ed2dfc1..6f2c819d56 100644 --- a/src/Mod/Image/Gui/Command.cpp +++ b/src/Mod/Image/Gui/Command.cpp @@ -5,7 +5,7 @@ * published by the Free Software Foundation; either version 2 of the * * License, or (at your option) any later version. * * for detail see the LICENCE text file. * - * Jürgen Riegel 2002 * + * Jürgen Riegel 2002 * * * ***************************************************************************/ diff --git a/src/Mod/Image/Gui/PreCompiled.cpp b/src/Mod/Image/Gui/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Image/Gui/PreCompiled.cpp +++ b/src/Mod/Image/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Image/Gui/PreCompiled.h b/src/Mod/Image/Gui/PreCompiled.h index 5ef5efd0ff..6aa64a4939 100644 --- a/src/Mod/Image/Gui/PreCompiled.h +++ b/src/Mod/Image/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp index a812e2fdbb..b1292f1f74 100644 --- a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp +++ b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.h b/src/Mod/Image/Gui/ViewProviderImagePlane.h index 6d45c27eb7..d676fe8096 100644 --- a/src/Mod/Image/Gui/ViewProviderImagePlane.h +++ b/src/Mod/Image/Gui/ViewProviderImagePlane.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/AppImport.cpp b/src/Mod/Import/App/AppImport.cpp index cd5dd6ab7a..cd6c6e484c 100644 --- a/src/Mod/Import/App/AppImport.cpp +++ b/src/Mod/Import/App/AppImport.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/FeatureImportIges.cpp b/src/Mod/Import/App/FeatureImportIges.cpp index bab695d2ee..c3ef7dbb5d 100644 --- a/src/Mod/Import/App/FeatureImportIges.cpp +++ b/src/Mod/Import/App/FeatureImportIges.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/FeatureImportIges.h b/src/Mod/Import/App/FeatureImportIges.h index 982f1e0b9a..131758839d 100644 --- a/src/Mod/Import/App/FeatureImportIges.h +++ b/src/Mod/Import/App/FeatureImportIges.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/FeatureImportStep.cpp b/src/Mod/Import/App/FeatureImportStep.cpp index a0c38c2fc8..09c25f5702 100644 --- a/src/Mod/Import/App/FeatureImportStep.cpp +++ b/src/Mod/Import/App/FeatureImportStep.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/FeatureImportStep.h b/src/Mod/Import/App/FeatureImportStep.h index 20420dcf93..dd332ca082 100644 --- a/src/Mod/Import/App/FeatureImportStep.h +++ b/src/Mod/Import/App/FeatureImportStep.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/PreCompiled.cpp b/src/Mod/Import/App/PreCompiled.cpp index 9006db2cbf..cad1e1578a 100644 --- a/src/Mod/Import/App/PreCompiled.cpp +++ b/src/Mod/Import/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/PreCompiled.h b/src/Mod/Import/App/PreCompiled.h index 8940377120..6dadab742e 100644 --- a/src/Mod/Import/App/PreCompiled.h +++ b/src/Mod/Import/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/StepShape.cpp b/src/Mod/Import/App/StepShape.cpp index 018cac8640..4c8328cea6 100644 --- a/src/Mod/Import/App/StepShape.cpp +++ b/src/Mod/Import/App/StepShape.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2014 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2014 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/App/StepShape.h b/src/Mod/Import/App/StepShape.h index 3e64cf306b..f4c1f4e9c2 100644 --- a/src/Mod/Import/App/StepShape.h +++ b/src/Mod/Import/App/StepShape.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2014 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2014 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/Gui/AppImportGui.cpp b/src/Mod/Import/Gui/AppImportGui.cpp index 14560fd5b5..55cd2fae8d 100644 --- a/src/Mod/Import/Gui/AppImportGui.cpp +++ b/src/Mod/Import/Gui/AppImportGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/Gui/Command.cpp b/src/Mod/Import/Gui/Command.cpp index 56569aa179..a599ce5c8c 100644 --- a/src/Mod/Import/Gui/Command.cpp +++ b/src/Mod/Import/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2002 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/Gui/PreCompiled.cpp b/src/Mod/Import/Gui/PreCompiled.cpp index 964aa32d03..1734bf3f87 100644 --- a/src/Mod/Import/Gui/PreCompiled.cpp +++ b/src/Mod/Import/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Import/Gui/PreCompiled.h b/src/Mod/Import/Gui/PreCompiled.h index 98ea64a5b1..769f905f9c 100644 --- a/src/Mod/Import/Gui/PreCompiled.h +++ b/src/Mod/Import/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Mesh/App/Core/Approximation.h b/src/Mod/Mesh/App/Core/Approximation.h index fd9455bc22..f661f45b72 100644 --- a/src/Mod/Mesh/App/Core/Approximation.h +++ b/src/Mod/Mesh/App/Core/Approximation.h @@ -260,35 +260,35 @@ public: */ virtual ~QuadraticFit(){}; /** - * Übertragen der Quadric-Koeffizienten + * Übertragen der Quadric-Koeffizienten * @param ulIndex Nummer des Koeffizienten (0..9) * @return double Wert des Koeffizienten */ double GetCoeff(unsigned long ulIndex) const; /** - * Übertragen der Koeffizientan als Referenz + * Übertragen der Koeffizientan als Referenz * auf das interne Array * @return const double& Referenz auf das double-Array */ const double& GetCoeffArray() const; /** * Aufruf des Fit-Algorithmus - * @return float Qualität des Fits. + * @return float Qualität des Fits. */ float Fit(); void CalcZValues(double x, double y, double &dZ1, double &dZ2) const; /** - * Berechnen der Krümmungswerte der Quadric in einem bestimmten Punkt. + * Berechnen der Krümmungswerte der Quadric in einem bestimmten Punkt. * @param x X-Koordinate * @param y Y-Koordinate * @param z Z-Koordinate - * @param rfCurv0 1. Hauptkrümmung - * @param rfCurv1 2. Hauptkrümmung - * @param rkDir0 Richtung der 1. Hauptkrümmung - * @param rkDir1 Richtung der 2. Hauptkrümmung + * @param rfCurv0 1. Hauptkrümmung + * @param rfCurv1 2. Hauptkrümmung + * @param rkDir0 Richtung der 1. Hauptkrümmung + * @param rkDir1 Richtung der 2. Hauptkrümmung * @param dDistance - * @return bool Fehlerfreie Ausfürhung = true, ansonsten false + * @return bool Fehlerfreie Ausfürhung = true, ansonsten false */ bool GetCurvatureInfo(double x, double y, double z, double &rfCurv0, double &rfCurv1, @@ -315,13 +315,13 @@ protected: // ------------------------------------------------------------------------------- /** - * Dies ist ein 2,5D-Ansatz, bei dem zunächst die Ausgleichsebene der Punktmenge (P_i = (x,y,z), i=1,...,n) + * Dies ist ein 2,5D-Ansatz, bei dem zunächst die Ausgleichsebene der Punktmenge (P_i = (x,y,z), i=1,...,n) * bestimmt wird. Danach wird eine Parametrisierung der Datenpunkte errechnet. Die Datenpunkte * werden somit bzgl. des lokalen Systems der Ebene dargestellt (P_i = (u,v,w)). * Durch diese transformierten Punkte wird nun eine quadratische Funktion * w = f(u,v) = a*u^2 + b*v^2 + c*u*v + d*u + e*v + f * berechnet. - * Dieser Ansatz wurde als Alternative für den 3D-Ansatz mit Quadriken entwickelt, da bei + * Dieser Ansatz wurde als Alternative für den 3D-Ansatz mit Quadriken entwickelt, da bei * Quadriken in (vor allem) ebenen Bereichen recht seltsame Artefakte auftreten. */ class MeshExport SurfaceFit : public PlaneFit @@ -350,7 +350,7 @@ protected: // ------------------------------------------------------------------------------- /** - * Hilfs-Klasse für den Quadric-Fit. Beinhaltet die + * Hilfs-Klasse für den Quadric-Fit. Beinhaltet die * partiellen Ableitungen der Quadric und dient zur * Berechnung der Quadrik-Eigenschaften. */ @@ -374,7 +374,7 @@ public: pImplSurf = new Wm4::QuadricSurface( dKoeff ); } /** - * Übernehmen der Quadric-Parameter + * Übernehmen der Quadric-Parameter * @param pKoef Zeiger auf die Quadric-Parameter * (double [10]) */ @@ -384,7 +384,7 @@ public: dKoeff[ ct ] = pKoef[ ct ]; } /** - * Destruktor. Löscht die ImpicitSurface Klasse + * Destruktor. Löscht die ImpicitSurface Klasse * der MGC-Bibliothek wieder */ ~FunctionContainer(){ delete pImplSurf; } @@ -396,16 +396,16 @@ public: double& operator[](int idx){ return dKoeff[ idx ]; } /** * Redirector auf eine Methode der MGC Bibliothek. Ermittelt - * die Hauptkrümmungen und ihre Richtungen im angegebenen Punkt. + * die Hauptkrümmungen und ihre Richtungen im angegebenen Punkt. * @param x X-Koordinate * @param y Y-Koordinate * @param z Z-Koordinate - * @param rfCurv0 1. Hauptkrümmung - * @param rfCurv1 2. Hauptkrümmung - * @param rkDir0 Richtung der 1. Hauptkrümmung - * @param rkDir1 Richtung der 2. Hauptkrümmung + * @param rfCurv0 1. Hauptkrümmung + * @param rfCurv1 2. Hauptkrümmung + * @param rkDir0 Richtung der 1. Hauptkrümmung + * @param rkDir1 Richtung der 2. Hauptkrümmung * @param dDistance Ergebnis das die Entfernung des Punktes von der Quadrik angibt. - * @return bool Fehlerfreie Ausfürhung = true, ansonsten false + * @return bool Fehlerfreie Ausfürhung = true, ansonsten false */ bool CurvatureInfo(double x, double y, double z, double &rfCurv0, double &rfCurv1, diff --git a/src/Mod/Mesh/App/Core/Degeneration.cpp b/src/Mod/Mesh/App/Core/Degeneration.cpp index 4608ca18c9..26da59160e 100644 --- a/src/Mod/Mesh/App/Core/Degeneration.cpp +++ b/src/Mod/Mesh/App/Core/Degeneration.cpp @@ -659,7 +659,7 @@ bool MeshFixDeformedFacets::Fixup() fCosAngles[i] = fCosAngle; } - // first check for angle > 120°: in this case we swap with the opposite edge + // first check for angle > 120°: in this case we swap with the opposite edge for (int i=0; i<3; i++) { float fCosAngle = fCosAngles[i]; @@ -678,7 +678,7 @@ bool MeshFixDeformedFacets::Fixup() if (done) continue; - // now check for angle < 30°: in this case we swap with one of the edges the corner is part of + // now check for angle < 30°: in this case we swap with one of the edges the corner is part of for (int j=0; j<3; j++) { float fCosAngle = fCosAngles[j]; diff --git a/src/Mod/Mesh/App/Core/Degeneration.h b/src/Mod/Mesh/App/Core/Degeneration.h index e5a4f7fdd3..78407165d6 100644 --- a/src/Mod/Mesh/App/Core/Degeneration.h +++ b/src/Mod/Mesh/App/Core/Degeneration.h @@ -328,7 +328,7 @@ public: }; /** - * The MeshEvalDeformedFacets class searches for deformed facets. A facet is regarded as deformed if an angle is < 30° or > 120°. + * The MeshEvalDeformedFacets class searches for deformed facets. A facet is regarded as deformed if an angle is < 30° or > 120°. * @see MeshFixDegeneratedFacets * @author Werner Mayer */ diff --git a/src/Mod/Mesh/App/Core/Elements.cpp b/src/Mod/Mesh/App/Core/Elements.cpp index 26f01f33a4..92834d35c3 100644 --- a/src/Mod/Mesh/App/Core/Elements.cpp +++ b/src/Mod/Mesh/App/Core/Elements.cpp @@ -432,7 +432,7 @@ bool MeshGeomFacet::IsDeformed() const fCosAngle = u * v; - // x < 30° => cos(x) > sqrt(3)/2 or x > 120° => cos(x) < -0.5 + // x < 30° => cos(x) > sqrt(3)/2 or x > 120° => cos(x) < -0.5 if (fCosAngle > 0.86f || fCosAngle < -0.5f) return true; } @@ -748,7 +748,7 @@ void MeshGeomFacet::SubSample (float fStep, std::vector &rclPoin } /** - * Fast Triangle-Triangle Intersection Test by Tomas Möller + * Fast Triangle-Triangle Intersection Test by Tomas Möller * http://www.acm.org/jgt/papers/Moller97/tritri.html * http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/ */ @@ -771,7 +771,7 @@ bool MeshGeomFacet::IntersectWithFacet(const MeshGeomFacet &rclFacet) const } /** - * Fast Triangle-Triangle Intersection Test by Tomas Möller + * Fast Triangle-Triangle Intersection Test by Tomas Möller * http://www.acm.org/jgt/papers/Moller97/tritri.html * http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/ */ diff --git a/src/Mod/Mesh/App/Core/Elements.h b/src/Mod/Mesh/App/Core/Elements.h index 64f53c4797..40209d218d 100644 --- a/src/Mod/Mesh/App/Core/Elements.h +++ b/src/Mod/Mesh/App/Core/Elements.h @@ -361,8 +361,8 @@ public: bool IsDegenerated() const; /** * Checks whether the triangle is deformed. The definition of a deformed triangles is not as strong - * as the definition of a degenerated triangle. A triangle is deformed if the maximum angle exceeds 120° - * or the minimum angle falls below 30°. + * as the definition of a degenerated triangle. A triangle is deformed if the maximum angle exceeds 120° + * or the minimum angle falls below 30°. * A degenerated triangle is also a deformed triangle. */ bool IsDeformed() const; diff --git a/src/Mod/Mesh/App/MeshPointPyImp.cpp b/src/Mod/Mesh/App/MeshPointPyImp.cpp index 606b7e284e..bbea378c07 100644 --- a/src/Mod/Mesh/App/MeshPointPyImp.cpp +++ b/src/Mod/Mesh/App/MeshPointPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/MeshPart/App/AppMeshPart.cpp b/src/Mod/MeshPart/App/AppMeshPart.cpp index 3645f9d1c8..bf505f9d69 100644 --- a/src/Mod/MeshPart/App/AppMeshPart.cpp +++ b/src/Mod/MeshPart/App/AppMeshPart.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp index ddb836c31e..3395884a79 100644 --- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp +++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/MeshPart/App/PreCompiled.cpp b/src/Mod/MeshPart/App/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/MeshPart/App/PreCompiled.cpp +++ b/src/Mod/MeshPart/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h index 42f223fa18..1bb9560e61 100644 --- a/src/Mod/MeshPart/App/PreCompiled.h +++ b/src/Mod/MeshPart/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp index d66c7e5de1..9661f091d0 100644 --- a/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp +++ b/src/Mod/MeshPart/Gui/AppMeshPartGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/MeshPart/Gui/Command.cpp b/src/Mod/MeshPart/Gui/Command.cpp index 2ac03d3b67..c22a994731 100644 --- a/src/Mod/MeshPart/Gui/Command.cpp +++ b/src/Mod/MeshPart/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/MeshPart/Gui/PreCompiled.cpp b/src/Mod/MeshPart/Gui/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/MeshPart/Gui/PreCompiled.cpp +++ b/src/Mod/MeshPart/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/MeshPart/Gui/PreCompiled.h b/src/Mod/MeshPart/Gui/PreCompiled.h index 30780015c8..5711c8c84b 100644 --- a/src/Mod/MeshPart/Gui/PreCompiled.h +++ b/src/Mod/MeshPart/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/AppPart.cpp b/src/Mod/Part/App/AppPart.cpp index 58db653e28..5951c82e85 100644 --- a/src/Mod/Part/App/AppPart.cpp +++ b/src/Mod/Part/App/AppPart.cpp @@ -5,7 +5,7 @@ * published by the Free Software Foundation; either version 2 of the * * License, or (at your option) any later version. * * for detail see the LICENCE text file. * - * Jürgen Riegel 2002 * + * Jürgen Riegel 2002 * * * ***************************************************************************/ diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index 094895f2a9..3efbeb0040 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeatureGeometrySet.cpp b/src/Mod/Part/App/FeatureGeometrySet.cpp index f52150ada5..92e6cbab0d 100644 --- a/src/Mod/Part/App/FeatureGeometrySet.cpp +++ b/src/Mod/Part/App/FeatureGeometrySet.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeatureGeometrySet.h b/src/Mod/Part/App/FeatureGeometrySet.h index e081c1d04d..330915cd75 100644 --- a/src/Mod/Part/App/FeatureGeometrySet.h +++ b/src/Mod/Part/App/FeatureGeometrySet.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartBox.cpp b/src/Mod/Part/App/FeaturePartBox.cpp index 12c9bf2085..8d56a698bd 100644 --- a/src/Mod/Part/App/FeaturePartBox.cpp +++ b/src/Mod/Part/App/FeaturePartBox.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartBox.h b/src/Mod/Part/App/FeaturePartBox.h index 086fa40cd4..986280621c 100644 --- a/src/Mod/Part/App/FeaturePartBox.h +++ b/src/Mod/Part/App/FeaturePartBox.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartCurveNet.cpp b/src/Mod/Part/App/FeaturePartCurveNet.cpp index c2f347044d..f416235b37 100644 --- a/src/Mod/Part/App/FeaturePartCurveNet.cpp +++ b/src/Mod/Part/App/FeaturePartCurveNet.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartCurveNet.h b/src/Mod/Part/App/FeaturePartCurveNet.h index e2a682251a..45ac4d41ab 100644 --- a/src/Mod/Part/App/FeaturePartCurveNet.h +++ b/src/Mod/Part/App/FeaturePartCurveNet.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartCut.cpp b/src/Mod/Part/App/FeaturePartCut.cpp index 6b6d792c5e..3606d13bbc 100644 --- a/src/Mod/Part/App/FeaturePartCut.cpp +++ b/src/Mod/Part/App/FeaturePartCut.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartCut.h b/src/Mod/Part/App/FeaturePartCut.h index 11187781c9..f0ade1cdb6 100644 --- a/src/Mod/Part/App/FeaturePartCut.h +++ b/src/Mod/Part/App/FeaturePartCut.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartImportBrep.cpp b/src/Mod/Part/App/FeaturePartImportBrep.cpp index 68f92c6ca6..b62ad75d9c 100644 --- a/src/Mod/Part/App/FeaturePartImportBrep.cpp +++ b/src/Mod/Part/App/FeaturePartImportBrep.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartImportBrep.h b/src/Mod/Part/App/FeaturePartImportBrep.h index 51cf5f3fe7..38f9fe4253 100644 --- a/src/Mod/Part/App/FeaturePartImportBrep.h +++ b/src/Mod/Part/App/FeaturePartImportBrep.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartImportIges.cpp b/src/Mod/Part/App/FeaturePartImportIges.cpp index 25c619d686..3b67ec301e 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.cpp +++ b/src/Mod/Part/App/FeaturePartImportIges.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartImportIges.h b/src/Mod/Part/App/FeaturePartImportIges.h index 8ec2318426..1fb2b767f8 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.h +++ b/src/Mod/Part/App/FeaturePartImportIges.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartImportStep.cpp b/src/Mod/Part/App/FeaturePartImportStep.cpp index b59991c374..2544357824 100644 --- a/src/Mod/Part/App/FeaturePartImportStep.cpp +++ b/src/Mod/Part/App/FeaturePartImportStep.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/FeaturePartImportStep.h b/src/Mod/Part/App/FeaturePartImportStep.h index 185ea2e4db..0bcbf868da 100644 --- a/src/Mod/Part/App/FeaturePartImportStep.h +++ b/src/Mod/Part/App/FeaturePartImportStep.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/ImportStep.cpp b/src/Mod/Part/App/ImportStep.cpp index 69d773a7b7..c8c9d9a0f8 100644 --- a/src/Mod/Part/App/ImportStep.cpp +++ b/src/Mod/Part/App/ImportStep.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/ImportStep.h b/src/Mod/Part/App/ImportStep.h index af5e98ad49..e7c9525038 100644 --- a/src/Mod/Part/App/ImportStep.h +++ b/src/Mod/Part/App/ImportStep.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/Part2DObject.cpp b/src/Mod/Part/App/Part2DObject.cpp index ec7ec11506..159b5a8cf4 100644 --- a/src/Mod/Part/App/Part2DObject.cpp +++ b/src/Mod/Part/App/Part2DObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/Part2DObject.h b/src/Mod/Part/App/Part2DObject.h index be4892fd86..f946e94a83 100644 --- a/src/Mod/Part/App/Part2DObject.h +++ b/src/Mod/Part/App/Part2DObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp index 793cfd6d06..4ca176884d 100644 --- a/src/Mod/Part/App/PartFeature.cpp +++ b/src/Mod/Part/App/PartFeature.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PartFeature.h b/src/Mod/Part/App/PartFeature.h index 7b49bd346b..d724cf6acd 100644 --- a/src/Mod/Part/App/PartFeature.h +++ b/src/Mod/Part/App/PartFeature.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PartFeatureReference.cpp b/src/Mod/Part/App/PartFeatureReference.cpp index 58de946284..2e0d8d1428 100644 --- a/src/Mod/Part/App/PartFeatureReference.cpp +++ b/src/Mod/Part/App/PartFeatureReference.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PartFeatureReference.h b/src/Mod/Part/App/PartFeatureReference.h index 78db528bc9..858a844426 100644 --- a/src/Mod/Part/App/PartFeatureReference.h +++ b/src/Mod/Part/App/PartFeatureReference.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PreCompiled.cpp b/src/Mod/Part/App/PreCompiled.cpp index 964aa32d03..1734bf3f87 100644 --- a/src/Mod/Part/App/PreCompiled.cpp +++ b/src/Mod/Part/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h index 1a1cd24f6f..1570284b3d 100644 --- a/src/Mod/Part/App/PreCompiled.h +++ b/src/Mod/Part/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PropertyGeometryList.cpp b/src/Mod/Part/App/PropertyGeometryList.cpp index 1a1bddcbe9..c97fa094fc 100644 --- a/src/Mod/Part/App/PropertyGeometryList.cpp +++ b/src/Mod/Part/App/PropertyGeometryList.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PropertyGeometryList.h b/src/Mod/Part/App/PropertyGeometryList.h index 135430ad66..ded1e05df1 100644 --- a/src/Mod/Part/App/PropertyGeometryList.h +++ b/src/Mod/Part/App/PropertyGeometryList.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp index da8cc69dc3..922059758e 100644 --- a/src/Mod/Part/App/PropertyTopoShape.cpp +++ b/src/Mod/Part/App/PropertyTopoShape.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/PropertyTopoShape.h b/src/Mod/Part/App/PropertyTopoShape.h index 22fe96c846..d51e4df260 100644 --- a/src/Mod/Part/App/PropertyTopoShape.h +++ b/src/Mod/Part/App/PropertyTopoShape.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index 7949555d65..fe291350e9 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp index 6cf7a1bf52..78c2373a07 100644 --- a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp index d921b3e40d..c80014b045 100644 --- a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp index 820b39bd50..8b46c21bde 100644 --- a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp index ef83c25c0e..f5b16712f5 100644 --- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp index cc325b5293..fd6c76a4e2 100644 --- a/src/Mod/Part/App/TopoShapePyImp.cpp +++ b/src/Mod/Part/App/TopoShapePyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapeShellPyImp.cpp b/src/Mod/Part/App/TopoShapeShellPyImp.cpp index a6d027a2b5..5c8612eae1 100644 --- a/src/Mod/Part/App/TopoShapeShellPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeShellPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp index 068147c31e..cf4e123aba 100644 --- a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp index 848138f22a..f1a7656a8d 100644 --- a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopoShapeWirePyImp.cpp b/src/Mod/Part/App/TopoShapeWirePyImp.cpp index 527401d382..40354e58a9 100644 --- a/src/Mod/Part/App/TopoShapeWirePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeWirePyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopologyPy.cpp b/src/Mod/Part/App/TopologyPy.cpp index 41007bd176..ad5e6598cf 100644 --- a/src/Mod/Part/App/TopologyPy.cpp +++ b/src/Mod/Part/App/TopologyPy.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/App/TopologyPy.h b/src/Mod/Part/App/TopologyPy.h index 470c734dde..1fcf96bd47 100644 --- a/src/Mod/Part/App/TopologyPy.h +++ b/src/Mod/Part/App/TopologyPy.h @@ -1,5 +1,5 @@ /*************************************************************************** - * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index 7946ebd48e..727c1a52e1 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/CommandParametric.cpp b/src/Mod/Part/Gui/CommandParametric.cpp index 3ad7869b85..5cbc38a9c5 100644 --- a/src/Mod/Part/Gui/CommandParametric.cpp +++ b/src/Mod/Part/Gui/CommandParametric.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp index 3a1e988829..fc67eeb8fa 100644 --- a/src/Mod/Part/Gui/CommandSimple.cpp +++ b/src/Mod/Part/Gui/CommandSimple.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgPartBoxImp.cpp b/src/Mod/Part/Gui/DlgPartBoxImp.cpp index b5816aec47..528e574464 100644 --- a/src/Mod/Part/Gui/DlgPartBoxImp.cpp +++ b/src/Mod/Part/Gui/DlgPartBoxImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgPartBoxImp.h b/src/Mod/Part/Gui/DlgPartBoxImp.h index 824c514b60..0890d1669b 100644 --- a/src/Mod/Part/Gui/DlgPartBoxImp.h +++ b/src/Mod/Part/Gui/DlgPartBoxImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgPartCylinderImp.cpp b/src/Mod/Part/Gui/DlgPartCylinderImp.cpp index c5b082019a..c168a1ee5d 100644 --- a/src/Mod/Part/Gui/DlgPartCylinderImp.cpp +++ b/src/Mod/Part/Gui/DlgPartCylinderImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgPartCylinderImp.h b/src/Mod/Part/Gui/DlgPartCylinderImp.h index 44cc5db345..ba835763c5 100644 --- a/src/Mod/Part/Gui/DlgPartCylinderImp.h +++ b/src/Mod/Part/Gui/DlgPartCylinderImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp index 855b847b30..1476b7faea 100644 --- a/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp +++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgPartImportIgesImp.h b/src/Mod/Part/Gui/DlgPartImportIgesImp.h index 8ffb5e096c..b81480ce55 100644 --- a/src/Mod/Part/Gui/DlgPartImportIgesImp.h +++ b/src/Mod/Part/Gui/DlgPartImportIgesImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp index 48cab445e4..d4e376d015 100644 --- a/src/Mod/Part/Gui/DlgPartImportStepImp.cpp +++ b/src/Mod/Part/Gui/DlgPartImportStepImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgPartImportStepImp.h b/src/Mod/Part/Gui/DlgPartImportStepImp.h index 188ab09078..3302aa5040 100644 --- a/src/Mod/Part/Gui/DlgPartImportStepImp.h +++ b/src/Mod/Part/Gui/DlgPartImportStepImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp index 479875500a..54e9db22d9 100644 --- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp +++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h index 95059a8431..3fc13c26d1 100644 --- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h +++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -32,7 +32,7 @@ class Ui_DlgSettings3DViewPart; /** * The DlgSettings3DViewPartImp class implements a preference page to change settings * for the Inventor viewer. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgSettings3DViewPart : public Gui::Dialog::PreferencePage { diff --git a/src/Mod/Part/Gui/PreCompiled.cpp b/src/Mod/Part/Gui/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Part/Gui/PreCompiled.cpp +++ b/src/Mod/Part/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h index 0162d2fe88..53d5e31ccf 100644 --- a/src/Mod/Part/Gui/PreCompiled.h +++ b/src/Mod/Part/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProvider.h b/src/Mod/Part/Gui/ViewProvider.h index c5f9534399..5a11239e72 100644 --- a/src/Mod/Part/Gui/ViewProvider.h +++ b/src/Mod/Part/Gui/ViewProvider.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp index 3e8cd9b0b3..1ab4973566 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp +++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.h b/src/Mod/Part/Gui/ViewProvider2DObject.h index 631adce595..48bec2f18b 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.h +++ b/src/Mod/Part/Gui/ViewProvider2DObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderBox.cpp b/src/Mod/Part/Gui/ViewProviderBox.cpp index 2e3151d6e1..40ae86a89a 100644 --- a/src/Mod/Part/Gui/ViewProviderBox.cpp +++ b/src/Mod/Part/Gui/ViewProviderBox.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderBox.h b/src/Mod/Part/Gui/ViewProviderBox.h index 366c59118d..8ccdce1075 100644 --- a/src/Mod/Part/Gui/ViewProviderBox.h +++ b/src/Mod/Part/Gui/ViewProviderBox.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp index f7248f5fec..815bfa46a7 100644 --- a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.h b/src/Mod/Part/Gui/ViewProviderCircleParametric.h index 3436fd9ebc..fd7260f6f4 100644 --- a/src/Mod/Part/Gui/ViewProviderCircleParametric.h +++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp index 7b2a0f1f95..171a34b01c 100644 --- a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.h b/src/Mod/Part/Gui/ViewProviderConeParametric.h index 3d41d8c43a..23120d1b4f 100644 --- a/src/Mod/Part/Gui/ViewProviderConeParametric.h +++ b/src/Mod/Part/Gui/ViewProviderConeParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp index 5a69bf0304..bae3040634 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderCurveNet.h b/src/Mod/Part/Gui/ViewProviderCurveNet.h index c81976c459..0523ed0619 100644 --- a/src/Mod/Part/Gui/ViewProviderCurveNet.h +++ b/src/Mod/Part/Gui/ViewProviderCurveNet.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp index 8cd53ebbb2..f9eb028445 100644 --- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h index 0496a34b07..03ab4211ac 100644 --- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.h +++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h index 10f87d3ad7..d033498067 100644 --- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.h +++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderHelixParametric.h b/src/Mod/Part/Gui/ViewProviderHelixParametric.h index c2a557668f..bb868c7330 100644 --- a/src/Mod/Part/Gui/ViewProviderHelixParametric.h +++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderImport.cpp b/src/Mod/Part/Gui/ViewProviderImport.cpp index 6bf6bf3f04..a75d1f8f90 100644 --- a/src/Mod/Part/Gui/ViewProviderImport.cpp +++ b/src/Mod/Part/Gui/ViewProviderImport.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderImport.h b/src/Mod/Part/Gui/ViewProviderImport.h index 7b043c879d..0a05801a81 100644 --- a/src/Mod/Part/Gui/ViewProviderImport.h +++ b/src/Mod/Part/Gui/ViewProviderImport.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp index de06728cba..e5fce0ab5c 100644 --- a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.h b/src/Mod/Part/Gui/ViewProviderLineParametric.h index 1ba61ed56d..00c7737e4f 100644 --- a/src/Mod/Part/Gui/ViewProviderLineParametric.h +++ b/src/Mod/Part/Gui/ViewProviderLineParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp index 1e63cc4b7a..eb40b81899 100644 --- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h index fe2e41901e..eba2a4738c 100644 --- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.h +++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.h b/src/Mod/Part/Gui/ViewProviderPointParametric.h index 22d1140240..22fc95bbfa 100644 --- a/src/Mod/Part/Gui/ViewProviderPointParametric.h +++ b/src/Mod/Part/Gui/ViewProviderPointParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderReference.h b/src/Mod/Part/Gui/ViewProviderReference.h index e2ef186dee..134a6038b7 100644 --- a/src/Mod/Part/Gui/ViewProviderReference.h +++ b/src/Mod/Part/Gui/ViewProviderReference.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp index b20e72b4fe..6549aa67d3 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.h b/src/Mod/Part/Gui/ViewProviderRuledSurface.h index b31a107f4f..824e7da0c2 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.h +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp index 8d18c5a6c7..1441e8fa18 100644 --- a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.h b/src/Mod/Part/Gui/ViewProviderSphereParametric.h index 6d90ccd843..703c052156 100644 --- a/src/Mod/Part/Gui/ViewProviderSphereParametric.h +++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp index c84f0bcd49..d74a755ba5 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.h b/src/Mod/Part/Gui/ViewProviderTorusParametric.h index 1652fa425f..2c644c2dc2 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.h +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/App/AppPartDesign.cpp b/src/Mod/PartDesign/App/AppPartDesign.cpp index 7a8efe1c98..d58dc6cebd 100644 --- a/src/Mod/PartDesign/App/AppPartDesign.cpp +++ b/src/Mod/PartDesign/App/AppPartDesign.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/App/AppPartDesignPy.cpp b/src/Mod/PartDesign/App/AppPartDesignPy.cpp index 110300c4ec..d6da54513f 100644 --- a/src/Mod/PartDesign/App/AppPartDesignPy.cpp +++ b/src/Mod/PartDesign/App/AppPartDesignPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/App/PreCompiled.cpp b/src/Mod/PartDesign/App/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/PartDesign/App/PreCompiled.cpp +++ b/src/Mod/PartDesign/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/App/PreCompiled.h b/src/Mod/PartDesign/App/PreCompiled.h index 2320af2d07..85912d2eda 100644 --- a/src/Mod/PartDesign/App/PreCompiled.h +++ b/src/Mod/PartDesign/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp index fc08cc8c0c..963957d654 100644 --- a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp +++ b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/Gui/AppPartDesignGuiPy.cpp b/src/Mod/PartDesign/Gui/AppPartDesignGuiPy.cpp index 1bce4c1722..d184ea1e68 100644 --- a/src/Mod/PartDesign/Gui/AppPartDesignGuiPy.cpp +++ b/src/Mod/PartDesign/Gui/AppPartDesignGuiPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 31422a5d03..e79b1448cc 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/Gui/PreCompiled.cpp b/src/Mod/PartDesign/Gui/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/PartDesign/Gui/PreCompiled.cpp +++ b/src/Mod/PartDesign/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h index bbe10c1366..f20dc8ed83 100644 --- a/src/Mod/PartDesign/Gui/PreCompiled.h +++ b/src/Mod/PartDesign/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp index 34ddf6c957..91b84e538f 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2012 Jürgen Riegel * + * Copyright (c) 2012 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h index afeadb31e9..f0075c6308 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2012 Jürgen Riegel * + * Copyright (c) 2012 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Path/libarea/clipper.cpp b/src/Mod/Path/libarea/clipper.cpp index 903d0651dc..d6bb0827a9 100644 --- a/src/Mod/Path/libarea/clipper.cpp +++ b/src/Mod/Path/libarea/clipper.cpp @@ -4161,10 +4161,10 @@ double DistanceFromLineSqrd( const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2) { //The equation of a line in general form (Ax + By + C = 0) - //given 2 points (x¹,y¹) & (x²,y²) is ... - //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0 - //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹ - //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²) + //given 2 points (x¹,y¹) & (x²,y²) is ... + //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0 + //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹ + //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²) //see http://en.wikipedia.org/wiki/Perpendicular_distance double A = double(ln1.Y - ln2.Y); double B = double(ln2.X - ln1.X); diff --git a/src/Mod/Points/App/PreCompiled.cpp b/src/Mod/Points/App/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Points/App/PreCompiled.cpp +++ b/src/Mod/Points/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Points/App/PreCompiled.h b/src/Mod/Points/App/PreCompiled.h index 9ce09439b8..e4a6109a28 100644 --- a/src/Mod/Points/App/PreCompiled.h +++ b/src/Mod/Points/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp index 953d3e2848..55aefaada7 100644 --- a/src/Mod/Points/Gui/AppPointsGui.cpp +++ b/src/Mod/Points/Gui/AppPointsGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.cpp b/src/Mod/Points/Gui/DlgPointsReadImp.cpp index 22d8040997..64d1af703d 100644 --- a/src/Mod/Points/Gui/DlgPointsReadImp.cpp +++ b/src/Mod/Points/Gui/DlgPointsReadImp.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.h b/src/Mod/Points/Gui/DlgPointsReadImp.h index 26323296e4..4d9020778b 100644 --- a/src/Mod/Points/Gui/DlgPointsReadImp.h +++ b/src/Mod/Points/Gui/DlgPointsReadImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Points/Gui/PreCompiled.cpp b/src/Mod/Points/Gui/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Points/Gui/PreCompiled.cpp +++ b/src/Mod/Points/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Points/Gui/PreCompiled.h b/src/Mod/Points/Gui/PreCompiled.h index d08bb6ac57..894d116e98 100644 --- a/src/Mod/Points/Gui/PreCompiled.h +++ b/src/Mod/Points/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/LuxTools.cpp b/src/Mod/Raytracing/App/LuxTools.cpp index 409e36aca5..ccdc5e0813 100644 --- a/src/Mod/Raytracing/App/LuxTools.cpp +++ b/src/Mod/Raytracing/App/LuxTools.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/LuxTools.h b/src/Mod/Raytracing/App/LuxTools.h index f299cd6598..7b9d55c365 100644 --- a/src/Mod/Raytracing/App/LuxTools.h +++ b/src/Mod/Raytracing/App/LuxTools.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/PovTools.cpp b/src/Mod/Raytracing/App/PovTools.cpp index 527ca36290..5b23e6d13d 100644 --- a/src/Mod/Raytracing/App/PovTools.cpp +++ b/src/Mod/Raytracing/App/PovTools.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/PovTools.h b/src/Mod/Raytracing/App/PovTools.h index 85ea5f3c9b..27a9e8b410 100644 --- a/src/Mod/Raytracing/App/PovTools.h +++ b/src/Mod/Raytracing/App/PovTools.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2005 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/PreCompiled.cpp b/src/Mod/Raytracing/App/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Raytracing/App/PreCompiled.cpp +++ b/src/Mod/Raytracing/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/PreCompiled.h b/src/Mod/Raytracing/App/PreCompiled.h index 6d83526fa6..fe7ca3c302 100644 --- a/src/Mod/Raytracing/App/PreCompiled.h +++ b/src/Mod/Raytracing/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/RayFeature.cpp b/src/Mod/Raytracing/App/RayFeature.cpp index 879cd3c844..c0e44df6f9 100644 --- a/src/Mod/Raytracing/App/RayFeature.cpp +++ b/src/Mod/Raytracing/App/RayFeature.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/RayFeature.h b/src/Mod/Raytracing/App/RayFeature.h index 2e3769c1bf..be053d068e 100644 --- a/src/Mod/Raytracing/App/RayFeature.h +++ b/src/Mod/Raytracing/App/RayFeature.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/RayProject.cpp b/src/Mod/Raytracing/App/RayProject.cpp index d4f1428e72..6e8c14da2c 100644 --- a/src/Mod/Raytracing/App/RayProject.cpp +++ b/src/Mod/Raytracing/App/RayProject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/RayProject.h b/src/Mod/Raytracing/App/RayProject.h index c21d2fc16f..29ccb692d2 100644 --- a/src/Mod/Raytracing/App/RayProject.h +++ b/src/Mod/Raytracing/App/RayProject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/RaySegment.cpp b/src/Mod/Raytracing/App/RaySegment.cpp index 3cd5c9269e..682771067e 100644 --- a/src/Mod/Raytracing/App/RaySegment.cpp +++ b/src/Mod/Raytracing/App/RaySegment.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/App/RaySegment.h b/src/Mod/Raytracing/App/RaySegment.h index 5e3b323c02..7acd1f0994 100644 --- a/src/Mod/Raytracing/App/RaySegment.h +++ b/src/Mod/Raytracing/App/RaySegment.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2007 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp index c59369a4a7..296d6b9ffc 100644 --- a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp +++ b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/Gui/Command.cpp b/src/Mod/Raytracing/Gui/Command.cpp index 5e044830dd..fa0ed9fe6f 100644 --- a/src/Mod/Raytracing/Gui/Command.cpp +++ b/src/Mod/Raytracing/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp index 632a582e34..f5d12ad16f 100644 --- a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp +++ b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h index 4adcefe072..898b6ca40f 100644 --- a/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h +++ b/src/Mod/Raytracing/Gui/DlgSettingsRayImp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2002 Jürgen Riegel * + * Copyright (c) 2002 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -32,7 +32,7 @@ namespace RaytracingGui { /** * The DlgSettings3DViewImp class implements a preference page to change settings * for the Inventor viewer. - * \author Jürgen Riegel + * \author Jürgen Riegel */ class DlgSettingsRayImp : public Gui::Dialog::PreferencePage, public Ui_DlgSettingsRay { diff --git a/src/Mod/Raytracing/Gui/PreCompiled.cpp b/src/Mod/Raytracing/Gui/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Raytracing/Gui/PreCompiled.cpp +++ b/src/Mod/Raytracing/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Raytracing/Gui/PreCompiled.h b/src/Mod/Raytracing/Gui/PreCompiled.h index c2db9f17e1..5e1a8599f1 100644 --- a/src/Mod/Raytracing/Gui/PreCompiled.h +++ b/src/Mod/Raytracing/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp index 6c469d71d0..3fe48e7ad2 100644 --- a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp +++ b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp index de1af2d8a9..cdad9153dc 100644 --- a/src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp +++ b/src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp index 3710a59e09..a0c9f18d19 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp @@ -146,7 +146,7 @@ int BSplineBasis::FindSpan(double fParam) int low = _iOrder-1; int high = n+1; - int mid = (low+high)/2; //Binärsuche + int mid = (low+high)/2; //Binärsuche while (fParam < _vKnotVector(mid) || fParam>= _vKnotVector(mid+1)) { @@ -261,7 +261,7 @@ void BSplineBasis::DerivativesOfBasisFunction(int iIndex, int iMaxDer, double fP math_Matrix N(0,p,0,p); double saved; - // falls Wert außerhalb Intervall, dann Funktionswert und alle Ableitungen gleich Null + // falls Wert außerhalb Intervall, dann Funktionswert und alle Ableitungen gleich Null if (fParam < _vKnotVector(iIndex) || fParam >= _vKnotVector(iIndex+p+1)) { for (int k=0; k<=iMax; k++) @@ -365,7 +365,7 @@ double BSplineBasis::DerivativeOfBasisFunction(int iIndex, int iMaxDer, double f math_Matrix N(0,p,0,p); double saved; - // falls Wert außerhalb Intervall, dann Funktionswert und Ableitungen gleich Null + // falls Wert außerhalb Intervall, dann Funktionswert und Ableitungen gleich Null if (fParam < _vKnotVector(iIndex) || fParam >= _vKnotVector(iIndex+p+1)) { return 0.0f; @@ -819,7 +819,7 @@ void BSplineParameterCorrection::Init() unsigned short usUMax = _usUCtrlpoints-_usUOrder+1; unsigned short usVMax = _usVCtrlpoints-_usVOrder+1; - // Knotenvektor für die CAS.CADE-Klasse + // Knotenvektor für die CAS.CADE-Klasse // u-Richtung for (int i=0;i<=usUMax; i++) { @@ -849,7 +849,7 @@ void BSplineParameterCorrection::SetUKnots(const std::vector& afKnots) unsigned short usUMax = _usUCtrlpoints-_usUOrder+1; - // Knotenvektor für die CAS.CADE-Klasse + // Knotenvektor für die CAS.CADE-Klasse // u-Richtung for (int i=1;i& afKnots) unsigned short usVMax = _usVCtrlpoints-_usVOrder+1; - // Knotenvektor für die CAS.CADE-Klasse + // Knotenvektor für die CAS.CADE-Klasse // v-Richtung for (int i=1; i& afKnots); /** - * Gibt die erste Matrix der Glättungsterme zurück, falls berechnet + * Gibt die erste Matrix der Glättungsterme zurück, falls berechnet */ virtual const math_Matrix& GetFirstSmoothMatrix() const; /** - * Gibt die zweite Matrix der Glättungsterme zurück, falls berechnet + * Gibt die zweite Matrix der Glättungsterme zurück, falls berechnet */ virtual const math_Matrix& GetSecondSmoothMatrix() const; /** - * Gibt die dritte Matrix der Glättungsterme zurück, falls berechnet + * Gibt die dritte Matrix der Glättungsterme zurück, falls berechnet */ virtual const math_Matrix& GetThirdSmoothMatrix() const; /** - * Setzt die erste Matrix der Glättungsterme + * Setzt die erste Matrix der Glättungsterme */ virtual void SetFirstSmoothMatrix(const math_Matrix& rclMat); /** - * Setzt die zweite Matrix der Glättungsterme + * Setzt die zweite Matrix der Glättungsterme */ virtual void SetSecondSmoothMatrix(const math_Matrix& rclMat); /** - * Setzt die dritte Matrix der Glättungsterme + * Setzt die dritte Matrix der Glättungsterme */ virtual void SetThirdSmoothMatrix(const math_Matrix& rclMat); /** - * Verwende Glättungsterme + * Verwende Glättungsterme */ virtual void EnableSmoothing(bool bSmooth=true, double fSmoothInfl=1.0f); /** - * Verwende Glättungsterme + * Verwende Glättungsterme */ virtual void EnableSmoothing(bool bSmooth, double fSmoothInfl, double fFirst, double fSec, double fThird); protected: /** - * Berechnet die Matrix zu den Glättungstermen + * Berechnet die Matrix zu den Glättungstermen * (siehe Dissertation U.Dietz) */ virtual void CalcSmoothingTerms(bool bRecalc, double fFirst, double fSecond, double fThird); /** - * Berechnet die Matrix zum ersten Glättungsterm + * Berechnet die Matrix zum ersten Glättungsterm * (siehe Diss. U.Dietz) */ virtual void CalcFirstSmoothMatrix(Base::SequencerLauncher&); /** - * Berechnet die Matrix zum zweiten Glättunsterm + * Berechnet die Matrix zum zweiten Glättunsterm * (siehe Diss. U.Dietz) */ virtual void CalcSecondSmoothMatrix(Base::SequencerLauncher&); /** - * Berechnet die Matrix zum dritten Glättungsterm + * Berechnet die Matrix zum dritten Glättungsterm */ virtual void CalcThirdSmoothMatrix(Base::SequencerLauncher&); protected: BSplineBasis _clUSpline; //! B-Spline-Basisfunktion in u-Richtung BSplineBasis _clVSpline; //! B-Spline-Basisfunktion in v-Richtung - math_Matrix _clSmoothMatrix; //! Matrix der Glättungsfunktionale - math_Matrix _clFirstMatrix; //! Matrix der 1. Glättungsfunktionale - math_Matrix _clSecondMatrix; //! Matrix der 2. Glättungsfunktionale - math_Matrix _clThirdMatrix; //! Matrix der 3. Glättungsfunktionale + math_Matrix _clSmoothMatrix; //! Matrix der Glättungsfunktionale + math_Matrix _clFirstMatrix; //! Matrix der 1. Glättungsfunktionale + math_Matrix _clSecondMatrix; //! Matrix der 2. Glättungsfunktionale + math_Matrix _clThirdMatrix; //! Matrix der 3. Glättungsfunktionale }; } // namespace Reen diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.cpp b/src/Mod/ReverseEngineering/App/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/ReverseEngineering/App/PreCompiled.cpp +++ b/src/Mod/ReverseEngineering/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.h b/src/Mod/ReverseEngineering/App/PreCompiled.h index 32c7392079..7e8438ce59 100644 --- a/src/Mod/ReverseEngineering/App/PreCompiled.h +++ b/src/Mod/ReverseEngineering/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp index 1c40756a46..4fcba3cd5a 100644 --- a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp +++ b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/ReverseEngineering/Gui/Command.cpp b/src/Mod/ReverseEngineering/Gui/Command.cpp index 1df871e117..f9620fdb0f 100644 --- a/src/Mod/ReverseEngineering/Gui/Command.cpp +++ b/src/Mod/ReverseEngineering/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp b/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp +++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.h b/src/Mod/ReverseEngineering/Gui/PreCompiled.h index 88cedeb217..64420136cb 100644 --- a/src/Mod/ReverseEngineering/Gui/PreCompiled.h +++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/AppRobot.cpp b/src/Mod/Robot/App/AppRobot.cpp index d12d26dccf..0f961b0f07 100644 --- a/src/Mod/Robot/App/AppRobot.cpp +++ b/src/Mod/Robot/App/AppRobot.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/AppRobotPy.cpp b/src/Mod/Robot/App/AppRobotPy.cpp index 411cdf9ee6..6bd8513e4e 100644 --- a/src/Mod/Robot/App/AppRobotPy.cpp +++ b/src/Mod/Robot/App/AppRobotPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Edge2TracObject.cpp b/src/Mod/Robot/App/Edge2TracObject.cpp index 78f9edfb72..5da88c93da 100644 --- a/src/Mod/Robot/App/Edge2TracObject.cpp +++ b/src/Mod/Robot/App/Edge2TracObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Edge2TracObject.h b/src/Mod/Robot/App/Edge2TracObject.h index 9871c594f9..9224eb68f0 100644 --- a/src/Mod/Robot/App/Edge2TracObject.h +++ b/src/Mod/Robot/App/Edge2TracObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/PreCompiled.cpp b/src/Mod/Robot/App/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/Robot/App/PreCompiled.cpp +++ b/src/Mod/Robot/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/PreCompiled.h b/src/Mod/Robot/App/PreCompiled.h index 0a5afafe04..1a09057c1f 100644 --- a/src/Mod/Robot/App/PreCompiled.h +++ b/src/Mod/Robot/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/PropertyTrajectory.cpp b/src/Mod/Robot/App/PropertyTrajectory.cpp index 8116f24fe0..5ec8536df2 100644 --- a/src/Mod/Robot/App/PropertyTrajectory.cpp +++ b/src/Mod/Robot/App/PropertyTrajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/PropertyTrajectory.h b/src/Mod/Robot/App/PropertyTrajectory.h index b824d25026..b76b299bf1 100644 --- a/src/Mod/Robot/App/PropertyTrajectory.h +++ b/src/Mod/Robot/App/PropertyTrajectory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Robot6Axis.cpp b/src/Mod/Robot/App/Robot6Axis.cpp index 8b7fe3e681..3d3e7257c0 100644 --- a/src/Mod/Robot/App/Robot6Axis.cpp +++ b/src/Mod/Robot/App/Robot6Axis.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Robot6Axis.h b/src/Mod/Robot/App/Robot6Axis.h index 5ec849a298..6663756f44 100644 --- a/src/Mod/Robot/App/Robot6Axis.h +++ b/src/Mod/Robot/App/Robot6Axis.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * @@ -36,13 +36,13 @@ namespace Robot /// Definition of the Axis properties struct AxisDefinition { double a; // a of the Denavit-Hartenberg parameters (mm) - double alpha; // alpha of the Denavit-Hartenberg parameters (°) + double alpha; // alpha of the Denavit-Hartenberg parameters (°) double d; // d of the Denavit-Hartenberg parameters (mm) - double theta; // a of the Denavit-Hartenberg parameters (°) + double theta; // a of the Denavit-Hartenberg parameters (°) double rotDir; // rotational direction (1|-1) - double maxAngle; // soft ends + in ° - double minAngle; // soft ends - in ° - double velocity; // max vlocity of the axle in °/s + double maxAngle; // soft ends + in ° + double minAngle; // soft ends - in ° + double velocity; // max vlocity of the axle in °/s }; diff --git a/src/Mod/Robot/App/Robot6AxisPyImp.cpp b/src/Mod/Robot/App/Robot6AxisPyImp.cpp index 90a6734bb9..cb1b40ea02 100644 --- a/src/Mod/Robot/App/Robot6AxisPyImp.cpp +++ b/src/Mod/Robot/App/Robot6AxisPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotAlgos.cpp b/src/Mod/Robot/App/RobotAlgos.cpp index 2d1963731f..df1442147b 100644 --- a/src/Mod/Robot/App/RobotAlgos.cpp +++ b/src/Mod/Robot/App/RobotAlgos.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotAlgos.h b/src/Mod/Robot/App/RobotAlgos.h index 5ae439c756..5dc89c9486 100644 --- a/src/Mod/Robot/App/RobotAlgos.h +++ b/src/Mod/Robot/App/RobotAlgos.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotObject.cpp b/src/Mod/Robot/App/RobotObject.cpp index f85f2f2605..bda2b3c152 100644 --- a/src/Mod/Robot/App/RobotObject.cpp +++ b/src/Mod/Robot/App/RobotObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotObject.h b/src/Mod/Robot/App/RobotObject.h index b75f33cc78..934f0e1b22 100644 --- a/src/Mod/Robot/App/RobotObject.h +++ b/src/Mod/Robot/App/RobotObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/RobotObjectPyImp.cpp b/src/Mod/Robot/App/RobotObjectPyImp.cpp index a72cdf291f..677ec8065e 100644 --- a/src/Mod/Robot/App/RobotObjectPyImp.cpp +++ b/src/Mod/Robot/App/RobotObjectPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Simulation.cpp b/src/Mod/Robot/App/Simulation.cpp index 7cde33a929..b3c175b050 100644 --- a/src/Mod/Robot/App/Simulation.cpp +++ b/src/Mod/Robot/App/Simulation.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Simulation.h b/src/Mod/Robot/App/Simulation.h index 063adb586e..4d8c69722e 100644 --- a/src/Mod/Robot/App/Simulation.h +++ b/src/Mod/Robot/App/Simulation.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Trajectory.cpp b/src/Mod/Robot/App/Trajectory.cpp index 0d9d01fd07..2f9950abcf 100644 --- a/src/Mod/Robot/App/Trajectory.cpp +++ b/src/Mod/Robot/App/Trajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Trajectory.h b/src/Mod/Robot/App/Trajectory.h index 8ba3b9ae9b..fd7dfe63b7 100644 --- a/src/Mod/Robot/App/Trajectory.h +++ b/src/Mod/Robot/App/Trajectory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2009 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryCompound.cpp b/src/Mod/Robot/App/TrajectoryCompound.cpp index 2b629a3613..5908ce1cee 100644 --- a/src/Mod/Robot/App/TrajectoryCompound.cpp +++ b/src/Mod/Robot/App/TrajectoryCompound.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryCompound.h b/src/Mod/Robot/App/TrajectoryCompound.h index 680789c771..d4a1b7d100 100644 --- a/src/Mod/Robot/App/TrajectoryCompound.h +++ b/src/Mod/Robot/App/TrajectoryCompound.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp index 64f00de1a4..5915472a4c 100644 --- a/src/Mod/Robot/App/TrajectoryDressUpObject.cpp +++ b/src/Mod/Robot/App/TrajectoryDressUpObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryDressUpObject.h b/src/Mod/Robot/App/TrajectoryDressUpObject.h index c8857f4619..41d16f6584 100644 --- a/src/Mod/Robot/App/TrajectoryDressUpObject.h +++ b/src/Mod/Robot/App/TrajectoryDressUpObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryObject.cpp b/src/Mod/Robot/App/TrajectoryObject.cpp index c7b0c9341f..2583f2c813 100644 --- a/src/Mod/Robot/App/TrajectoryObject.cpp +++ b/src/Mod/Robot/App/TrajectoryObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryObject.h b/src/Mod/Robot/App/TrajectoryObject.h index b25f938916..299e14da01 100644 --- a/src/Mod/Robot/App/TrajectoryObject.h +++ b/src/Mod/Robot/App/TrajectoryObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/TrajectoryPyImp.cpp b/src/Mod/Robot/App/TrajectoryPyImp.cpp index 773ccbee45..7ba5d2dc8a 100644 --- a/src/Mod/Robot/App/TrajectoryPyImp.cpp +++ b/src/Mod/Robot/App/TrajectoryPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Waypoint.cpp b/src/Mod/Robot/App/Waypoint.cpp index 0ac2db23fb..fe72e95f42 100644 --- a/src/Mod/Robot/App/Waypoint.cpp +++ b/src/Mod/Robot/App/Waypoint.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/Waypoint.h b/src/Mod/Robot/App/Waypoint.h index d27645a167..27f4753518 100644 --- a/src/Mod/Robot/App/Waypoint.h +++ b/src/Mod/Robot/App/Waypoint.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/App/WaypointPyImp.cpp b/src/Mod/Robot/App/WaypointPyImp.cpp index 3304f150cd..321b832760 100644 --- a/src/Mod/Robot/App/WaypointPyImp.cpp +++ b/src/Mod/Robot/App/WaypointPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp index f530b854a2..f2d06c8c26 100644 --- a/src/Mod/Robot/Gui/AppRobotGui.cpp +++ b/src/Mod/Robot/Gui/AppRobotGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/Command.cpp b/src/Mod/Robot/Gui/Command.cpp index 847e21126e..785fadff73 100644 --- a/src/Mod/Robot/Gui/Command.cpp +++ b/src/Mod/Robot/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/CommandExport.cpp b/src/Mod/Robot/Gui/CommandExport.cpp index 0c88b0a0de..bd7239b8cd 100644 --- a/src/Mod/Robot/Gui/CommandExport.cpp +++ b/src/Mod/Robot/Gui/CommandExport.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/CommandInsertRobot.cpp b/src/Mod/Robot/Gui/CommandInsertRobot.cpp index d56d42834d..6067a2d8a2 100644 --- a/src/Mod/Robot/Gui/CommandInsertRobot.cpp +++ b/src/Mod/Robot/Gui/CommandInsertRobot.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/CommandTrajectory.cpp b/src/Mod/Robot/Gui/CommandTrajectory.cpp index 3abe5f6405..d110dd2427 100644 --- a/src/Mod/Robot/Gui/CommandTrajectory.cpp +++ b/src/Mod/Robot/Gui/CommandTrajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/PreCompiled.cpp b/src/Mod/Robot/Gui/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/Robot/Gui/PreCompiled.cpp +++ b/src/Mod/Robot/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h index 51231c7f7d..25f92b5d34 100644 --- a/src/Mod/Robot/Gui/PreCompiled.h +++ b/src/Mod/Robot/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp index 8be9b6aa0b..2c0079ac2a 100644 --- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp +++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h index 3be762058a..e676e83041 100644 --- a/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h +++ b/src/Mod/Robot/Gui/TaskDlgEdge2Trac.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskDlgSimulate.cpp b/src/Mod/Robot/Gui/TaskDlgSimulate.cpp index d3fabb8397..71eb5f22d4 100644 --- a/src/Mod/Robot/Gui/TaskDlgSimulate.cpp +++ b/src/Mod/Robot/Gui/TaskDlgSimulate.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskDlgSimulate.h b/src/Mod/Robot/Gui/TaskDlgSimulate.h index 318e8c6a4d..dd2b18fe25 100644 --- a/src/Mod/Robot/Gui/TaskDlgSimulate.h +++ b/src/Mod/Robot/Gui/TaskDlgSimulate.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp index f0670cbc73..d207952fb8 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h index ed6759fa32..c777ab1616 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp index 98f3f1bd7b..efeab2e063 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h index b56b0b4efa..5b3f55d508 100644 --- a/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h +++ b/src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp index b2e3d7e311..f9e82456dd 100644 --- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp +++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h index e42264c155..fdc29e0be1 100644 --- a/src/Mod/Robot/Gui/TaskEdge2TracParameter.h +++ b/src/Mod/Robot/Gui/TaskEdge2TracParameter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp index 23b422e577..8658b9a241 100644 --- a/src/Mod/Robot/Gui/TaskRobot6Axis.cpp +++ b/src/Mod/Robot/Gui/TaskRobot6Axis.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * @@ -186,7 +186,7 @@ void TaskRobot6Axis::changeSliderA4(int value) { pcRobot->Axis4.setValue(float (value)); viewTcp(pcRobot->Tcp.getValue()); - ui->lineEdit_Axis4->setText(QString::fromLatin1("%1°").arg((float)value,0,'f',1)); + ui->lineEdit_Axis4->setText(QString::fromLatin1("%1°").arg((float)value,0,'f',1)); setColor(3,float (value),*(ui->lineEdit_Axis4)); } @@ -195,7 +195,7 @@ void TaskRobot6Axis::changeSliderA5(int value) { pcRobot->Axis5.setValue(float (value)); viewTcp(pcRobot->Tcp.getValue()); - ui->lineEdit_Axis5->setText(QString::fromLatin1("%1°").arg((float)value,0,'f',1)); + ui->lineEdit_Axis5->setText(QString::fromLatin1("%1°").arg((float)value,0,'f',1)); setColor(4,float (value),*(ui->lineEdit_Axis5)); } @@ -204,7 +204,7 @@ void TaskRobot6Axis::changeSliderA6(int value) { pcRobot->Axis6.setValue(float (value)); viewTcp(pcRobot->Tcp.getValue()); - ui->lineEdit_Axis6->setText(QString::fromLatin1("%1°").arg((float)value,0,'f',1)); + ui->lineEdit_Axis6->setText(QString::fromLatin1("%1°").arg((float)value,0,'f',1)); setColor(5,float (value),*(ui->lineEdit_Axis6)); } @@ -225,27 +225,27 @@ void TaskRobot6Axis::setColor(int i,float angle, QLineEdit &lineEdit){ void TaskRobot6Axis::setAxis(float A1,float A2,float A3,float A4,float A5,float A6,const Base::Placement &Tcp) { ui->horizontalSlider_Axis1->setSliderPosition((int)A1); - ui->lineEdit_Axis1->setText(QString::fromLatin1("%1°").arg(A1,0,'f',1)); + ui->lineEdit_Axis1->setText(QString::fromLatin1("%1°").arg(A1,0,'f',1)); setColor(0,A1,*(ui->lineEdit_Axis1)); ui->horizontalSlider_Axis2->setSliderPosition((int)A2); - ui->lineEdit_Axis2->setText(QString::fromLatin1("%1°").arg(A2,0,'f',1)); + ui->lineEdit_Axis2->setText(QString::fromLatin1("%1°").arg(A2,0,'f',1)); setColor(1,A2,*(ui->lineEdit_Axis2)); ui->horizontalSlider_Axis3->setSliderPosition((int)A3); - ui->lineEdit_Axis3->setText(QString::fromLatin1("%1°").arg(A3,0,'f',1)); + ui->lineEdit_Axis3->setText(QString::fromLatin1("%1°").arg(A3,0,'f',1)); setColor(2,A3,*(ui->lineEdit_Axis3)); ui->horizontalSlider_Axis4->setSliderPosition((int)A4); - ui->lineEdit_Axis4->setText(QString::fromLatin1("%1°").arg(A4,0,'f',1)); + ui->lineEdit_Axis4->setText(QString::fromLatin1("%1°").arg(A4,0,'f',1)); setColor(3,A4,*(ui->lineEdit_Axis4)); ui->horizontalSlider_Axis5->setSliderPosition((int)A5); - ui->lineEdit_Axis5->setText(QString::fromLatin1("%1°").arg(A5,0,'f',1)); + ui->lineEdit_Axis5->setText(QString::fromLatin1("%1°").arg(A5,0,'f',1)); setColor(4,A5,*(ui->lineEdit_Axis5)); ui->horizontalSlider_Axis6->setSliderPosition((int)A6); - ui->lineEdit_Axis6->setText(QString::fromLatin1("%1°").arg(A6,0,'f',1)); + ui->lineEdit_Axis6->setText(QString::fromLatin1("%1°").arg(A6,0,'f',1)); setColor(5,A6,*(ui->lineEdit_Axis6)); viewTcp(Tcp); diff --git a/src/Mod/Robot/Gui/TaskRobot6Axis.h b/src/Mod/Robot/Gui/TaskRobot6Axis.h index 4498d6f750..d83f6f6920 100644 --- a/src/Mod/Robot/Gui/TaskRobot6Axis.h +++ b/src/Mod/Robot/Gui/TaskRobot6Axis.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskRobotControl.cpp b/src/Mod/Robot/Gui/TaskRobotControl.cpp index 2d2fdc9f0b..32839b7d8a 100644 --- a/src/Mod/Robot/Gui/TaskRobotControl.cpp +++ b/src/Mod/Robot/Gui/TaskRobotControl.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskRobotControl.h b/src/Mod/Robot/Gui/TaskRobotControl.h index 7ef99180ba..8c9c3b1f62 100644 --- a/src/Mod/Robot/Gui/TaskRobotControl.h +++ b/src/Mod/Robot/Gui/TaskRobotControl.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskRobotMessages.cpp b/src/Mod/Robot/Gui/TaskRobotMessages.cpp index 9995f90e1c..e807633a54 100644 --- a/src/Mod/Robot/Gui/TaskRobotMessages.cpp +++ b/src/Mod/Robot/Gui/TaskRobotMessages.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskRobotMessages.h b/src/Mod/Robot/Gui/TaskRobotMessages.h index d1b92bb58f..2879610be8 100644 --- a/src/Mod/Robot/Gui/TaskRobotMessages.h +++ b/src/Mod/Robot/Gui/TaskRobotMessages.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskTrajectory.cpp b/src/Mod/Robot/Gui/TaskTrajectory.cpp index 17f2baa519..92f5addf3a 100644 --- a/src/Mod/Robot/Gui/TaskTrajectory.cpp +++ b/src/Mod/Robot/Gui/TaskTrajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskTrajectory.h b/src/Mod/Robot/Gui/TaskTrajectory.h index 788beec4d7..6a87f4fb65 100644 --- a/src/Mod/Robot/Gui/TaskTrajectory.h +++ b/src/Mod/Robot/Gui/TaskTrajectory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp index 284bf56dc6..f11181a5cf 100644 --- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp +++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h index d09b9eb19f..22c916f9b8 100644 --- a/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h +++ b/src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskWatcher.cpp b/src/Mod/Robot/Gui/TaskWatcher.cpp index bdb549f9c4..014d59efad 100644 --- a/src/Mod/Robot/Gui/TaskWatcher.cpp +++ b/src/Mod/Robot/Gui/TaskWatcher.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TaskWatcher.h b/src/Mod/Robot/Gui/TaskWatcher.h index 28067c387a..95ea1ca831 100644 --- a/src/Mod/Robot/Gui/TaskWatcher.h +++ b/src/Mod/Robot/Gui/TaskWatcher.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.cpp b/src/Mod/Robot/Gui/TrajectorySimulate.cpp index 8b4ac82165..e565eee3ad 100644 --- a/src/Mod/Robot/Gui/TrajectorySimulate.cpp +++ b/src/Mod/Robot/Gui/TrajectorySimulate.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/TrajectorySimulate.h b/src/Mod/Robot/Gui/TrajectorySimulate.h index 30cceb0ab8..4562c6f577 100644 --- a/src/Mod/Robot/Gui/TrajectorySimulate.h +++ b/src/Mod/Robot/Gui/TrajectorySimulate.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp index e43741a70a..e4eac3e038 100644 --- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h index 961c1d0973..066b2851df 100644 --- a/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h +++ b/src/Mod/Robot/Gui/ViewProviderEdge2TracObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp index 2e8d81544b..78d4653d40 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.h b/src/Mod/Robot/Gui/ViewProviderRobotObject.h index 93de3f5c7b..69d7e8f29d 100644 --- a/src/Mod/Robot/Gui/ViewProviderRobotObject.h +++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp index 3af071d5a9..ef34fea9dd 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectory.h b/src/Mod/Robot/Gui/ViewProviderTrajectory.h index 0b64b2f294..5fec13b336 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectory.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp index 1ff33b33fb..c45e22575a 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h index 2723dd8580..a6f80434fe 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp index 488aead7b8..edc7f7df76 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h index f269b6eb5b..dbcca93785 100644 --- a/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h +++ b/src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sandbox/Gui/TaskPanelView.cpp b/src/Mod/Sandbox/Gui/TaskPanelView.cpp index d244af9528..b9723c1485 100644 --- a/src/Mod/Sandbox/Gui/TaskPanelView.cpp +++ b/src/Mod/Sandbox/Gui/TaskPanelView.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sandbox/Gui/TaskPanelView.h b/src/Mod/Sandbox/Gui/TaskPanelView.h index f9934345d3..01ec8d4ac7 100644 --- a/src/Mod/Sandbox/Gui/TaskPanelView.h +++ b/src/Mod/Sandbox/Gui/TaskPanelView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/AppSketcher.cpp b/src/Mod/Sketcher/App/AppSketcher.cpp index d8b09a1a3b..487a7473b6 100644 --- a/src/Mod/Sketcher/App/AppSketcher.cpp +++ b/src/Mod/Sketcher/App/AppSketcher.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/AppSketcherPy.cpp b/src/Mod/Sketcher/App/AppSketcherPy.cpp index e97fb77404..d75f9d85ac 100644 --- a/src/Mod/Sketcher/App/AppSketcherPy.cpp +++ b/src/Mod/Sketcher/App/AppSketcherPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/Constraint.cpp b/src/Mod/Sketcher/App/Constraint.cpp index 33bfb6801c..7dbc2a173e 100644 --- a/src/Mod/Sketcher/App/Constraint.cpp +++ b/src/Mod/Sketcher/App/Constraint.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/Constraint.h b/src/Mod/Sketcher/App/Constraint.h index 53dc5fc6e4..26673cb74f 100644 --- a/src/Mod/Sketcher/App/Constraint.h +++ b/src/Mod/Sketcher/App/Constraint.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/ConstraintPyImp.cpp b/src/Mod/Sketcher/App/ConstraintPyImp.cpp index 126453c0a0..84b1687678 100644 --- a/src/Mod/Sketcher/App/ConstraintPyImp.cpp +++ b/src/Mod/Sketcher/App/ConstraintPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/PreCompiled.cpp b/src/Mod/Sketcher/App/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/Sketcher/App/PreCompiled.cpp +++ b/src/Mod/Sketcher/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/PreCompiled.h b/src/Mod/Sketcher/App/PreCompiled.h index 00c9111573..b0e980bfbd 100644 --- a/src/Mod/Sketcher/App/PreCompiled.h +++ b/src/Mod/Sketcher/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.cpp b/src/Mod/Sketcher/App/PropertyConstraintList.cpp index 604b8c052b..e0e5ddb850 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.cpp +++ b/src/Mod/Sketcher/App/PropertyConstraintList.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h index 8d6e59cea6..898aaf0980 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.h +++ b/src/Mod/Sketcher/App/PropertyConstraintList.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/Sketch.h b/src/Mod/Sketcher/App/Sketch.h index 0c70262834..5283149bac 100644 --- a/src/Mod/Sketcher/App/Sketch.h +++ b/src/Mod/Sketcher/App/Sketch.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 49459d4210..f7d8158f3e 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp index bdaabbc66a..0d051431ed 100644 --- a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/SketchObjectSF.cpp b/src/Mod/Sketcher/App/SketchObjectSF.cpp index a0adf0bc19..0568733ead 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.cpp +++ b/src/Mod/Sketcher/App/SketchObjectSF.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/SketchObjectSF.h b/src/Mod/Sketcher/App/SketchObjectSF.h index 9be4166398..b0c2ad92e2 100644 --- a/src/Mod/Sketcher/App/SketchObjectSF.h +++ b/src/Mod/Sketcher/App/SketchObjectSF.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2008 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp index 7ce718b22e..5a0301727d 100644 --- a/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchObjectSFPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/App/SketchPyImp.cpp b/src/Mod/Sketcher/App/SketchPyImp.cpp index 7b4ede8527..4c0188e2dd 100644 --- a/src/Mod/Sketcher/App/SketchPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchPyImp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2010 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp index 504289f463..1c51a371ab 100644 --- a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp +++ b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index 84c65b8024..1f3c960da7 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp index d174a34621..631d1470e6 100644 --- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp +++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2011 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 10e703c5d0..39fc1d4f44 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index e9e32f81fb..64203ee8c5 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp index 9b35cd7972..fc4e78987f 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel * + * Copyright (c) 2010 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index cd2deb9b25..843b4c431f 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/PreCompiled.cpp b/src/Mod/Sketcher/Gui/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/Sketcher/Gui/PreCompiled.cpp +++ b/src/Mod/Sketcher/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h index de7b683c75..de99416784 100644 --- a/src/Mod/Sketcher/Gui/PreCompiled.h +++ b/src/Mod/Sketcher/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp b/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp index f77dd3b8d6..0bb88d6681 100644 --- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp +++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel * + * Copyright (c) 2011 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h index 4865ee7bd0..cf74dd4dd7 100644 --- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h +++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel * + * Copyright (c) 2011 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp index 7dd294de21..abfa954a2b 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h index bcff040f91..8a9de4f7bc 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h index 04f8a81512..e21c3a1c2e 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp index 1c9c44c667..c67e8fbd32 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h index 8c5ba41a04..96673165e9 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherCreateCommands.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp index b0217ed73d..5d3a89967c 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h index 0e6a8a8021..f762f14c21 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp index ee29e724c5..3fe71497c8 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel * + * Copyright (c) 2011 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h index 591db25a83..86873c46a9 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2011 Jürgen Riegel * + * Copyright (c) 2011 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index e4a46b1e99..5fb4c61baf 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Spreadsheet/App/PreCompiled.cpp b/src/Mod/Spreadsheet/App/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Spreadsheet/App/PreCompiled.cpp +++ b/src/Mod/Spreadsheet/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Spreadsheet/App/PreCompiled.h b/src/Mod/Spreadsheet/App/PreCompiled.h index af4d260d86..fc3124c294 100644 --- a/src/Mod/Spreadsheet/App/PreCompiled.h +++ b/src/Mod/Spreadsheet/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * Copyright (c) Eivind Kvedalen (eivind@kvedalen.name) 2015 * * * * This file is part of the FreeCAD CAx development system. * diff --git a/src/Mod/Spreadsheet/Gui/Command.cpp b/src/Mod/Spreadsheet/Gui/Command.cpp index af64c5d11c..e04e26ac53 100644 --- a/src/Mod/Spreadsheet/Gui/Command.cpp +++ b/src/Mod/Spreadsheet/Gui/Command.cpp @@ -5,7 +5,7 @@ * published by the Free Software Foundation; either version 2 of the * * License, or (at your option) any later version. * * for detail see the LICENCE text file. * - * Jürgen Riegel 2002 * + * Jürgen Riegel 2002 * * Eivind Kvedalen 2015 * * * ***************************************************************************/ diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.cpp b/src/Mod/Spreadsheet/Gui/PreCompiled.cpp index 38b50fcba9..93ebe29987 100644 --- a/src/Mod/Spreadsheet/Gui/PreCompiled.cpp +++ b/src/Mod/Spreadsheet/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h index 26ace30bca..2e03aa94dd 100644 --- a/src/Mod/Spreadsheet/Gui/PreCompiled.h +++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * + * Copyright (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * * Copyright (c) Eivind Kvedalen (eivind@kvedalen.name) 2015 * * * * This file is part of the FreeCAD CAx development system. * diff --git a/src/Mod/Start/App/AppStart.cpp b/src/Mod/Start/App/AppStart.cpp index 6804689792..f882fce6c2 100644 --- a/src/Mod/Start/App/AppStart.cpp +++ b/src/Mod/Start/App/AppStart.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Start/App/AppStartPy.cpp b/src/Mod/Start/App/AppStartPy.cpp index 0c139b3670..ebc9b8c426 100644 --- a/src/Mod/Start/App/AppStartPy.cpp +++ b/src/Mod/Start/App/AppStartPy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Start/App/PreCompiled.cpp b/src/Mod/Start/App/PreCompiled.cpp index 25546658e6..b50be2c0bc 100644 --- a/src/Mod/Start/App/PreCompiled.cpp +++ b/src/Mod/Start/App/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Start/App/PreCompiled.h b/src/Mod/Start/App/PreCompiled.h index ca21c3197d..43ab0d31e8 100644 --- a/src/Mod/Start/App/PreCompiled.h +++ b/src/Mod/Start/App/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Start/App/StartConfiguration.h b/src/Mod/Start/App/StartConfiguration.h index e13e7d19a5..ec735227fa 100644 --- a/src/Mod/Start/App/StartConfiguration.h +++ b/src/Mod/Start/App/StartConfiguration.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Start/Gui/AppStartGui.cpp b/src/Mod/Start/Gui/AppStartGui.cpp index 54c3e308e7..8cf2b72516 100644 --- a/src/Mod/Start/Gui/AppStartGui.cpp +++ b/src/Mod/Start/Gui/AppStartGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Start/Gui/Command.cpp b/src/Mod/Start/Gui/Command.cpp index cec098a6ee..74f8954f4e 100644 --- a/src/Mod/Start/Gui/Command.cpp +++ b/src/Mod/Start/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2010 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Start/Gui/PreCompiled.cpp b/src/Mod/Start/Gui/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/Start/Gui/PreCompiled.cpp +++ b/src/Mod/Start/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Start/Gui/PreCompiled.h b/src/Mod/Start/Gui/PreCompiled.h index 87c3f030a4..dccaac3cfe 100644 --- a/src/Mod/Start/Gui/PreCompiled.h +++ b/src/Mod/Start/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp index 11131a717a..acf01207ef 100644 --- a/src/Mod/Web/Gui/AppWebGui.cpp +++ b/src/Mod/Web/Gui/AppWebGui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index 8962b2bf2f..3d08d012c0 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h index afb4de11b1..22a2992e13 100644 --- a/src/Mod/Web/Gui/BrowserView.h +++ b/src/Mod/Web/Gui/BrowserView.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2009 Jürgen Riegel * + * Copyright (c) 2009 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Web/Gui/Command.cpp b/src/Mod/Web/Gui/Command.cpp index bdb9217bd4..66086a87e6 100644 --- a/src/Mod/Web/Gui/Command.cpp +++ b/src/Mod/Web/Gui/Command.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Web/Gui/PreCompiled.cpp b/src/Mod/Web/Gui/PreCompiled.cpp index 3b2e513af1..46269e9671 100644 --- a/src/Mod/Web/Gui/PreCompiled.cpp +++ b/src/Mod/Web/Gui/PreCompiled.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Mod/Web/Gui/PreCompiled.h b/src/Mod/Web/Gui/PreCompiled.h index 7363dfe85a..6d2a4ee6df 100644 --- a/src/Mod/Web/Gui/PreCompiled.h +++ b/src/Mod/Web/Gui/PreCompiled.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * + * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/Tools/ImageTools/ImageConv/main.cpp b/src/Tools/ImageTools/ImageConv/main.cpp index e42794eb3b..7ce23857a6 100644 --- a/src/Tools/ImageTools/ImageConv/main.cpp +++ b/src/Tools/ImageTools/ImageConv/main.cpp @@ -68,7 +68,7 @@ int main( int argc, char **argv ) // convert all given/found image files to XPM and write the result into a text file else if (cCmdP.HasSwitch("-a") || cCmdP.HasSwitch("--append")) { - // search for input fíles + // search for input fíles if (cCmdP.GetArgumentCount("-i") > 0) { cICApp.SetUpdateBmpFactory(cCmdP.HasSwitch("-a") || cCmdP.HasSwitch("--update")); diff --git a/src/Tools/MakeNewBuildNbr.py b/src/Tools/MakeNewBuildNbr.py index 9c4285b523..fa38a583bb 100644 --- a/src/Tools/MakeNewBuildNbr.py +++ b/src/Tools/MakeNewBuildNbr.py @@ -1,10 +1,10 @@ # FreeCAD MakeNewBuildNbr script -# (c) 2002 Jürgen Riegel +# (c) 2002 Jürgen Riegel # # Increase the Build Number in Version.h #*************************************************************************** -#* (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * +#* (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * #* * #* This file is part of the FreeCAD CAx development system. * #* * diff --git a/src/Tools/generate.py b/src/Tools/generate.py index dab44db1e9..430321ee38 100644 --- a/src/Tools/generate.py +++ b/src/Tools/generate.py @@ -1,6 +1,6 @@ #! python # -*- coding: utf-8 -*- -# (c) 2006 Jürgen Riegel GPL +# (c) 2006 Jürgen Riegel GPL Usage = """generate - generates a FreeCAD Module out of an XML model diff --git a/src/Tools/thumbs/ThumbnailProvider/FCConfig.h b/src/Tools/thumbs/ThumbnailProvider/FCConfig.h index c86499d099..f01f17eb11 100644 --- a/src/Tools/thumbs/ThumbnailProvider/FCConfig.h +++ b/src/Tools/thumbs/ThumbnailProvider/FCConfig.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004 Jürgen Riegel * + * Copyright (c) 2004 Jürgen Riegel * * * * This file is part of the FreeCAD CAx development system. * * * diff --git a/src/zipios++/backbuffer.h b/src/zipios++/backbuffer.h index d2fab355a6..3c6ebf1e66 100644 --- a/src/zipios++/backbuffer.h +++ b/src/zipios++/backbuffer.h @@ -100,7 +100,7 @@ int BackBuffer::readChunk( int &read_pointer ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/basicentry.cpp b/src/zipios++/basicentry.cpp index fe65c1a292..2ebf53dcd5 100644 --- a/src/zipios++/basicentry.cpp +++ b/src/zipios++/basicentry.cpp @@ -145,7 +145,7 @@ BasicEntry::~BasicEntry() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/basicentry.h b/src/zipios++/basicentry.h index 9198f96e9e..264d4f98b6 100644 --- a/src/zipios++/basicentry.h +++ b/src/zipios++/basicentry.h @@ -70,7 +70,7 @@ protected: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/collcoll.cpp b/src/zipios++/collcoll.cpp index ec1b39c70d..c193d82d48 100644 --- a/src/zipios++/collcoll.cpp +++ b/src/zipios++/collcoll.cpp @@ -144,7 +144,7 @@ void CollectionCollection::getEntry( const string &name, /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/collcoll.h b/src/zipios++/collcoll.h index a1d2703046..b1992137bd 100644 --- a/src/zipios++/collcoll.h +++ b/src/zipios++/collcoll.h @@ -157,7 +157,7 @@ CollectionCollection::operator= ( const CollectionCollection &src ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/deflateoutputstreambuf.cpp b/src/zipios++/deflateoutputstreambuf.cpp index 07856b9eaf..2def7a629e 100644 --- a/src/zipios++/deflateoutputstreambuf.cpp +++ b/src/zipios++/deflateoutputstreambuf.cpp @@ -206,7 +206,7 @@ void DeflateOutputStreambuf::endDeflation() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/deflateoutputstreambuf.h b/src/zipios++/deflateoutputstreambuf.h index cfd105ea9a..7a7a2d821f 100644 --- a/src/zipios++/deflateoutputstreambuf.h +++ b/src/zipios++/deflateoutputstreambuf.h @@ -91,7 +91,7 @@ protected: // FIXME: reconsider design? /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/dircoll.cpp b/src/zipios++/dircoll.cpp index f7114aaac8..f669d79722 100644 --- a/src/zipios++/dircoll.cpp +++ b/src/zipios++/dircoll.cpp @@ -160,7 +160,7 @@ void DirectoryCollection::load( bool recursive, const FilePath &subdir ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/dircoll.h b/src/zipios++/dircoll.h index 528521ad52..396390dc57 100644 --- a/src/zipios++/dircoll.h +++ b/src/zipios++/dircoll.h @@ -76,7 +76,7 @@ protected: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/fcoll.cpp b/src/zipios++/fcoll.cpp index 325e29ed6f..3ac9cd30a6 100644 --- a/src/zipios++/fcoll.cpp +++ b/src/zipios++/fcoll.cpp @@ -96,7 +96,7 @@ FileCollection::~FileCollection() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/fcoll.h b/src/zipios++/fcoll.h index aef7e2ed2d..cd45d6d5ab 100644 --- a/src/zipios++/fcoll.h +++ b/src/zipios++/fcoll.h @@ -144,7 +144,7 @@ inline ostream & operator<< (ostream &os, const FileCollection& collection) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/fcollexceptions.cpp b/src/zipios++/fcollexceptions.cpp index 6bda9adffb..c22e03dc82 100644 --- a/src/zipios++/fcollexceptions.cpp +++ b/src/zipios++/fcollexceptions.cpp @@ -126,7 +126,7 @@ Exception::~Exception() throw () {} /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/fcollexceptions.h b/src/zipios++/fcollexceptions.h index 7cd9e0bf2e..df8038258d 100644 --- a/src/zipios++/fcollexceptions.h +++ b/src/zipios++/fcollexceptions.h @@ -82,7 +82,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/fileentry.cpp b/src/zipios++/fileentry.cpp index f126ccc240..2eaac9e23c 100644 --- a/src/zipios++/fileentry.cpp +++ b/src/zipios++/fileentry.cpp @@ -21,7 +21,7 @@ ostream &operator<< ( ostream &os, const FileEntry &entry ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/fileentry.h b/src/zipios++/fileentry.h index e12d6e3f32..08e3582dc3 100644 --- a/src/zipios++/fileentry.h +++ b/src/zipios++/fileentry.h @@ -222,7 +222,7 @@ inline ostream &operator<< ( ostream &os, const ConstEntryPointer &entry ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/filepath.cpp b/src/zipios++/filepath.cpp index b488f7d268..6e56e54cdd 100644 --- a/src/zipios++/filepath.cpp +++ b/src/zipios++/filepath.cpp @@ -65,7 +65,7 @@ void FilePath::check() const { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/filepath.h b/src/zipios++/filepath.h index c70cf730b2..cfaa339b46 100644 --- a/src/zipios++/filepath.h +++ b/src/zipios++/filepath.h @@ -184,7 +184,7 @@ bool FilePath::isFifo() const { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/filterinputstreambuf.cpp b/src/zipios++/filterinputstreambuf.cpp index cf0e8871ff..4137973a1e 100644 --- a/src/zipios++/filterinputstreambuf.cpp +++ b/src/zipios++/filterinputstreambuf.cpp @@ -29,7 +29,7 @@ FilterInputStreambuf::~FilterInputStreambuf() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/filterinputstreambuf.h b/src/zipios++/filterinputstreambuf.h index ebfe3f2e45..5bd05fa4a4 100644 --- a/src/zipios++/filterinputstreambuf.h +++ b/src/zipios++/filterinputstreambuf.h @@ -48,7 +48,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/filteroutputstreambuf.cpp b/src/zipios++/filteroutputstreambuf.cpp index 217245ba76..ffb6e04a52 100644 --- a/src/zipios++/filteroutputstreambuf.cpp +++ b/src/zipios++/filteroutputstreambuf.cpp @@ -29,7 +29,7 @@ FilterOutputStreambuf::~FilterOutputStreambuf() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/filteroutputstreambuf.h b/src/zipios++/filteroutputstreambuf.h index c4a7aefddc..4e227ea047 100644 --- a/src/zipios++/filteroutputstreambuf.h +++ b/src/zipios++/filteroutputstreambuf.h @@ -40,7 +40,7 @@ protected: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/gzipoutputstream.cpp b/src/zipios++/gzipoutputstream.cpp index a7bc55668f..15ed013e27 100644 --- a/src/zipios++/gzipoutputstream.cpp +++ b/src/zipios++/gzipoutputstream.cpp @@ -62,7 +62,7 @@ GZIPOutputStream::~GZIPOutputStream() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/gzipoutputstream.h b/src/zipios++/gzipoutputstream.h index fddf9e27e5..d7e07f73e4 100644 --- a/src/zipios++/gzipoutputstream.h +++ b/src/zipios++/gzipoutputstream.h @@ -54,7 +54,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/gzipoutputstreambuf.cpp b/src/zipios++/gzipoutputstreambuf.cpp index 54488590f7..1e7f3bc76a 100644 --- a/src/zipios++/gzipoutputstreambuf.cpp +++ b/src/zipios++/gzipoutputstreambuf.cpp @@ -109,7 +109,7 @@ void GZIPOutputStreambuf::writeInt(uint32 i) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/gzipoutputstreambuf.h b/src/zipios++/gzipoutputstreambuf.h index 697c2228de..066bd15da1 100644 --- a/src/zipios++/gzipoutputstreambuf.h +++ b/src/zipios++/gzipoutputstreambuf.h @@ -61,7 +61,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/inflateinputstreambuf.cpp b/src/zipios++/inflateinputstreambuf.cpp index be3d2589dd..31fa9420ea 100644 --- a/src/zipios++/inflateinputstreambuf.cpp +++ b/src/zipios++/inflateinputstreambuf.cpp @@ -161,7 +161,7 @@ bool InflateInputStreambuf::reset( int stream_position ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/inflateinputstreambuf.h b/src/zipios++/inflateinputstreambuf.h index 168b0ead36..bca8a94a38 100644 --- a/src/zipios++/inflateinputstreambuf.h +++ b/src/zipios++/inflateinputstreambuf.h @@ -71,7 +71,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/meta-iostreams.h b/src/zipios++/meta-iostreams.h index efdf7388f1..53ac302c28 100644 --- a/src/zipios++/meta-iostreams.h +++ b/src/zipios++/meta-iostreams.h @@ -18,7 +18,7 @@ /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/outputstringstream.h b/src/zipios++/outputstringstream.h index e14f26434c..69be33597f 100644 --- a/src/zipios++/outputstringstream.h +++ b/src/zipios++/outputstringstream.h @@ -51,7 +51,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/simplesmartptr.h b/src/zipios++/simplesmartptr.h index 1af4c75499..2cf8311636 100644 --- a/src/zipios++/simplesmartptr.h +++ b/src/zipios++/simplesmartptr.h @@ -155,7 +155,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/virtualseeker.h b/src/zipios++/virtualseeker.h index b26f662750..8d4bd5b194 100644 --- a/src/zipios++/virtualseeker.h +++ b/src/zipios++/virtualseeker.h @@ -87,7 +87,7 @@ int VirtualSeeker::vtellg( istream &is ) const { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipfile.cpp b/src/zipios++/zipfile.cpp index fd7e19dd5e..90a281c358 100644 --- a/src/zipios++/zipfile.cpp +++ b/src/zipios++/zipfile.cpp @@ -190,7 +190,7 @@ void ZipFile::setError ( string error_str ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipfile.h b/src/zipios++/zipfile.h index 5dcc05a394..e7c4723f3d 100644 --- a/src/zipios++/zipfile.h +++ b/src/zipios++/zipfile.h @@ -86,7 +86,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/ziphead.cpp b/src/zipios++/ziphead.cpp index 5ab39ea0a7..6267d5f121 100644 --- a/src/zipios++/ziphead.cpp +++ b/src/zipios++/ziphead.cpp @@ -306,7 +306,7 @@ bool EndOfCentralDirectory::checkSignature ( unsigned char *buf ) const { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/ziphead.h b/src/zipios++/ziphead.h index 7c41cbf297..e76397e12a 100644 --- a/src/zipios++/ziphead.h +++ b/src/zipios++/ziphead.h @@ -224,7 +224,7 @@ inline bool operator!= ( const ZipCDirEntry &ze, const ZipLocalEntry &zlh ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipheadio.cpp b/src/zipios++/zipheadio.cpp index b5bb03e943..6c9cef5f11 100644 --- a/src/zipios++/zipheadio.cpp +++ b/src/zipios++/zipheadio.cpp @@ -177,7 +177,7 @@ std::ostream &operator<< ( std::ostream &os, const EndOfCentralDirectory &eocd ) /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipheadio.h b/src/zipios++/zipheadio.h index 4a1cd17dd3..b0425d3bb2 100644 --- a/src/zipios++/zipheadio.h +++ b/src/zipios++/zipheadio.h @@ -177,7 +177,7 @@ ostream &operator<< ( ostream &os, const EndOfCentralDirectory &eocd ) ; /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipinputstream.cpp b/src/zipios++/zipinputstream.cpp index 928102d0cd..b2363345cb 100644 --- a/src/zipios++/zipinputstream.cpp +++ b/src/zipios++/zipinputstream.cpp @@ -64,7 +64,7 @@ ZipInputStream::~ZipInputStream() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipinputstream.h b/src/zipios++/zipinputstream.h index 548472cb9a..54384ebcfb 100644 --- a/src/zipios++/zipinputstream.h +++ b/src/zipios++/zipinputstream.h @@ -74,7 +74,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipinputstreambuf.cpp b/src/zipios++/zipinputstreambuf.cpp index dc90671346..7294a4505f 100644 --- a/src/zipios++/zipinputstreambuf.cpp +++ b/src/zipios++/zipinputstreambuf.cpp @@ -123,7 +123,7 @@ int ZipInputStreambuf::underflow() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipinputstreambuf.h b/src/zipios++/zipinputstreambuf.h index dd527e8a90..dddc8ba822 100644 --- a/src/zipios++/zipinputstreambuf.h +++ b/src/zipios++/zipinputstreambuf.h @@ -71,7 +71,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipios-config.h b/src/zipios++/zipios-config.h index 03c57466d4..32743dd98d 100644 --- a/src/zipios++/zipios-config.h +++ b/src/zipios++/zipios-config.h @@ -61,7 +61,7 @@ /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 1. Thomas Søndergaard 2. Kevin Shea + Copyright (C) 2000 1. Thomas Søndergaard 2. Kevin Shea Written by Kevin Shea This library is free software; you can redistribute it and/or diff --git a/src/zipios++/zipios_common.h b/src/zipios++/zipios_common.h index f44831ced3..8c3b025409 100644 --- a/src/zipios++/zipios_common.h +++ b/src/zipios++/zipios_common.h @@ -34,7 +34,7 @@ inline const T& min( const T& a, const T& b ) { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipios_defs.h b/src/zipios++/zipios_defs.h index 2473452997..558d0e126d 100644 --- a/src/zipios++/zipios_defs.h +++ b/src/zipios++/zipios_defs.h @@ -18,7 +18,7 @@ typedef uint32_t uint32 ; /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipoutputstream.cpp b/src/zipios++/zipoutputstream.cpp index 678aa9331c..efc15f2670 100644 --- a/src/zipios++/zipoutputstream.cpp +++ b/src/zipios++/zipoutputstream.cpp @@ -85,7 +85,7 @@ ZipOutputStream::~ZipOutputStream() { /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipoutputstream.h b/src/zipios++/zipoutputstream.h index 80e1205bc0..23f3fbca86 100644 --- a/src/zipios++/zipoutputstream.h +++ b/src/zipios++/zipoutputstream.h @@ -82,7 +82,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipoutputstreambuf.cpp b/src/zipios++/zipoutputstreambuf.cpp index b8e8e5b777..6ab0089ae2 100644 --- a/src/zipios++/zipoutputstreambuf.cpp +++ b/src/zipios++/zipoutputstreambuf.cpp @@ -187,7 +187,7 @@ void ZipOutputStreambuf::writeCentralDirectory( const vector< ZipCDirEntry > &en /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/src/zipios++/zipoutputstreambuf.h b/src/zipios++/zipoutputstreambuf.h index 0aae4268bb..ed609c5b55 100644 --- a/src/zipios++/zipoutputstreambuf.h +++ b/src/zipios++/zipoutputstreambuf.h @@ -98,7 +98,7 @@ private: /* Zipios++ - a small C++ library that provides easy access to .zip files. - Copyright (C) 2000 Thomas Søndergaard + Copyright (C) 2000 Thomas Søndergaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public