]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'V9_5_BR'
authorvsr <vsr@opencascade.com>
Fri, 10 Jul 2020 16:24:56 +0000 (19:24 +0300)
committervsr <vsr@opencascade.com>
Fri, 10 Jul 2020 16:24:56 +0000 (19:24 +0300)
14 files changed:
1  2 
src/FeaturesPlugin/CMakeLists.txt
src/FeaturesPlugin/doc/FeaturesPlugin.rst
src/FeaturesPlugin/plugin-Features.xml
src/Model/Model_AttributeSelection.h
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_OperationPrs.cpp
src/PartSet/PartSet_SketcherMgr.cpp
src/PartSet/PartSet_WidgetSketchLabel.cpp
src/SketchPlugin/CMakeLists.txt
src/SketchPlugin/SketchPlugin_Validators.cpp
src/SketchPlugin/SketchPlugin_msg_en.ts
src/SketchPlugin/plugin-Sketch.xml
src/XGUI/XGUI_ContextMenuMgr.cpp
src/XGUI/XGUI_Workshop.cpp

index fcd93d08cbbb61afc50b3856db4bb6e85cdcb281,1801536207d4688af539af76427628c5eea5b48b..0169cd9e3bea23cb95db9b87af56cfd3eb622f88
@@@ -665,19 -662,6 +665,21 @@@ ADD_UNIT_TESTS(TestExtrusion.p
                 Test2817.py
                 Test19065.py
                 Test19066.py
+                Test19115.py
+                Test19196.py
 +               TestFillet1D_ErrorMsg.py
 +               TestFillet1D_Vertices_1.py
 +               TestFillet1D_Vertices_2.py
 +               TestFillet1D_Vertices_3.py
 +               TestFillet1D_Vertices_4.py
 +               TestFillet1D_Vertices_5.py
 +               TestFillet1D_Vertices_6.py
 +               TestFillet1D_Vertices_7.py
 +               TestFillet1D_Vertices_8.py
 +               TestFillet1D_Vertices_9.py
 +               TestFillet1D_Wire_1.py
 +               TestFillet1D_Wire_2.py
 +               TestFillet1D_Wire_3.py
 +               TestFillet1D_Wire_4.py
 +               TestFillet1D_Wire_5.py
  )
index 421292b0bf65833b3227b8bab4ca254c28e3766f,7f9ac37f7fccb0ecc72a39860f770b3e8a9bd108..fb8e2a344b707376d72df48edb52804796a2e7bf
@@@ -19,15 -18,11 +18,12 @@@ Features plug-in provides a set of comm
     extrusionCutFeature.rst
     extrusionFeature.rst
     extrusionFuseFeature.rst
 +   fillet1dFeature.rst
     filletFeature.rst
-    fuseFeature.rst
     fuseFeatureFaces.rst
     importResultFeature.rst
-    intersectionFeature.rst
     linearCopyFeature.rst
     measurementFeature.rst
-    partitionFeature.rst
     pipeFeature.rst
     placementFeature.rst
     recoverFeature.rst
Simple merge
Simple merge
Simple merge
Simple merge
index 7f79a51eb2434d5feaa68a403968be18886d8151,9365adc575d8067ce1476cc03c8c32d7ec47f706..83b82a90449fa7f1fb4736a659c6da9da1511ede
@@@ -355,18 -358,9 +363,10 @@@ void PartSet_WidgetSketchLabel::updateB
    PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
    if (aModule) {
      CompositeFeaturePtr aSketch = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(myFeature);
-     bool isSetSizeOfView = false;
-     double aSizeOfView = 0;
-     QString aSizeOfViewStr = mySizeOfView->text();
-     if (!aSizeOfViewStr.isEmpty()) {
-       aSizeOfView = aSizeOfViewStr.toDouble(&isSetSizeOfView);
-       if (isSetSizeOfView && aSizeOfView <= 0) {
-         isSetSizeOfView = false;
-       }
-     }
      aModule->sketchMgr()->previewSketchPlane()->setSizeOfView(aSizeOfView, isSetSizeOfView);
-     if (myViewVisible->isChecked())
-       aModule->sketchMgr()->previewSketchPlane()->createSketchPlane(aSketch, myWorkshop);
+     // Call of createSketchPlane is managed by events Loop
 -    //aModule->sketchMgr()->previewSketchPlane()->createSketchPlane(aSketch, myWorkshop);
++    //if (myViewVisible->isChecked())
++    //  aModule->sketchMgr()->previewSketchPlane()->createSketchPlane(aSketch, myWorkshop);
    }
    // 2. if the planes were displayed, change the view projection
  
Simple merge
Simple merge
Simple merge
Simple merge