Obsolete keyword "use-subshapes" is removed

diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index 8d4a40a8d80fe87682a8b21f7ef57b9cd9d7ed04..8bd931b3db24966ad81cb6fd162789186c98781f 100644 (file)
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -6,13 +6,11 @@
     icon=":icons/point.png" 
     tooltip="Select a first point"
     shape_types="vertex"
-       use_subshapes="true"
   />
   <shape_selector id="secondPoint"
     label="Second point"
     icon=":icons/point.png"
     tooltip="Select a second point"
     shape_types="vertex"
-       use_subshapes="true">
   </shape_selector>
 </source>

diff --git a/src/ConstructionPlugin/plane_widget.xml b/src/ConstructionPlugin/plane_widget.xml
index 546cc919b11249fa3556de38ee36a96b4e762dba..73b29f0128df70b67c3ee89981bb613ab02ea978 100644 (file)
--- a/src/ConstructionPlugin/plane_widget.xml
+++ b/src/ConstructionPlugin/plane_widget.xml
@@ -5,7 +5,6 @@
                   label="Plane face" 
                   tooltip="Select a planar face"
                   shape_types="face"
-                  use_subshapes="true">
                  <selection_filter id="FaceFilter" parameters="plane"/>
   </shape_selector>
   <doublevalue id="distance" 

diff --git a/src/FeaturesPlugin/extrusion_widget.xml b/src/FeaturesPlugin/extrusion_widget.xml
index 86dafe348e3a40787d12e8a50c2d4d7cd7a679d4..d37d8da99025f8ef85bda4864f70d1905b35eab7 100644 (file)
--- a/src/FeaturesPlugin/extrusion_widget.xml
+++ b/src/FeaturesPlugin/extrusion_widget.xml
@@ -8,7 +8,6 @@
     activate="true"
     shape_types="face"
        object_types="construction"
-    use_subshapes="true"
   />
   <doublevalue
     id="extrusion_size"

diff --git a/src/FeaturesPlugin/placement_widget.xml b/src/FeaturesPlugin/placement_widget.xml
index 4f04fa9cd2838d1a792b604d7f27001588e1cfb4..fd4924fa027d7f1625c9c85a286d534acd9e573f 100644 (file)
--- a/src/FeaturesPlugin/placement_widget.xml
+++ b/src/FeaturesPlugin/placement_widget.xml
@@ -6,14 +6,12 @@
     icon=":icons/cut_shape.png" 
     tooltip="Select a destination face"
     shape_types="face"
-    use_subshapes="true"
   />
   <shape_selector id="placement_attractable_face" 
                label="Select a face" 
                icon=":icons/cut_shape.png" 
                tooltip="Select a face of moved object" 
                shape_types="face" 
-               use_subshapes="true"    
                concealment="true" >
        <validator id="PartSet_DifferentObjects"/>
   </shape_selector>

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 114a76748d716bd951d53f499582f9875ac3bd2e..f3d2807da7e7cc1134801ec7acc6511f59741451 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -62,9 +62,6 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen
   aMainLay->addWidget(new QLabel(myMainWidget));
   aMainLay->setRowMinimumHeight(3, 20);
   myMainWidget->setLayout(aMainLay);
-  //TODO: Move into the base class
-  myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false);
-  //TODO_END
   connect(myTypeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSelectionTypeChanged()));
 
   myCopyAction = new QAction(QIcon(":pictures/copy.png"), tr("Copy"), this);

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index ba0f248af5dfabce8c8d9dcb2e65bb4de1b0bcb8..bea20b3fc8423f3a79361ae8453596bd343cb08b 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -119,8 +119,6 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen
 
   std::string aObjTypes = theData->getProperty("object_types");
   myObjectTypes = QString(aObjTypes.c_str()).split(' ', QString::SkipEmptyParts);
-
-  //myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false); 
 }
 
 //********************************************************************

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index e52d615f01352d8d20bc606841d551518087c6fc..e249eb240afe69ca42eb6e953d2fe700b1f9eb35 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -49,13 +49,12 @@
           id="ConstraintEntityA" 
           label="First object" 
           tooltip="Select point, line end point, line, center of circle or arc."
-          shape_types="edge vertex"  
-          use_subshapes="true"/>
+          shape_types="edge vertex"/>
                <sketch_shape_selector 
           id="ConstraintEntityB" 
           label="Last object" 
           tooltip="Select point, line end point, line, center of circle or arc." 
-                       shape_types="edge vertex"  use_subshapes="true">
+                           shape_types="edge vertex">
                        <validator id="SketchPlugin_DifferentObjects"/>
                </sketch_shape_selector>
                
@@ -96,13 +95,12 @@
        <!--  SketchConstraintParallel  -->
       <feature id="SketchConstraintParallel" title="Parallel" tooltip="Create constraint defining two parallel lines" icon=":icons/parallel.png">
                <sketch_constraint_shape_selector id="ConstraintEntityA" 
-                       label="First line" tooltip="Select a line" 
-                       shape_types="edge" use_subshapes="true">
+                       label="First line" tooltip="Select a line" shape_types="edge">
                        <selection_filter id="EdgeFilter" parameters="line"/>
                </sketch_constraint_shape_selector>
                
                <sketch_constraint_shape_selector id="ConstraintEntityB" label="Last line" tooltip="Select a line" 
-                       shape_types="edge" use_subshapes="true">
+                       shape_types="edge">
                        <selection_filter id="EdgeFilter" parameters="line"/>
                        <validator id="SketchPlugin_DifferentObjects"/>
                </sketch_constraint_shape_selector>
@@ -114,13 +112,13 @@
       <feature id="SketchConstraintPerpendicular" title="Perpendicular" tooltip="Create constraint defining two perpendicular lines" icon=":icons/perpendicular.png">
                <sketch_constraint_shape_selector id="ConstraintEntityA" 
                        label="First line" tooltip="Select an line" 
-                       shape_types="edge" use_subshapes="true">
+                       shape_types="edge">
       <selection_filter id="EdgeFilter" parameters="line"/>
     </sketch_constraint_shape_selector>
                
                <sketch_constraint_shape_selector id="ConstraintEntityB" 
                        label="Last line" tooltip="Select an line" 
-                       shape_types="edge" use_subshapes="true">
+                       shape_types="edge">
                        <validator id="SketchPlugin_DifferentObjects"/>
       <selection_filter id="EdgeFilter" parameters="line"/>
     </sketch_constraint_shape_selector>