[freecad] 02/05: Merge tag 'upstream/0.13.2935-dfsg'
Anton Gladky
gladk at moszumanska.debian.org
Wed Jan 1 22:23:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository freecad.
commit b588926cbe5679a546da5ce2e3e52bf5092215be
Merge: 824153f 3047a6b
Author: Anton Gladky <gladk at debian.org>
Date: Wed Jan 1 20:23:59 2014 +0100
Merge tag 'upstream/0.13.2935-dfsg'
Upstream version 0.13.2935-dfsg
CMakeLists.txt | 78 +-
cMake/UseLibPack9x.cmake | 439 +++++
data/examples/CMakeLists.txt | 66 +
src/App/Application.cpp | 3 -
src/App/Document.cpp | 23 +-
src/App/DynamicProperty.cpp | 12 +-
src/App/FreeCADInit.py | 64 +-
src/App/PropertyContainer.cpp | 12 +-
src/App/PropertyUnits.cpp | 2 +-
src/Base/CMakeLists.txt | 2 -
src/Base/Parser.sh | 4 +-
src/Base/Persistence.h | 2 +-
src/Base/Quantity.cpp | 63 +-
src/Base/Quantity.h | 46 +-
src/Base/QuantityLexer.c | 551 +++---
src/Base/QuantityParser.l | 60 +-
src/Base/QuantityPy.xml | 27 +-
src/Base/QuantityPyImp.cpp | 465 +++--
src/Base/Reader.cpp | 5 +
src/Base/Reader.h | 1 +
src/Base/Unit.cpp | 35 +-
src/Base/Unit.h | 18 +-
src/Base/UnitPy.xml | 39 +-
src/Base/UnitPyImp.cpp | 107 +-
src/Base/UnitsApi.cpp | 241 +--
src/Base/UnitsApi.h | 72 +-
src/Base/UnitsApi.l | 101 -
src/Base/UnitsApi.tab.c | 1922 ------------------
src/Base/UnitsApi.y | 59 -
src/Base/UnitsApiPy.cpp | 147 +-
src/Base/UnitsSchema.h | 48 +-
src/Base/UnitsSchemaImperial1.cpp | 123 +-
src/Base/UnitsSchemaImperial1.h | 8 +-
src/Base/UnitsSchemaInternal.cpp | 105 +-
src/Base/UnitsSchemaInternal.h | 7 +-
src/Base/UnitsSchemaMKS.cpp | 100 +-
src/Base/UnitsSchemaMKS.h | 6 +-
src/Base/Writer.h | 6 +-
src/Base/lex.UnitsApi.c | 2066 --------------------
src/Build/Version.h | 6 +-
src/FCConfig.h | 6 +
src/Gui/BitmapFactory.cpp | 19 +-
src/Gui/CallTips.cpp | 10 +-
src/Gui/CombiView.cpp | 4 +-
src/Gui/CommandStd.cpp | 4 +-
src/Gui/CommandView.cpp | 58 +
src/Gui/DlgSettingsUnits.ui | 2 +-
src/Gui/DlgSettingsUnitsImp.cpp | 16 +-
src/Gui/DlgUnitsCalculator.ui | 2 +-
src/Gui/DlgUnitsCalculatorImp.cpp | 4 +-
src/Gui/Document.cpp | 24 +-
src/Gui/FileDialog.cpp | 17 +-
src/Gui/Icons/ClassBrowser/const_member.svg | 117 ++
src/Gui/Icons/ClassBrowser/member.svg | 86 +
src/Gui/Icons/ClassBrowser/method.svg | 95 +
src/Gui/Icons/ClassBrowser/property.svg | 240 +++
src/Gui/Icons/ClassBrowser/type_class.svg | 191 ++
src/Gui/Icons/ClassBrowser/type_enum.svg | 174 ++
src/Gui/Icons/ClassBrowser/type_module.svg | 222 +++
src/Gui/Icons/Makefile.am | 7 +
src/Gui/Icons/Part_Measure_Clear_All.svg | 583 ++++++
src/Gui/Icons/Part_Measure_Toggle_All.svg | 461 +++++
src/Gui/Icons/resource.qrc | 9 +
src/Gui/InputField.cpp | 184 +-
src/Gui/InputField.h | 25 +-
src/Gui/MergeDocuments.cpp | 4 +
src/Gui/Selection.cpp | 3 +-
src/Gui/Tree.cpp | 4 +
src/Gui/View3DInventor.cpp | 34 +-
src/Gui/View3DInventorViewer.cpp | 77 +-
src/Gui/View3DInventorViewer.h | 45 +-
src/Gui/ViewProviderMaterialObject.h | 3 +
src/Gui/WidgetFactory.cpp | 9 +
src/Gui/Workbench.cpp | 11 +-
src/Gui/propertyeditor/PropertyItem.cpp | 34 +-
src/Mod/Arch/Arch.py | 1 +
src/Mod/Arch/ArchCommands.py | 98 +
src/Mod/Arch/ArchComponent.py | 27 +-
src/Mod/Arch/ArchFrame.py | 152 ++
src/Mod/Arch/ArchRebar.py | 4 +-
src/Mod/Arch/ArchSite.py | 6 +
src/Mod/Arch/ArchStructure.py | 199 +-
src/Mod/Arch/ArchWall.py | 197 +-
src/Mod/Arch/ArchWindow.py | 25 +-
src/Mod/Arch/Arch_rc.py | 693 +++++--
src/Mod/Arch/CMakeLists.txt | 2 +
src/Mod/Arch/InitGui.py | 3 +-
src/Mod/Arch/Resources/Arch.qrc | 2 +
src/Mod/Arch/Resources/icons/Arch_Frame.svg | 1099 +++++++++++
src/Mod/Arch/Resources/icons/Arch_Frame_Tree.svg | 750 +++++++
src/Mod/Arch/Resources/ui/archprefs-import.ui | 47 +
src/Mod/Arch/ifcWriter.py | 625 ++++++
src/Mod/Arch/importIFC.py | 578 ++++--
src/Mod/CMakeLists.txt | 262 ++-
src/Mod/Draft/Draft.py | 67 +-
src/Mod/Draft/DraftGeomUtils.py | 2 +
src/Mod/Draft/DraftGui.py | 6 +-
src/Mod/Draft/DraftSnap.py | 10 +-
src/Mod/Draft/DraftTools.py | 18 +-
src/Mod/Draft/DraftVecUtils.py | 274 +--
src/Mod/Draft/Draft_rc.py | 710 +++----
src/Mod/Draft/Resources/icons/Draft_Array.svg | 143 +-
src/Mod/Draft/Resources/ui/userprefs-import.ui | 2 +-
src/Mod/Draft/importAirfoilDAT.py | 69 +-
src/Mod/Draft/importDXF.py | 7 +-
src/Mod/Drawing/App/FeatureViewPart.cpp | 5 +-
src/Mod/Drawing/App/FeatureViewPart.h | 1 +
src/Mod/Drawing/App/ProjectionAlgos.cpp | 13 +-
src/Mod/Drawing/App/ProjectionAlgos.h | 2 +-
src/Mod/Drawing/Gui/Command.cpp | 33 +-
src/Mod/Drawing/Gui/TaskOrthoViews.cpp | 429 +++-
src/Mod/Drawing/Gui/TaskOrthoViews.h | 31 +-
src/Mod/Drawing/Gui/TaskOrthoViews.ui | 401 ++--
src/Mod/Fem/App/CMakeLists.txt | 13 +-
src/Mod/Fem/App/FemMesh.cpp | 102 +
src/Mod/Fem/App/FemMesh.h | 3 +
src/Mod/Fem/App/FemMeshProperty.cpp | 5 +
src/Mod/Fem/App/FemMeshPy.xml | 18 +-
src/Mod/Fem/App/FemMeshPyImp.cpp | 110 +-
src/Mod/Fem/App/FemMeshShapeNetgenObject.cpp | 2 +-
src/Mod/Fem/App/FemResultObject.cpp | 2 +
src/Mod/Fem/App/FemResultObject.h | 11 +-
src/Mod/Fem/App/FemResultValue.cpp | 2 +-
src/Mod/Fem/App/FemResultVector.cpp | 2 +-
src/Mod/Fem/CMakeLists.txt | 1 +
src/Mod/Fem/CalculixLib.py | 179 ++
src/Mod/Fem/Gui/AppFemGui.cpp | 2 +
src/Mod/Fem/Gui/CMakeLists.txt | 2 +
src/Mod/Fem/Gui/Resources/Fem.qrc | 3 +
src/Mod/Fem/Gui/Resources/icons/Fem_Analysis.svg | 12 +-
src/Mod/Fem/Gui/Resources/icons/Fem_Result.svg | 175 ++
.../Gui/Resources/icons/Fem_ResultDisplacement.svg | 181 ++
.../Fem/Gui/Resources/icons/Fem_ResultStress.svg | 194 ++
src/Mod/Fem/Gui/ViewProviderAnalysis.cpp | 2 +-
src/Mod/Fem/Gui/ViewProviderAnalysis.h | 3 +
src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 34 +
src/Mod/Fem/Gui/ViewProviderFemMesh.h | 5 +
src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml | 18 +-
src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp | 50 +-
.../Fem/Gui/ViewProviderResult.cpp} | 55 +-
...ViewProviderAnalysis.h => ViewProviderResult.h} | 33 +-
src/Mod/Fem/Gui/Workbench.cpp | 32 +-
src/Mod/Fem/MechanicalAnalysis.py | 133 +-
src/Mod/Fem/ShowDisplacement.ui | 123 ++
src/Mod/Material/CMakeLists.txt | 6 +-
src/Mod/Material/Material_rc.py | 512 +++++
src/Mod/Material/Resources/Material.qrc | 6 +
src/Mod/Mesh/App/Core/MeshIO.cpp | 6 +-
src/Mod/Mesh/App/Core/MeshIO.h | 5 +-
src/Mod/Mesh/App/Mesh.cpp | 5 +-
src/Mod/Mesh/App/Mesh.h | 3 +-
src/Mod/Mesh/App/MeshPyImp.cpp | 5 +-
src/Mod/Mesh/Gui/AppMeshGui.cpp | 4 -
src/Mod/Mesh/Gui/Command.cpp | 44 +-
src/Mod/Mesh/Gui/DlgRegularSolid.ui | 658 ++++---
src/Mod/Mesh/Gui/Resources/Mesh.qrc | 15 +
.../Gui/Resources/icons/Mesh_Curvature_Plot.svg | 268 +++
.../Mesh/Gui/Resources/icons/Mesh_Export_Mesh.svg | 876 +++++++++
.../Mesh/Gui/Resources/icons/Mesh_Flip_Normals.svg | 229 +++
.../Gui/Resources/icons/Mesh_Harmonize_Normals.svg | 259 +++
.../Mesh/Gui/Resources/icons/Mesh_Import_Mesh.svg | 846 ++++++++
.../Gui/Resources/icons/Mesh_Mesh_from_Shape.svg | 295 +++
.../Gui/Resources/icons/Mesh_Regular_Solid.svg | 289 +++
.../Gui/Resources/icons/Mesh_Remove_Components.svg | 227 +++
.../Resources/icons/Mesh_Tree_Curvature_Plot.svg | 221 +++
.../Resources/icons/RegularSolids/Mesh_Cone.svg | 141 ++
.../Resources/icons/RegularSolids/Mesh_Cube.svg | 232 +++
.../icons/RegularSolids/Mesh_Cylinder.svg | 195 ++
.../icons/RegularSolids/Mesh_Ellipsoid.svg | 283 +++
.../Resources/icons/RegularSolids/Mesh_Sphere.svg | 207 ++
.../Resources/icons/RegularSolids/Mesh_Torus.svg | 209 ++
src/Mod/Mesh/Gui/ViewProviderCurvature.cpp | 28 +-
src/Mod/Mesh/Gui/Workbench.cpp | 2 +-
src/Mod/Mesh/Gui/images.h | 129 --
src/Mod/Mesh/InitGui.py | 4 -
src/Mod/MeshPart/Gui/Command.cpp | 1 -
src/Mod/Part/App/AppPartPy.cpp | 28 +
src/Mod/Part/App/ArcOfCirclePyImp.cpp | 6 +-
src/Mod/Part/App/ArcPyImp.cpp | 10 +-
.../Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp | 42 +-
src/Mod/Part/App/BSplineCurvePyImp.cpp | 12 +-
src/Mod/Part/App/BSplineSurfacePyImp.cpp | 13 +-
src/Mod/Part/App/PrimitiveFeature.cpp | 5 +-
.../Part/App/RectangularTrimmedSurfacePyImp.cpp | 8 +-
src/Mod/Part/App/TopoShape.cpp | 104 +-
src/Mod/Part/App/TopoShape.h | 3 +
src/Mod/Part/App/TopoShapeCompoundPyImp.cpp | 2 +-
src/Mod/Part/App/TopoShapeEdgePy.xml | 24 +-
src/Mod/Part/App/TopoShapeWirePy.xml | 14 +-
src/Mod/Part/App/TopoShapeWirePyImp.cpp | 18 +-
src/Mod/Part/App/modelRefine.cpp | 69 +-
src/Mod/Part/Gui/AppPartGui.cpp | 5 +-
src/Mod/Part/Gui/CMakeLists.txt | 3 +
src/Mod/Part/Gui/Command.cpp | 180 ++
src/Mod/Part/Gui/CommandSimple.cpp | 2 +
src/Mod/Part/Gui/DlgBooleanOperation.cpp | 92 +-
src/Mod/Part/Gui/DlgFilletEdges.cpp | 5 +-
src/Mod/Part/Gui/DlgPrimitives.cpp | 96 +-
src/Mod/Part/Gui/DlgPrimitives.ui | 92 +-
src/Mod/Part/Gui/Resources/Part.qrc | 8 +
.../Gui/Resources/icons/Part_Measure_Angular.svg | 489 +++++
.../Gui/Resources/icons/Part_Measure_Linear.svg | 448 +++++
.../Resources/icons/Part_Measure_Step_Active.svg | 297 +++
.../Gui/Resources/icons/Part_Measure_Step_Done.svg | 254 +++
.../Gui/Resources/icons/Part_Measure_Toggle_3d.svg | 454 +++++
.../Resources/icons/Part_Measure_Toggle_Delta.svg | 455 +++++
.../Part/Gui/Resources/icons/Part_Refine_Shape.svg | 408 ++++
.../Gui/Resources/icons/Part_Shape_from_Mesh.svg | 232 +++
src/Mod/Part/Gui/TaskCheckGeometry.cpp | 2 +
src/Mod/Part/Gui/TaskDimension.cpp | 1667 ++++++++++++++++
src/Mod/Part/Gui/TaskDimension.h | 361 ++++
src/Mod/Part/Gui/Workbench.cpp | 15 +-
src/Mod/Raytracing/App/PovTools.cpp | 3 +-
src/Mod/Raytracing/App/PovTools.h | 4 +-
src/Mod/Raytracing/Gui/AppRaytracingGuiPy.cpp | 7 +-
src/Mod/Raytracing/Gui/DlgSettingsRay.ui | 8 +-
src/Mod/Robot/App/WaypointPyImp.cpp | 4 +-
src/Mod/Robot/Gui/TaskRobot6Axis.cpp | 24 +-
src/Mod/Robot/Gui/TaskTrajectory.cpp | 12 +-
src/Mod/Sketcher/App/ConstraintPyImp.cpp | 22 +-
src/Mod/Sketcher/App/freegcs/GCS.cpp | 4 +-
src/Mod/Sketcher/Gui/EditDatumDialog.cpp | 40 +-
src/Mod/Sketcher/Gui/InsertDatum.ui | 2 +-
src/Mod/Sketcher/Gui/SoDatumLabel.cpp | 7 +-
src/Mod/Sketcher/Gui/SoDatumLabel.h | 1 +
src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp | 15 +-
src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 70 +-
src/Mod/Sketcher/Gui/TaskSketcherGeneral.h | 1 +
src/Mod/Sketcher/Gui/TaskSketcherGeneral.ui | 89 +-
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 13 +-
src/Mod/Test/TestGui.py | 1 +
src/Mod/Test/UnitTests.py | 19 +-
src/WindowsInstaller/ModArch.wxi | 2 +
233 files changed, 23240 insertions(+), 7666 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