Bug IPAL19361 - Qt4 porting. It is impossible showing ID of elements in 3D Viewer...

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index cfbea4a4e71b27194319f8f0f853ecd9169a6f1e..1d2213d5b004a22c5390e32b10593a44cd2c7d47 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -3055,9 +3055,9 @@ QString SMESHGUI::engineIOR() const
   return QString( anIOR.in() );
 }
 
-LightApp_Selection* SMESHGUI::createSelection( const QString& client, LightApp_SelectionMgr* mgr ) const
+LightApp_Selection* SMESHGUI::createSelection() const
 {
-  return new SMESHGUI_Selection( client, mgr );
+  return new SMESHGUI_Selection();
 }
 
 void SMESHGUI::windows( QMap<int, int>& aMap ) const

diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h
index 9c5f591be194537d1d3c36cbb41af2d032a49776..b644fb4e1f4f5c262bb2a1e8144897ea517fe694 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.h
+++ b/src/SMESHGUI/SMESHGUI.h
@@ -93,7 +93,7 @@ public :
   virtual bool                    OnMouseMove( QMouseEvent*, SUIT_ViewWindow* );
   virtual bool                    OnKeyPress( QKeyEvent*, SUIT_ViewWindow* );
 
-  virtual LightApp_Selection*     createSelection( const QString&, LightApp_SelectionMgr* ) const;
+  virtual LightApp_Selection*     createSelection() const;
 
   virtual void                    BuildPresentation ( const Handle(SALOME_InteractiveObject)&,
                                                      SUIT_ViewWindow* = 0 );

diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx
index 9a7fe52c252451e76f2f5edfb638343f62906d03..af48b3008e2d087d65f155771ef455b55775acf7 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -48,9 +48,27 @@
 //function : SMESHGUI_Selection
 //purpose  : 
 //=======================================================================
-SMESHGUI_Selection::SMESHGUI_Selection( const QString& client, LightApp_SelectionMgr* mgr )
-: LightApp_Selection( client, mgr )
+SMESHGUI_Selection::SMESHGUI_Selection()
+: LightApp_Selection()
 {
+}
+
+//=======================================================================
+//function : ~SMESHGUI_Selection
+//purpose  : 
+//=======================================================================
+SMESHGUI_Selection::~SMESHGUI_Selection()
+{
+}
+
+//=======================================================================
+//function : init
+//purpose  : 
+//=======================================================================
+void SMESHGUI_Selection::init( const QString& client, LightApp_SelectionMgr* mgr )
+{
+  LightApp_Selection::init( client, mgr );
+
   if( mgr && study() )
   {
     SalomeApp_Study* aSStudy = dynamic_cast<SalomeApp_Study*>(study());
@@ -63,14 +81,6 @@ SMESHGUI_Selection::SMESHGUI_Selection( const QString& client, LightApp_Selectio
   }
 }
 
-//=======================================================================
-//function : ~SMESHGUI_Selection
-//purpose  : 
-//=======================================================================
-SMESHGUI_Selection::~SMESHGUI_Selection()
-{
-}
-
 //=======================================================================
 //function : processOwner
 //purpose  : 

diff --git a/src/SMESHGUI/SMESHGUI_Selection.h b/src/SMESHGUI/SMESHGUI_Selection.h
index ac12c816623e8c256d2e4fbe4a4124ee070c1db1..2b77aaf3fc90ad35406d762ec726d5deec3bea7e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Selection.h
+++ b/src/SMESHGUI/SMESHGUI_Selection.h
@@ -43,9 +43,10 @@ class SMESH_Actor;
 class SMESHGUI_EXPORT SMESHGUI_Selection : public LightApp_Selection
 {
 public:
-  SMESHGUI_Selection( const QString&, LightApp_SelectionMgr* );
+  SMESHGUI_Selection();
   virtual ~SMESHGUI_Selection();
 
+  virtual void            init( const QString&, LightApp_SelectionMgr* );
   virtual QVariant        parameter( const int, const QString& ) const;
   virtual void            processOwner( const LightApp_DataOwner* );