X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSalomeApp%2FSalomeApp_Module.cxx;h=9123d76f7084fc236ec2a537d46b4fadfa58db4d;hb=d1fdf04f4ad9507921eed78ec03edb7b5e52a6a0;hp=f62a3eca47a2b2344841e67bbb493071626ce5f9;hpb=aacd3a638816ac9cb50dfa5284090d3270105e4a;p=modules%2Fgui.git

diff --git a/src/SalomeApp/SalomeApp_Module.cxx b/src/SalomeApp/SalomeApp_Module.cxx
index f62a3eca4..9123d76f7 100644
--- a/src/SalomeApp/SalomeApp_Module.cxx
+++ b/src/SalomeApp/SalomeApp_Module.cxx
@@ -8,19 +8,19 @@
 #include "SalomeApp_Study.h"
 #include "SalomeApp_DataModel.h"
 #include "SalomeApp_Application.h"
-#include "SalomeApp_Preferences.h"
+
+#include "LightApp_Preferences.h"
 #include "SalomeApp_UpdateFlags.h"
 #include "SalomeApp_Operation.h"
 #include "SalomeApp_SwitchOp.h"
 
-#include <OB_Browser.h>
-
-#include <CAM_Study.h>
+#include "SUIT_Operation.h"
+#include "CAM_DataModel.h"
 
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include "OB_Browser.h"
 
-#include <QtxPopupMgr.h>
+#include <qstring.h>
+#include <qmap.h>
 
 #include <SVTK_ViewWindow.h>
 #include <OCCViewer_ViewWindow.h>
@@ -31,8 +31,7 @@
 
 /*!Constructor.*/
 SalomeApp_Module::SalomeApp_Module( const QString& name )
-: CAM_Module( name ),
-myPopupMgr( 0 ),
+: LightApp_Module( name ),
 mySwitchOp( 0 )
 {
 }
@@ -44,105 +43,32 @@ SalomeApp_Module::~SalomeApp_Module()
     delete mySwitchOp;
 }
 
-/*!Initialize module.*/
-void SalomeApp_Module::initialize( CAM_Application* app )
+/*!Gets application.*/
+SalomeApp_Application* SalomeApp_Module::getApp() const
 {
-  CAM_Module::initialize( app );
-
-  SUIT_ResourceMgr* resMgr = app ? app->resourceMgr() : 0;
-  if ( resMgr )
-    resMgr->raiseTranslators( name() );
+  return (SalomeApp_Application*)application();
 }
 
 /*!Activate module.*/
 bool SalomeApp_Module::activateModule( SUIT_Study* study )
 {
-  bool res = CAM_Module::activateModule( study );
-
-  if ( res && application() && application()->resourceMgr() )
-    application()->resourceMgr()->raiseTranslators( name() );
+  bool res = LightApp_Module::activateModule( study );
 
   if ( mySwitchOp == 0 )
     mySwitchOp = new SalomeApp_SwitchOp( this );
-    
+
   return res;
 }
 
 /*!Deactivate module.*/
-bool SalomeApp_Module::deactivateModule( SUIT_Study* )
+bool SalomeApp_Module::deactivateModule( SUIT_Study* study )
 {
+  bool res = LightApp_Module::deactivateModule( study );
+
   delete mySwitchOp;
   mySwitchOp = 0;
-  
-  return true;
-}
-
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::selectionChanged()
-{
-}
-
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::MenuItem()
-{
-}
-
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::windows( QMap<int, int>& ) const
-{
-}
-
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::viewManagers( QStringList& ) const
-{
-}
-
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::createPreferences()
-{
-}
-
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::preferencesChanged( const QString&, const QString& )
-{
-}
-
-/*!Gets application.*/
-SalomeApp_Application* SalomeApp_Module::getApp() const
-{
-  return (SalomeApp_Application*)application();
-}
-
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::onModelOpened()
-{
-}
 
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::onModelSaved()
-{
-}
-
-/*!NOT IMPLEMENTED*/
-void SalomeApp_Module::onModelClosed()
-{
-}
-
-/*!Gets popup manager.(create if not exist)*/
-QtxPopupMgr* SalomeApp_Module::popupMgr()
-{
-  if ( !myPopupMgr )
-    myPopupMgr = new QtxPopupMgr( 0, this );
-  return myPopupMgr;
-}
-
-/*!Gets preferences.*/
-SalomeApp_Preferences* SalomeApp_Module::preferences() const
-{
-  SalomeApp_Preferences* pref = 0;
-  if ( getApp() )
-    pref = getApp()->preferences();
-  return pref;
+  return res;
 }
 
 /*!Create new instance of data model and return it.*/
@@ -151,75 +77,6 @@ CAM_DataModel* SalomeApp_Module::createDataModel()
   return new SalomeApp_DataModel(this);
 }
 
-/*!Update object browser.*/
-void SalomeApp_Module::updateObjBrowser( bool updateDataModel, SUIT_DataObject* root )
-{
-  if( updateDataModel )
-    if( CAM_DataModel* aDataModel = dataModel() )
-      if( SalomeApp_DataModel* aModel = dynamic_cast<SalomeApp_DataModel*>( aDataModel ) )
-        aModel->update( 0, dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );
-  getApp()->objectBrowser()->updateTree( root );
-}
-
-/*!Context menu popup.*/
-void SalomeApp_Module::contextMenuPopup( const QString& client, QPopupMenu* menu, QString& /*title*/ )
-{
-  SalomeApp_Selection* sel = createSelection();
-  sel->init( client, getApp()->selectionMgr() );
-  popupMgr()->updatePopup( menu, sel );
-  delete sel;
-}
-
-/*!Create and return instance of SalomeApp_Selection.*/
-SalomeApp_Selection* SalomeApp_Module::createSelection() const
-{
-  return new SalomeApp_Selection();
-}
-
-/*!Add preference to preferences.*/
-int SalomeApp_Module::addPreference( const QString& label )
-{
-  SalomeApp_Preferences* pref = preferences();
-  if ( !pref )
-    return -1;
-
-  int catId = pref->addPreference( moduleName(), -1 );
-  if ( catId == -1 )
-    return -1;
-                             
-  return pref->addPreference( label, catId );
-}
-
-/*!Add preference to preferences.*/
-int SalomeApp_Module::addPreference( const QString& label, const int pId, const int type,
-				     const QString& section, const QString& param )
-{
-  SalomeApp_Preferences* pref = preferences();
-  if ( !pref )
-    return -1;
-
-  return pref->addPreference( moduleName(), label, pId, type, section, param );
-}
-
-/*!Gets property of preferences.*/
-QVariant SalomeApp_Module::preferenceProperty( const int id, const QString& prop ) const
-{
-  QVariant var;
-  SalomeApp_Preferences* pref = preferences();
-  if ( pref )
-    var = pref->itemProperty( id, prop );
-  return var;
-}
-
-
-/*!Set property of preferences.*/
-void SalomeApp_Module::setPreferenceProperty( const int id, const QString& prop, const QVariant& var )
-{
-  SalomeApp_Preferences* pref = preferences();
-  if ( pref )
-    pref->setItemProperty( id, prop, var );
-}
-
 /*!
  * \brief Update something in accordance with update flags
   * \param theFlags - update flags
@@ -233,8 +90,11 @@ void SalomeApp_Module::update( const int theFlags )
   if ( theFlags & UF_Model )
   {
     if( CAM_DataModel* aDataModel = dataModel() )
-      if( SalomeApp_DataModel* aModel = dynamic_cast<SalomeApp_DataModel*>( aDataModel ) )
-        aModel->update( 0, dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );
+      if( SalomeApp_DataModel* aModel = dynamic_cast<SalomeApp_DataModel*>( aDataModel ) ) {
+        SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() );
+        if (aStudy)
+          aModel->update( 0, aStudy );
+      }
   }
   if ( theFlags & UF_ObjBrowser )
     getApp()->objectBrowser()->updateTree( 0 );