From: vsr <vsr@opencascade.com>
Date: Fri, 10 Jul 2020 16:24:56 +0000 (+0300)
Subject: Merge branch 'V9_5_BR'
X-Git-Tag: V9_6_0a1~62
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a0fa395fd2a0ddb16cb9aed4dab180f2681b4447;p=modules%2Fshaper.git

Merge branch 'V9_5_BR'
---

a0fa395fd2a0ddb16cb9aed4dab180f2681b4447
diff --cc src/FeaturesPlugin/CMakeLists.txt
index fcd93d08c,180153620..0169cd9e3
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@@ -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
  )
diff --cc src/FeaturesPlugin/doc/FeaturesPlugin.rst
index 421292b0b,7f9ac37f7..fb8e2a344
--- a/src/FeaturesPlugin/doc/FeaturesPlugin.rst
+++ b/src/FeaturesPlugin/doc/FeaturesPlugin.rst
@@@ -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
diff --cc src/PartSet/PartSet_WidgetSketchLabel.cpp
index 7f79a51eb,9365adc57..83b82a904
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@@ -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