From: nds <natalia.donis@opencascade.com>
Date: Wed, 21 Jan 2015 09:06:41 +0000 (+0300)
Subject: Issue #359 Axis with the same point on both ends
X-Git-Tag: V_1.0.0~22^2~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=87a4570b2f2dd79c00d85b140c587f0e9e88a837;p=modules%2Fshaper.git

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 364fa2b3c..f612a83d0 100644
--- 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 f3d2807da..5ee8ac64a 100644
--- 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 111b27f0d..bf8f8841a 100644
--- 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;