]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Revert "Merge branch 'Pre_2.8.0_development'"
authorazv <azv@opencascade.com>
Fri, 23 Jun 2017 12:57:29 +0000 (15:57 +0300)
committerazv <azv@opencascade.com>
Fri, 23 Jun 2017 12:57:29 +0000 (15:57 +0300)
commit5a67842979db286af5bb5015fe413d8b06c6587e
treede41939ca3fd821d83a1da2403766f284820b000
parente88cfb97fcb9e38b9cfa32fcb8024396dc6b78e0
Revert "Merge branch 'Pre_2.8.0_development'"

This reverts commit bf64d76b7e6021149db8e0e38c2697a9a0c44f1b, reversing
changes made to cacdfa1cd62583b9f40fe6a05e1b9e63f8fe2f03.

# Conflicts:
# src/SketchPlugin/plugin-Sketch.xml
116 files changed:
src/GeomAPI/CMakeLists.txt
src/GeomAPI/GeomAPI_Ax2.h
src/GeomAPI/GeomAPI_Circ.h
src/GeomAPI/GeomAPI_Dir.h
src/GeomAPI/GeomAPI_Edge.cpp
src/GeomAPI/GeomAPI_Edge.h
src/GeomAPI/GeomAPI_Ellipse.cpp [deleted file]
src/GeomAPI/GeomAPI_Ellipse.h [deleted file]
src/GeomAPI/GeomAPI_Ellipse2d.cpp [deleted file]
src/GeomAPI/GeomAPI_Ellipse2d.h [deleted file]
src/GeomAPI/GeomAPI_Pln.h
src/GeomAPI/GeomAPI_Pnt.h
src/GeomAPI/GeomAPI_Vertex.h
src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp
src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h
src/Model/Model_AttributeSelection.cpp
src/Model/Model_AttributeSelection.h
src/ModelAPI/CMakeLists.txt
src/ModelAPI/ModelAPI_AttributeSelection.h
src/ModelAPI/ModelAPI_Events.cpp
src/ModelAPI/ModelAPI_Events.h
src/ModelHighAPI/ModelHighAPI_RefAttr.cpp
src/ModelHighAPI/ModelHighAPI_RefAttr.h
src/ModuleBase/ModuleBase_ModelWidget.cpp
src/ModuleBase/ModuleBase_ResultPrs.cpp
src/ModuleBase/ModuleBase_ResultPrs.h
src/PartSet/CMakeLists.txt
src/PartSet/PartSet_CenterPrs.cpp [deleted file]
src/PartSet/PartSet_CenterPrs.h [deleted file]
src/PartSet/PartSet_ExternalPointsMgr.cpp [deleted file]
src/PartSet/PartSet_ExternalPointsMgr.h [deleted file]
src/PartSet/PartSet_SketcherMgr.cpp
src/PartSet/PartSet_SketcherMgr.h
src/PartSet/PartSet_Tools.cpp
src/PartSet/PartSet_Tools.h
src/PartSet/PartSet_WidgetPoint2d.cpp
src/PartSet/PartSet_WidgetSketchLabel.cpp
src/PartSet/PartSet_WidgetSketchLabel.h
src/PythonAPI/model/sketcher/__init__.py
src/PythonAPI/model/sketcher/tests.py [deleted file]
src/PythonAPI/model/sketcher/tools.py
src/PythonAPI/model/tests/tests.py
src/SketchAPI/SketchAPI_Constraint.cpp
src/SketchAPI/SketchAPI_Rectangle.cpp
src/SketchAPI/SketchAPI_Rectangle.h
src/SketchAPI/SketchAPI_Sketch.cpp
src/SketchAPI/SketchAPI_Sketch.h
src/SketchPlugin/CMakeLists.txt
src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
src/SketchPlugin/SketchPlugin_ConstraintDistance.h
src/SketchPlugin/SketchPlugin_ConstraintDistanceHorizontal.cpp [deleted file]
src/SketchPlugin/SketchPlugin_ConstraintDistanceHorizontal.h [deleted file]
src/SketchPlugin/SketchPlugin_ConstraintDistanceVertical.cpp [deleted file]
src/SketchPlugin/SketchPlugin_ConstraintDistanceVertical.h [deleted file]
src/SketchPlugin/SketchPlugin_Ellipse.cpp [deleted file]
src/SketchPlugin/SketchPlugin_Ellipse.h [deleted file]
src/SketchPlugin/SketchPlugin_MacroCircle.cpp
src/SketchPlugin/SketchPlugin_MacroEllipse.cpp [deleted file]
src/SketchPlugin/SketchPlugin_MacroEllipse.h [deleted file]
src/SketchPlugin/SketchPlugin_Plugin.cpp
src/SketchPlugin/SketchPlugin_Validators.cpp
src/SketchPlugin/SketchPlugin_Validators.h
src/SketchPlugin/Test/TestArcBehavior.py
src/SketchPlugin/Test/TestConstraintDistance.py
src/SketchPlugin/Test/TestConstraintDistanceBehavior.py [deleted file]
src/SketchPlugin/Test/TestConstraintDistanceHorizontal.py [deleted file]
src/SketchPlugin/Test/TestConstraintDistanceVertical.py [deleted file]
src/SketchPlugin/Test/TestConstraintFixed.py
src/SketchPlugin/Test/TestConstraintHorizontalValidator.py [deleted file]
src/SketchPlugin/Test/TestConstraintTangent.py
src/SketchPlugin/Test/TestCreateArcByCenterStartEnd.py
src/SketchPlugin/Test/TestCreateArcByTangentEdge.py
src/SketchPlugin/Test/TestCreateArcByThreePoints.py
src/SketchPlugin/Test/TestCreateArcChangeType.py
src/SketchPlugin/Test/TestCreateCircleByCenterAndPassed.py
src/SketchPlugin/Test/TestCreateCircleByThreePoints.py
src/SketchPlugin/Test/TestCreateCircleChangeType.py
src/SketchPlugin/Test/TestFillet.py
src/SketchPlugin/Test/TestFilletInteracting.py
src/SketchPlugin/Test/TestMoveArc.py [deleted file]
src/SketchPlugin/Test/TestMoveCircle.py [deleted file]
src/SketchPlugin/Test/TestMoveLine.py [deleted file]
src/SketchPlugin/Test/TestMovePoint.py [deleted file]
src/SketchPlugin/Test/TestMovementComplex.py [deleted file]
src/SketchPlugin/icons/distance_h.png [deleted file]
src/SketchPlugin/icons/distance_v.png [deleted file]
src/SketchPlugin/icons/ellipse.png [deleted file]
src/SketchPlugin/plugin-Sketch.xml
src/SketchSolver/CMakeLists.txt
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Defs.h
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.h
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.cpp
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Storage.h
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Tools.cpp
src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Tools.h
src/SketchSolver/SketchSolver_Constraint.cpp
src/SketchSolver/SketchSolver_ConstraintDistance.cpp
src/SketchSolver/SketchSolver_ConstraintFixed.cpp
src/SketchSolver/SketchSolver_ConstraintFixed.h
src/SketchSolver/SketchSolver_ConstraintMovement.cpp [deleted file]
src/SketchSolver/SketchSolver_ConstraintMovement.h [deleted file]
src/SketchSolver/SketchSolver_Error.h
src/SketchSolver/SketchSolver_Group.cpp
src/SketchSolver/SketchSolver_Group.h
src/SketchSolver/SketchSolver_Manager.cpp
src/SketchSolver/SketchSolver_Manager.h
src/SketchSolver/SketchSolver_Storage.h
src/SketcherPrs/SketcherPrs_LengthDimension.cpp
src/XGUI/XGUI_ContextMenuMgr.cpp
src/XGUI/XGUI_MenuMgr.cpp
src/XGUI/XGUI_OperationMgr.cpp
src/XGUI/XGUI_OperationMgr.h
src/XGUI/XGUI_Tools.cpp
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h