From: nds <nds@opencascade.com>
Date: Thu, 23 Jun 2016 10:21:08 +0000 (+0300)
Subject: Issue #1502 Select sub-solids in viewer : Compsolid shape selection type should be... 
X-Git-Tag: V_2.4.0~35
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b1d938756444c15b5845764e76cbbb92ba9adea2;p=modules%2Fshaper.git

Issue #1502 Select sub-solids in viewer : Compsolid shape selection type should be defined in XML directly.
---

diff --git a/src/ExchangePlugin/export_widget.xml b/src/ExchangePlugin/export_widget.xml
index 60f0454ca..914ef4508 100644
--- a/src/ExchangePlugin/export_widget.xml
+++ b/src/ExchangePlugin/export_widget.xml
@@ -12,7 +12,7 @@
       </export_file_selector>
       <multi_selector id="selection_list" 
                       tooltip="Select a set of objects" 
-                      type_choice="Vertices Edges Faces Solids Objects">
+                      type_choice="Vertices Edges Faces Solids Compsolids Objects">
         <validator id="GeomValidators_Finite"/>
       </multi_selector>
     </case>
diff --git a/src/ExchangePlugin/plugin-Exchange.xml b/src/ExchangePlugin/plugin-Exchange.xml
index eeafa5b95..28f13d951 100755
--- a/src/ExchangePlugin/plugin-Exchange.xml
+++ b/src/ExchangePlugin/plugin-Exchange.xml
@@ -5,7 +5,7 @@
     <group id="Exchange">
       <feature id="Import" title="Import" tooltip="Import a file" icon="icons/Exchange/import.png" document="Part">
         <file_selector id="file_path" title="Import file" path="">
-          <validator id="ExchangePlugin_ImportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES,XAO:XAO" />
+          <validator id="ExchangePlugin_ImportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES" />
         </file_selector>
       </feature>
       <feature id="Export" title="Export" tooltip="Export to file" icon="icons/Exchange/export.png">
@@ -13,7 +13,7 @@
           <validator id="ExchangePlugin_ExportFormat" parameters="BREP|BRP:BREP,STEP|STP:STEP,IGES|IGS:IGES-5.1,IGES|IGS:IGES-5.3" />
         </export_file_selector>
         <multi_selector id="selection_list" tooltip="Select a set of objects"
-                        type_choice="Vertices Edges Faces Solids Objects" use_choice="true">
+                        type_choice="Vertices Edges Faces Solids Compsolids Objects" use_choice="true">
           <validator id="GeomValidators_Finite"/>
         </multi_selector>
       </feature>
diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index 7c5e30ad1..83c5cee2b 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -15,7 +15,7 @@
     label="Main objects"
     icon=""
     tooltip="Select solid objects"
-    type_choice="solids edges faces"
+    type_choice="solids compsolids edges faces"
     use_choice="false"
     concealment="true">
     <validator id="PartSet_DifferentObjects"/>
@@ -25,7 +25,7 @@
     label="Tool objects"
     icon=""
     tooltip="Select a tool solid"
-    type_choice="solids edges faces"
+    type_choice="solids compsolids edges faces"
     use_choice="false"
     concealment="true" >
     <validator id="PartSet_DifferentObjects"/>
diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml
index cdc7fb4b9..14d21f559 100755
--- a/src/FeaturesPlugin/extrusioncut_widget.xml
+++ b/src/FeaturesPlugin/extrusioncut_widget.xml
@@ -87,7 +87,8 @@
     label="Cut from:"
     icon="icons/Features/cut_shape.png"
     tooltip="Objects to Cut"
-    type_choice="Solids"
+    type_choice="Solids Compsolids"
+    use_choice="false"
     concealment="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml
index 96a843907..778c584f2 100644
--- a/src/FeaturesPlugin/extrusionfuse_widget.xml
+++ b/src/FeaturesPlugin/extrusionfuse_widget.xml
@@ -87,7 +87,8 @@
     label="Fuse with:"
     icon="icons/Features/cut_shape.png"
     tooltip="Objects to Fuse"
-    type_choice="Solids"
+    type_choice="Solids Compsolids"
+    use_choice="false"
     concealment="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
diff --git a/src/FeaturesPlugin/group_widget.xml b/src/FeaturesPlugin/group_widget.xml
index 076b6ba41..6192e9826 100644
--- a/src/FeaturesPlugin/group_widget.xml
+++ b/src/FeaturesPlugin/group_widget.xml
@@ -3,7 +3,7 @@
 <source>
   <multi_selector id="group_list"
     tooltip="Select a set of objects"
-    type_choice="vertices edges faces solids"
+    type_choice="Vertices Edges Faces Solids"
     use_choice="true"
     clear_in_neutral_point="false">
     <validator id="GeomValidators_BodyShapes"/>
diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml
index 10482c12f..1465db55c 100644
--- a/src/FeaturesPlugin/revolutioncut_widget.xml
+++ b/src/FeaturesPlugin/revolutioncut_widget.xml
@@ -87,7 +87,8 @@
     label="Cut from:"
     icon="icons/Features/cut_shape.png"
     tooltip="Objects to Cut"
-    type_choice="Solids"
+    type_choice="Solids Compsolids"
+    use_choice="false"
     concealment="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml
index 7e36ba71f..aee797d55 100644
--- a/src/FeaturesPlugin/revolutionfuse_widget.xml
+++ b/src/FeaturesPlugin/revolutionfuse_widget.xml
@@ -87,7 +87,8 @@
     label="Fuse with:"
     icon="icons/Features/cut_shape.png"
     tooltip="Objects to Fuse"
-    type_choice="Solids"
+    type_choice="Solids Compsolids"
+    use_choice="false"
     concealment="true">
     <validator id="GeomValidators_ShapeType" parameters="solid"/>
   </multi_selector>
diff --git a/src/FeaturesPlugin/union_widget.xml b/src/FeaturesPlugin/union_widget.xml
index f8725f877..d0dcdb8b9 100644
--- a/src/FeaturesPlugin/union_widget.xml
+++ b/src/FeaturesPlugin/union_widget.xml
@@ -4,7 +4,8 @@
   <multi_selector id="base_objects"
     label="Base objects:"
     tooltip="Select solids for union."
-    type_choice="solids"
+    type_choice="solids compsolids"
+    use_choice="false"
     concealment="true">
     <validator id="FeaturesPlugin_ValidatorUnionSelection"/>
   </multi_selector>
diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index a6c82a0dd..bd0dd48d2 100755
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -78,7 +78,8 @@ void ModuleBase_WidgetSelector::updateOnSelectionChanged(const bool theDone)
 QIntList ModuleBase_WidgetSelector::getShapeTypes() const
 {
   QIntList aShapeTypes = shapeTypes();
-  if (aShapeTypes.contains(TopAbs_SOLID) || aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result/*TopAbs_SHAPE*/)) {
+  if (/*aShapeTypes.contains(TopAbs_SOLID) ||*/ // this type should be mentioned in XML, poor selection otherwise
+      aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result/*TopAbs_SHAPE*/)) {
     // it should be selectable for both, "solids" and "objects" types
     aShapeTypes.append(TopAbs_COMPSOLID);
   }