Merge branch 'CEA/FeaturesPlugin/LOFT'

diff --git a/src/CTestTestfileInstall.cmake b/src/CTestTestfileInstall.cmake
index ca18e37d3acd6ca22677f14bef60a8a2f4d21831..b9e1c1ebf5728b3d470ef6cd0e3471e320dd0257 100644 (file)
--- a/src/CTestTestfileInstall.cmake
+++ b/src/CTestTestfileInstall.cmake
@@ -19,6 +19,7 @@
 
 SET(COMPONENT_NAME SHAPER)
 set(SALOME_TEST_LABEL_ADV SHAPR_ADV)
+set(SALOME_TEST_LABEL_SEQ SHAPR_SEQ)
 
 # Add all test subdirs
 SUBDIRS(ConnectorAPI

diff --git a/src/FeaturesPlugin/CTestTestfileInstall.cmake b/src/FeaturesPlugin/CTestTestfileInstall.cmake
index fd3d28560231bef0c16452c98ed03e99983b2053..a43c441a5a3193874dfc68b53fac9e22b7d67802 100644 (file)
--- a/src/FeaturesPlugin/CTestTestfileInstall.cmake
+++ b/src/FeaturesPlugin/CTestTestfileInstall.cmake
@@ -19,8 +19,15 @@
 
 include(tests.set)
 
-foreach(tfile ${TEST_NAMES})
+foreach(tfile ${TEST_NAMES_PARA})
   set(TEST_NAME ${COMPONENT_NAME}_${tfile})
   add_test(${TEST_NAME} python ${tfile})
   set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${SALOME_TEST_LABEL_ADV}")
 endforeach()
+
+
+foreach(tfile ${TEST_NAMES_SEQ})
+  set(TEST_NAME ${COMPONENT_NAME}_${tfile})
+  add_test(${TEST_NAME} python ${tfile})
+  set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${SALOME_TEST_LABEL_SEQ}")
+endforeach()

diff --git a/src/FeaturesPlugin/tests.set b/src/FeaturesPlugin/tests.set
index ecf379dc20c6087a0810ae325c2a6a887f348db8..88743ea12fa2bf63f882d2670796c7f85c56beb8 100644 (file)
--- a/src/FeaturesPlugin/tests.set
+++ b/src/FeaturesPlugin/tests.set
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(TEST_NAMES
+SET(TEST_NAMES_PARA
                TestExtrusion.py
                TestExtrusionOfCompound.py
                TestExtrusionCut.py
@@ -497,7 +497,6 @@ SET(TEST_NAMES
                Test2817.py
                Test19065.py
                Test19066.py
-               Test19115.py
                Test19196.py
                TestFillet1D_ErrorMsg.py
                TestFillet1D_Vertices_1.py
@@ -529,3 +528,9 @@ SET(TEST_NAMES
                TestNormalToFace.py
                TestLoft.py
 )
+
+SET(TEST_NAMES_SEQ
+               Test19115.py
+)
+
+set(TEST_NAMES ${TEST_NAMES_PARA} ${TEST_NAMES_SEQ})

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index e8850f6273b7ff7c3f7946331a0d737944b9466e..acc61de03c35b39f698511d773e05ffaa546847a 100644 (file)
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -335,14 +335,6 @@ bool SHAPERGUI::activateModule(SUIT_Study* theStudy)
   myIsEditEnabled = getApp()->isEditEnabled();
   getApp()->setEditEnabled(false);
 
-  // this following row is caused by #187 bug.
-  // SALOME saves the dock widget positions before deactivateModule() and
-  // load it after the module activation. So, if the panel is visible before
-  // deactivate, it becomes visible after activate.
-  // In order to avoid the visible property panel, the widget position save is
-  // switch off in this module
-  aResMgr->setValue("Study", "store_positions", false);
-
   // Synchronize displayed objects
   Handle(AIS_InteractiveContext) aContext;
   if (mySelector && mySelector->viewer())
@@ -1058,6 +1050,16 @@ void SHAPERGUI::updateModuleVisibilityState()
 {
   LightApp_Module::updateModuleVisibilityState();
   onWhatIs(myIsInspectionVisible);
+
+  // the following code is caused by #187 bug.
+  // SALOME saves the dock widget positions before deactivateModule() and
+  // load it after the module activation. So, if the panel is visible before
+  // deactivate, it becomes visible after activate.
+  // In order to avoid the visible property panel, we hide it here
+  ModuleBase_Operation* anOperation = myWorkshop->module()->currentOperation();
+  if (!anOperation) {
+    myWorkshop->hidePanel(myWorkshop->propertyPanel());
+  }
 }
 
 void SHAPERGUI::onEditToolbars()

diff --git a/src/SHAPERGUI/resources/LightApp.xml.in b/src/SHAPERGUI/resources/LightApp.xml.in
index 7081ad8bba26e6edd5b62f2f842f617436486630..6165a7a5e0cab7b924b8b9f7a31cc8781e8b486e 100644 (file)
--- a/src/SHAPERGUI/resources/LightApp.xml.in
+++ b/src/SHAPERGUI/resources/LightApp.xml.in
@@ -53,7 +53,7 @@
     <parameter name="scalar_bar_text_color" value="#000000" />
     <parameter name="shaper_default_transparency" value="0"/>
     <parameter name="group_names_display" value="true" />
-    <parameter name="group_names_font" value="Arial Black" />
+    <parameter name="group_names_font" value="Times-bold" />
     <parameter name="group_names_size" value="12" />
     <parameter name="group_names_color" value="#000000" />
   </section>

diff --git a/src/XGUI/SHAPER.xml b/src/XGUI/SHAPER.xml
index 6411ef5376b77142a9feb45c0aa90fb076a67d4f..d62acc97086e01b3b7547ee54ba77db07a13d7b3 100644 (file)
--- a/src/XGUI/SHAPER.xml
+++ b/src/XGUI/SHAPER.xml
@@ -34,7 +34,7 @@
     <parameter name="scalar_bar_nb_intervals" value="20" />
     <parameter name="scalar_bar_text_color" value="#000000" />
     <parameter name="group_names_display" value="true" />
-    <parameter name="group_names_font" value="Arial Black" />
+    <parameter name="group_names_font" value="Times-bold" />
     <parameter name="group_names_size" value="12" />
     <parameter name="group_names_color" value="#000000" />
   </section>

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 8859ef6546a163852b28fd902d1389e201563700..124ac7bc109ce985c6e7ca3d7b81767053ce3e05 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -1728,11 +1728,14 @@ void XGUI_Workshop::showPanel(QDockWidget* theDockWidget)
 //******************************************************
 void XGUI_Workshop::hidePanel(QDockWidget* theDockWidget)
 {
-  if (theDockWidget && theDockWidget == myPropertyPanel) {
+  if (!theDockWidget) return;
+
+  if (theDockWidget == myPropertyPanel) {
     QAction* aViewAct = theDockWidget->toggleViewAction();
     ///<! Do not allow to show empty property panel
     aViewAct->setEnabled(false);
   }
+
   theDockWidget->hide();
 
   // the property panel is active window of the desktop, when it is