Issue #359 Axis with the same point on both ends

diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml
index 364fa2b3c9cef75ee7cbd00e7986fadd163c6ae0..f612a83d08e470a660ae85390bfd57f6d2badecc 100644 (file)
--- a/src/ConstructionPlugin/axis_widget.xml
+++ b/src/ConstructionPlugin/axis_widget.xml
@@ -14,5 +14,6 @@
     tooltip="Select a second point"
     shape_types="vertex">
     <selection_filter id="NoConstructionSubShapesFilter"/>
+    <validator id="PartSet_DifferentObjects"/>
   </shape_selector>
 </source>

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index f3d2807da7e7cc1134801ec7acc6511f59741451..5ee8ac64a38bd0bab91c132eb4b3a475fdebfac9 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -37,7 +37,7 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen
                                                                const Config_WidgetAPI* theData,
                                                                const std::string& theParentId)
     : ModuleBase_ModelWidget(theParent, theData, theParentId),
-      myWorkshop(theWorkshop), myIsActive(false), myUseSubShapes(false)
+      myWorkshop(theWorkshop), myIsActive(false)
 {
   myMainWidget = new QWidget(theParent);
   QGridLayout* aMainLay = new QGridLayout(myMainWidget);

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.h b/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
index 111b27f0d8a5e487e043b1e1e50c2d3de09033e0..bf8f8841a021a813aaf3ed2af162f98639370ded 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
@@ -83,7 +83,6 @@ protected slots:
   ModuleBase_IWorkshop* myWorkshop;
 
   /// If true then local selector has to be activated in context
-  bool myUseSubShapes;
   bool myIsActive;
 
   typedef QPair<ResultPtr, GeomShapePtr> GeomSelection;