[freecad] 02/09: Merge tag 'upstream/0.13.2580-dfsg'
Anton Gladky
gladk at alioth.debian.org
Fri Sep 27 19:51:30 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository freecad.
commit 814633e9f17767c1daea5d7646536dc757321166
Merge: 11e285a 40ddd86
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Fri Sep 27 19:45:57 2013 +0200
Merge tag 'upstream/0.13.2580-dfsg'
Upstream version 0.13.2580-dfsg
.gitattributes | 1 +
src/App/Annotation.cpp | 6 +-
src/App/Application.cpp | 6 +-
src/App/ComplexGeoData.h | 4 +-
src/App/Document.cpp | 36 +-
src/App/FeatureTest.cpp | 9 +
src/App/FeatureTest.h | 4 +
src/App/FreeCADInit.py | 4 +-
src/App/FreeCADTest.py | 10 +-
src/App/MeasureDistance.cpp | 6 +-
src/App/PropertyFile.h | 2 +-
src/App/PropertyGeo.cpp | 111 +-
src/App/PropertyGeo.h | 24 +-
src/App/PropertyLinks.cpp | 4 +-
src/App/PropertyStandard.cpp | 53 +-
src/App/PropertyStandard.h | 22 +-
src/App/PropertyUnits.cpp | 58 +-
src/App/PropertyUnits.h | 24 +
src/Base/Interpreter.cpp | 5 +-
src/Base/Matrix.cpp | 133 +-
src/Base/Matrix.h | 5 +
src/Base/Parser.bat | 4 +-
src/Base/Parser.sh | 2 +
src/Base/Persistence.h | 8 +-
src/Base/Quantity.cpp | 16 +
src/Base/Quantity.h | 11 +
src/Base/QuantityLexer.c | 1810 ++++++++++++--------
src/Base/QuantityParser.c | 1036 ++++++-----
src/Base/QuantityParser.l | 94 +-
src/Base/QuantityParser.y | 51 +-
src/Base/QuantityPy.xml | 43 +-
src/Base/QuantityPyImp.cpp | 44 +-
src/Base/Reader.cpp | 23 +-
src/Base/Reader.h | 16 +
src/Base/Tools2D.cpp | 48 +-
src/Base/Tools2D.h | 64 +-
src/Base/Unit.cpp | 142 +-
src/Base/Unit.h | 21 +
src/Base/UnitsApi.cpp | 10 +
src/Base/UnitsApi.h | 3 +
src/Base/UnitsApiPy.cpp | 27 +
src/Base/UnitsSchema.h | 6 +
src/Base/UnitsSchemaImperial1.cpp | 23 +
src/Base/UnitsSchemaImperial1.h | 3 +
src/Base/UnitsSchemaInternal.cpp | 18 +
src/Base/UnitsSchemaInternal.h | 3 +
src/Base/UnitsSchemaMKS.cpp | 18 +
src/Base/UnitsSchemaMKS.h | 3 +
src/Base/Writer.cpp | 12 +-
src/Base/Writer.h | 3 +
src/Build/Version.h | 6 +-
src/Gui/CMakeLists.txt | 3 +
src/Gui/CommandView.cpp | 2 +-
src/Gui/DlgDisplayPropertiesImp.cpp | 186 +-
src/Gui/DlgSettingsUnitsImp.cpp | 2 +
src/Gui/Document.cpp | 7 +-
src/Gui/FreeCADGuiInit.py | 4 +-
src/{Base/Quantity.h => Gui/InputField.cpp} | 140 +-
src/{Base/UnitsSchemaMKS.h => Gui/InputField.h} | 45 +-
src/Gui/InputVector.cpp | 56 +-
src/Gui/InputVector.h | 86 +-
src/Gui/MergeDocuments.cpp | 2 +-
src/Gui/Placement.cpp | 32 +-
src/Gui/Placement.h | 2 +-
src/Gui/PythonDebugger.cpp | 5 +-
src/Gui/SoFCDB.cpp | 1 -
src/Gui/TouchpadNavigationStyle.cpp | 8 +
src/Gui/Transform.cpp | 8 +-
src/Gui/Transform.h | 2 +-
src/Gui/ViewProviderAnnotation.cpp | 6 +-
src/Gui/ViewProviderMeasureDistance.cpp | 8 +-
src/Gui/propertyeditor/PropertyItem.cpp | 201 +--
src/Gui/propertyeditor/PropertyItem.h | 41 +-
src/Gui/propertyeditor/PropertyModel.cpp | 1 +
src/Gui/resource.cpp | 4 +-
src/Mod/Arch/ArchSpace.py | 5 +-
src/Mod/Arch/ArchWindow.py | 1 -
src/Mod/Arch/InitGui.py | 3 +-
src/Mod/Arch/ifcReader.py | 2 +-
src/Mod/Arch/importIFC.py | 7 +-
src/Mod/Assembly/InitGui.py | 4 +-
src/Mod/Cam/App/AppCamPy.cpp | 4 +-
src/Mod/Cam/InitGui.py | 4 +-
src/Mod/Complete/InitGui.py | 4 +-
src/Mod/Draft/Draft.py | 7 +-
src/Mod/Draft/DraftSnap.py | 57 +-
src/Mod/Draft/DraftTools.py | 11 +
src/Mod/Draft/Draft_rc.py | 710 +++++---
src/Mod/Draft/InitGui.py | 3 +-
src/Mod/Draft/Resources/Draft.qrc | 1 +
src/Mod/Draft/Resources/icons/Snap_Dimensions.svg | 320 ++++
src/Mod/Draft/Resources/ui/userprefs-import.ui | 25 +-
src/Mod/Draft/importDXF.py | 39 +-
src/Mod/Drawing/App/AppDrawingPy.cpp | 8 +-
src/Mod/Drawing/App/FeatureProjection.cpp | 4 +-
src/Mod/Drawing/App/FeatureViewPart.cpp | 8 +-
src/Mod/Drawing/App/ProjectionAlgos.cpp | 2 +-
src/Mod/Drawing/App/ProjectionAlgos.h | 4 +-
src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp | 2 +-
src/Mod/Drawing/InitGui.py | 4 +-
src/Mod/Fem/App/FemConstraint.cpp | 40 +-
src/Mod/Fem/App/FemConstraint.h | 10 +-
src/Mod/Fem/App/FemConstraintBearing.cpp | 12 +-
src/Mod/Fem/App/FemConstraintFixed.cpp | 12 +-
src/Mod/Fem/App/FemConstraintForce.cpp | 14 +-
src/Mod/Fem/App/FemConstraintForce.h | 2 +-
src/Mod/Fem/App/FemConstraintGear.cpp | 6 +-
src/Mod/Fem/App/FemConstraintGear.h | 2 +-
src/Mod/Fem/App/FemMesh.cpp | 2 +-
src/Mod/Fem/App/FemMesh.h | 2 +-
src/Mod/Fem/App/FemMeshProperty.cpp | 2 +-
src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp | 2 +-
src/Mod/Fem/Gui/TaskFemConstraintForce.cpp | 2 +-
src/Mod/Fem/Gui/TaskFemConstraintGear.cpp | 6 +-
src/Mod/Fem/Gui/TaskFemConstraintPulley.cpp | 6 +-
src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp | 5 +-
.../Fem/Gui/ViewProviderFemConstraintBearing.cpp | 12 +-
src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp | 8 +-
src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp | 16 +-
src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp | 36 +-
.../Fem/Gui/ViewProviderFemConstraintPulley.cpp | 44 +-
src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 30 +-
src/Mod/Fem/Init.py | 4 +-
src/Mod/Fem/InitGui.py | 4 +-
src/Mod/Idf/Init.py | 4 +-
src/Mod/Image/App/CMakeLists.txt | 1 +
src/Mod/Image/InitGui.py | 6 +-
src/Mod/Import/InitGui.py | 4 +-
src/Mod/Inspection/App/AppInspection.cpp | 5 +-
src/Mod/Inspection/App/InspectionFeature.cpp | 155 +-
src/Mod/Inspection/App/InspectionFeature.h | 52 +-
src/Mod/Inspection/Gui/ViewProviderInspection.cpp | 24 +-
src/Mod/Inspection/InitGui.py | 10 +-
src/Mod/JtReader/InitGui.py | 4 +-
src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp | 4 +-
src/Mod/Mesh/App/Mesh.cpp | 18 +-
src/Mod/Mesh/App/Mesh.h | 4 +-
src/Mod/Mesh/App/MeshProperties.cpp | 154 +-
src/Mod/Mesh/App/MeshProperties.h | 44 +-
src/Mod/Mesh/InitGui.py | 4 +-
src/Mod/MeshPart/InitGui.py | 4 +-
src/Mod/OpenSCAD/OpenSCADFeatures.py | 2 +-
src/Mod/OpenSCAD/exportCSG.py | 2 +-
src/Mod/OpenSCAD/importCSG.py | 8 +-
src/Mod/OpenSCAD/tokrules.py | 2 +-
src/Mod/Part/App/AppPart.cpp | 1 +
src/Mod/Part/App/CMakeLists.txt | 1 +
src/Mod/Part/App/CrossSection.cpp | 10 +-
src/Mod/Part/App/FeatureExtrusion.cpp | 8 +-
src/Mod/Part/App/FeatureMirroring.cpp | 8 +-
src/Mod/Part/App/FeaturePartBox.cpp | 4 +-
src/Mod/Part/App/FeaturePartPolygon.cpp | 6 +-
src/Mod/Part/App/FeatureRevolution.cpp | 12 +-
src/Mod/Part/App/ParabolaPyImp.cpp | 2 +-
src/Mod/Part/App/PrimitiveFeature.cpp | 196 ++-
src/Mod/Part/App/PrimitiveFeature.h | 25 +
src/Mod/Part/App/PropertyTopoShape.cpp | 4 +-
src/Mod/Part/App/TopoShapeFacePyImp.cpp | 56 +-
src/Mod/Part/App/TopoShapeVertexPyImp.cpp | 14 +-
src/Mod/Part/App/TopoShapeWirePyImp.cpp | 4 +-
src/Mod/Part/App/modelRefine.h | 2 +-
src/Mod/Part/Gui/AppPartGui.cpp | 2 +
src/Mod/Part/Gui/CMakeLists.txt | 2 +
src/Mod/Part/Gui/CommandSimple.cpp | 6 +-
src/Mod/Part/Gui/DlgPrimitives.cpp | 34 +-
src/Mod/Part/Gui/DlgPrimitives.ui | 95 +
src/Mod/Part/Gui/DlgRevolution.cpp | 8 +-
src/Mod/Part/Gui/DlgRevolution.h | 2 +-
src/Mod/Part/Gui/DlgSettingsGeneral.cpp | 6 +-
src/Mod/Part/Gui/DlgSettingsGeneral.ui | 23 +-
src/Mod/Part/Gui/TaskOffset.cpp | 4 +-
src/Mod/Part/Gui/TaskThickness.cpp | 4 +-
src/Mod/Part/Gui/ViewProvider.cpp | 48 +-
src/Mod/Part/Gui/ViewProviderExt.cpp | 4 +-
src/Mod/Part/Gui/ViewProviderMirror.cpp | 7 +-
.../Part/Gui/ViewProviderPrism.cpp} | 128 +-
.../Part/Gui/ViewProviderPrism.h} | 103 +-
src/Mod/Part/InitGui.py | 4 +-
src/Mod/PartDesign/App/CMakeLists.txt | 1 +
src/Mod/PartDesign/App/FeatureChamfer.cpp | 8 +-
src/Mod/PartDesign/App/FeatureDraft.cpp | 6 +-
src/Mod/PartDesign/App/FeatureFillet.cpp | 8 +-
src/Mod/PartDesign/App/FeatureGroove.cpp | 24 +-
src/Mod/PartDesign/App/FeatureLinearPattern.cpp | 2 +-
src/Mod/PartDesign/App/FeaturePad.cpp | 2 +
src/Mod/PartDesign/App/FeaturePocket.cpp | 6 +-
src/Mod/PartDesign/App/FeaturePolarPattern.cpp | 4 +-
src/Mod/PartDesign/App/FeatureRevolution.cpp | 24 +-
src/Mod/PartDesign/App/FeatureSketchBased.cpp | 16 +
src/Mod/PartDesign/App/FeatureSketchBased.h | 1 +
src/Mod/PartDesign/App/FeatureTransformed.cpp | 18 +
src/Mod/PartDesign/App/FeatureTransformed.h | 1 +
src/Mod/PartDesign/Gui/TaskChamferParameters.cpp | 2 +-
src/Mod/PartDesign/Gui/TaskDraftParameters.cpp | 2 +-
src/Mod/PartDesign/Gui/TaskFilletParameters.cpp | 2 +-
src/Mod/PartDesign/Gui/TaskGrooveParameters.cpp | 4 +-
src/Mod/PartDesign/Gui/TaskPadParameters.cpp | 12 +-
src/Mod/PartDesign/Gui/TaskPocketParameters.cpp | 10 +-
.../PartDesign/Gui/TaskRevolutionParameters.cpp | 4 +-
src/Mod/PartDesign/InitGui.py | 4 +-
src/Mod/Plot/InitGui.py | 17 +-
src/Mod/Points/App/Points.cpp | 22 +-
src/Mod/Points/App/Points.h | 31 +-
src/Mod/Points/App/PointsGrid.cpp | 2 +-
src/Mod/Points/App/PointsGrid.h | 2 +-
src/Mod/Points/App/Properties.cpp | 299 +++-
src/Mod/Points/App/Properties.h | 90 +-
src/Mod/Points/Gui/ViewProvider.cpp | 8 +-
src/Mod/Points/InitGui.py | 6 +-
src/Mod/Raytracing/App/CMakeLists.txt | 1 +
src/Mod/Raytracing/App/PovTools.cpp | 8 +-
src/Mod/Raytracing/App/RayProject.cpp | 28 +-
src/Mod/Raytracing/Gui/Command.cpp | 2 +-
src/Mod/Raytracing/Gui/DlgSettingsRay.ui | 2 +-
src/Mod/Raytracing/Init.py | 2 +-
src/Mod/Raytracing/InitGui.py | 4 +-
src/Mod/Raytracing/Templates/ProjectStd.pov | 8 +
src/Mod/Raytracing/Templates/RadiosityNormal.pov | 41 +
src/Mod/ReverseEngineering/App/ApproxSurface.cpp | 134 +-
src/Mod/ReverseEngineering/App/ApproxSurface.h | 38 +-
src/Mod/ReverseEngineering/InitGui.py | 4 +-
src/Mod/Robot/Init.py | 2 +-
src/Mod/Robot/InitGui.py | 8 +-
src/Mod/Sandbox/InitGui.py | 6 +-
src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 80 +-
src/Mod/Sketcher/Gui/DrawSketchHandler.cpp | 10 +-
src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 14 +
src/Mod/Sketcher/InitGui.py | 4 +-
src/Mod/Start/InitGui.py | 4 +-
src/Mod/Test/InitGui.py | 4 +-
src/Mod/Web/InitGui.py | 4 +-
src/Tools/_TEMPLATE_/Init.py | 26 +-
src/Tools/_TEMPLATE_/InitGui.py | 32 +-
src/Tools/fcbt/CreateModule.py | 4 +-
src/Tools/fcbt/NextBuildNumber.py | 10 +-
src/WindowsInstaller/Bitmaps/BackgroundBitmap.bmp | Bin 631890 -> 631906 bytes
src/WindowsInstaller/FreeCAD.wxs | 5 +-
src/WindowsInstaller/FreeCADData.wxs | 9 +
src/WindowsInstaller/ModImport.wxi | 1 +
src/WindowsInstaller/ModShip.wxi | 34 +-
240 files changed, 5949 insertions(+), 3027 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freecad.git
More information about the debian-science-commits
mailing list