NRI : Merge from Event_Server. ( SMESH requires KERNEL Event_Server branch waiting...

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 089f08e06b758c0fb8fd079ce718323c87a7da7c..4d94be4c84f429ea20aa10f5a1af09b54a8ece4a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -527,8 +527,8 @@ class CustomItem:public QCustomMenuItem
  *
  */
 //=============================================================================
-SMESHGUI::SMESHGUI():
-QObject()
+SMESHGUI::SMESHGUI( const QString& theName, QObject* theParent ) :
+  SALOMEGUI( theName, theParent )
 {
 }
 
@@ -553,6 +553,12 @@ SMESHGUI* SMESHGUI::GetSMESHGUI()
   return smeshGUI;
 }
 
+extern "C"
+{
+  Standard_EXPORT SALOMEGUI* GetComponentGUI() {
+    return SMESHGUI::GetSMESHGUI();
+  }
+}
 //=============================================================================
 /*!
  *
@@ -724,7 +730,7 @@ QAD_Desktop *SMESHGUI::GetDesktop()
  *
  */
 //=============================================================================
-void SMESHGUI::activeStudyChanged(QAD_Desktop* parent)
+bool SMESHGUI::ActiveStudyChanged(QAD_Desktop* parent)
 {
   MESSAGE("SMESHGUI::activeStudyChanged init.");
   QAD_Study* prevStudy = 0;
@@ -740,7 +746,8 @@ void SMESHGUI::activeStudyChanged(QAD_Desktop* parent)
     //smeshGUI = 0;
     ::UpdateSelectionProp();
   }
-  MESSAGE("SMESHGUI::activeStudyChanged done.") return;
+  MESSAGE("SMESHGUI::activeStudyChanged done.");
+  return true;
 }
 
 //=============================================================================
@@ -3762,76 +3769,21 @@ void SMESHGUI::DiagonalInversion(SMESH::SMESH_Mesh_ptr aMesh,
 //=====================================================================================
 // EXPORTED METHODS
 //=====================================================================================
-extern "C"
+void SMESHGUI::SupportedViewType(int *buffer, int bufferSize)
 {
-       bool OnGUIEvent(int theCommandID, QAD_Desktop * parent)
-       {
-               return SMESHGUI::OnGUIEvent(theCommandID, parent);
-       }
-
-       bool OnKeyPress(QKeyEvent * pe, QAD_Desktop * parent,
-               QAD_StudyFrame * studyFrame)
-       {
-               return SMESHGUI::OnKeyPress(pe, parent, studyFrame);
-       }
-
-       bool OnMousePress(QMouseEvent * pe, QAD_Desktop * parent,
-               QAD_StudyFrame * studyFrame)
-       {
-               return SMESHGUI::OnMousePress(pe, parent, studyFrame);
-       }
-
-       bool OnMouseMove(QMouseEvent * pe, QAD_Desktop * parent,
-               QAD_StudyFrame * studyFrame)
-       {
-               return SMESHGUI::OnMouseMove(pe, parent, studyFrame);
-       }
-
-       bool SetSettings(QAD_Desktop * parent)
-       {
-               return SMESHGUI::SetSettings(parent);
-       }
-
-       bool customPopup(QAD_Desktop * parent, QPopupMenu * popup,
-               const QString & theContext, const QString & theParent,
-               const QString & theObject)
-       {
-               return SMESHGUI::CustomPopup(parent, popup, theContext, theParent,
-                       theObject);
-       }
-
-       void definePopup(QString & theContext, QString & theParent,
-               QString & theObject)
-       {
-               SMESHGUI::DefinePopup(theContext, theParent, theObject);
-       }
-
-       bool activeStudyChanged(QAD_Desktop * parent)
-       {
-               SMESHGUI::activeStudyChanged(parent);
-       }
-
-       void buildPresentation(const Handle(SALOME_InteractiveObject) & theIO)
-       {
-               SMESHGUI::BuildPresentation(theIO);
-       }
-
-       void supportedViewType(int *buffer, int bufferSize)
-       {
-               if (!buffer || !bufferSize)
-                       return;
-               buffer[0] = (int)VIEW_VTK;
-       }
-
-       void deactivate()
-       {
-         if ( SMESHGUI::GetSMESHGUI() ) {
-           SMESHGUI::GetSMESHGUI()->EmitSignalCloseAllDialogs();
-         }
-       }
+  if (!buffer || !bufferSize)
+    return;
+  buffer[0] = (int)VIEW_VTK;
+}
 
+void SMESHGUI::Deactivate()
+{
+  if ( SMESHGUI::GetSMESHGUI() ) {
+    SMESHGUI::GetSMESHGUI()->EmitSignalCloseAllDialogs();
+  }
 }
 
+
 //=============================================================================
 /*!
  *

diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h
index da6cb22bbbc0ad896f924754a9a37dbe78d54806..4c17a2cb632b4fdc0c0c004871c0a1ec442cf084 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.h
+++ b/src/SMESHGUI/SMESHGUI.h
@@ -35,6 +35,7 @@
 #include "SMESHDS_Document.hxx"
 
 // SALOME Includes
+#include "SALOMEGUI.h"
 #include "QAD_Desktop.h"
 #include "SALOME_Selection.h"
 #include "SALOME_InteractiveObject.hxx"
@@ -68,7 +69,7 @@ class SMESH_Actor;
 // class    : SMESHGUI
 // purpose  :
 //=================================================================================
-class SMESHGUI : public QObject
+class SMESHGUI : public SALOMEGUI
 {
   Q_OBJECT
 
@@ -108,7 +109,7 @@ private :
 
 public :
 
-  SMESHGUI();
+  SMESHGUI( const QString& name = "", QObject* parent = 0 );
   ~SMESHGUI();
 
   static SMESHGUI*    GetOrCreateSMESHGUI( QAD_Desktop* desktop );
@@ -127,25 +128,18 @@ public :
   bool                DefineDlgPosition(QWidget* aDlg, int& x, int& y) ;
 
 
-  /* Managed by IAPP */
-  Standard_EXPORT  static bool OnGUIEvent ( int theCommandID, QAD_Desktop* parent) ; 
-  Standard_EXPORT  static bool OnMousePress ( QMouseEvent* pe, QAD_Desktop* parent, 
-                                             QAD_StudyFrame* studyFrame );
-  Standard_EXPORT  static bool OnMouseMove  ( QMouseEvent* pe, QAD_Desktop* parent, 
-                                             QAD_StudyFrame* studyFrame );
-  Standard_EXPORT  static bool OnKeyPress   ( QKeyEvent* pe, QAD_Desktop* parent, 
-                                             QAD_StudyFrame* studyFrame );
-  Standard_EXPORT  static void activeStudyChanged ( QAD_Desktop* parent ); 
-  Standard_EXPORT  static bool SetSettings ( QAD_Desktop* parent );
-  Standard_EXPORT  static void DefinePopup( QString & theContext, 
-                                           QString & theParent, 
-                                           QString & theObject );
-  Standard_EXPORT  static bool CustomPopup ( QAD_Desktop* parent,
-                                            QPopupMenu* popup,
-                                            const QString& theContext,
-                                            const QString& theParent,
-                                            const QString& theObject );
-  Standard_EXPORT  static void BuildPresentation(const Handle(SALOME_InteractiveObject)&);
+  virtual bool OnGUIEvent        (int theCommandID, QAD_Desktop* parent);
+  virtual bool OnMousePress      (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
+  virtual bool OnMouseMove       (QMouseEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
+  virtual bool OnKeyPress        (QKeyEvent* pe, QAD_Desktop* parent, QAD_StudyFrame* studyFrame);
+  virtual bool ActiveStudyChanged( QAD_Desktop* parent );
+  virtual bool SetSettings       ( QAD_Desktop* parent );
+  virtual void DefinePopup       ( QString & theContext, QString & theParent, QString & theObject );
+  virtual bool CustomPopup       ( QAD_Desktop* parent, QPopupMenu* popup, const QString & theContext,
+                                   const QString & theParent, const QString & theObject );
+  virtual void BuildPresentation ( const Handle(SALOME_InteractiveObject)& theIO );
+  virtual void SupportedViewType (int* buffer, int bufferSize);
+  virtual void Deactivate        ();
 
   void OnEditDelete();