Unification of the VISU selection functionality

diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index 8ca84bc930aae89eb284c4675ed47110fa0e351c..8d30e2450e9707cc1091f25b62e8f1466edd519f 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -297,6 +297,8 @@ VISU_GaussPtsAct
   myCursorPyramid->AddToRender(theRenderer);
   myCursorPyramidSelected->AddToRender(theRenderer);
   myScalarBarCtrl->AddToRender(theRenderer);
+
+  SetPickingSettings( VISU_PickingSettings::Get() );
 }
 
 void 

diff --git a/src/OBJECT/VISU_GaussPtsSettings.cxx b/src/OBJECT/VISU_GaussPtsSettings.cxx
index e1c592481080ec5d5b362df1dcd3b707bde2de84..196e5c6c91720fa11df5a90509549d78d00deeed 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsSettings.cxx
+++ b/src/OBJECT/VISU_GaussPtsSettings.cxx
@@ -84,6 +84,12 @@ VISU_OutsideCursorSettings::~VISU_OutsideCursorSettings()
 }
 
 //----------------------------------------------------------------
+VISU_PickingSettings* VISU_PickingSettings::Get()
+{
+  static VISU_PickingSettings* aPickingSettings = VISU_PickingSettings::New();
+  return aPickingSettings;
+}
+
 VISU_PickingSettings::VISU_PickingSettings()
 {
   this->Initial                = true;

diff --git a/src/OBJECT/VISU_GaussPtsSettings.h b/src/OBJECT/VISU_GaussPtsSettings.h
index 473ddd103d5420e616005110bd3dffb77939a52f..3d7389523f5fbccaed754c6ab5dc9db24867d421 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsSettings.h
+++ b/src/OBJECT/VISU_GaussPtsSettings.h
@@ -179,8 +179,9 @@ class VTKOCC_EXPORT VISU_PickingSettings : public vtkObject
  public:
   vtkTypeMacro( VISU_PickingSettings, vtkObject );
 
-  VISU_PickingSettings();
-  virtual ~VISU_PickingSettings();
+  static
+  VISU_PickingSettings*
+  Get();
 
   static
   VISU_PickingSettings*
@@ -216,6 +217,10 @@ class VTKOCC_EXPORT VISU_PickingSettings : public vtkObject
   vtkSetMacro( DisplayParentMesh, bool );
   vtkGetMacro( DisplayParentMesh, bool );
 
+private:
+  VISU_PickingSettings();
+  virtual ~VISU_PickingSettings();
+
 private:
   bool                Initial;