From: nds Date: Mon, 19 Sep 2005 06:03:37 +0000 (+0000) Subject: Use some classes of library LightApp instead of classes in library SalomeApp X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=454214b7ff626549645b1b5e3b84ae87fcac536b;p=modules%2Fgeom.git Use some classes of library LightApp instead of classes in library SalomeApp (DataOwner, DataSubOwner, Selection, SelectionMgr, VTKSelector, OCCSelector, Preferences) --- diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx index e9f04b036..c8604d3ce 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx @@ -1,6 +1,6 @@ #include "GEOMGUI_OCCSelector.h" -#include +#include #include @@ -26,7 +26,7 @@ // Purpose : //================================================================ GEOMGUI_OCCSelector::GEOMGUI_OCCSelector( OCCViewer_Viewer* viewer, SUIT_SelectionMgr* mgr ) -: SalomeApp_OCCSelector( viewer, mgr ) +: LightApp_OCCSelector( viewer, mgr ) { } @@ -79,11 +79,11 @@ void GEOMGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const if ( !entryStr.isEmpty() ) { - SalomeApp_DataOwner* owner; + LightApp_DataOwner* owner; if ( index > -1 ) // Local Selection - owner = new SalomeApp_DataSubOwner( entryStr, index ); + owner = new LightApp_DataSubOwner( entryStr, index ); else // Global Selection - owner = new SalomeApp_DataOwner( entryStr ); + owner = new LightApp_DataOwner( entryStr ); aList.append( SUIT_DataOwnerPtr( owner ) ); } @@ -99,7 +99,7 @@ void GEOMGUI_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const if ( !entryStr.isEmpty() ) { - SalomeApp_DataOwner* owner = new SalomeApp_DataOwner( entryStr ); + LightApp_DataOwner* owner = new LightApp_DataOwner( entryStr ); aList.append( SUIT_DataOwnerPtr( owner ) ); } } @@ -168,7 +168,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList ) // "entry - to - list_of_ids" map for ( SUIT_DataOwnerPtrList::const_iterator itr = aList.begin(); itr != aList.end(); ++itr ) { - const SalomeApp_DataSubOwner* subOwner = dynamic_cast( (*itr).operator->() ); + const LightApp_DataSubOwner* subOwner = dynamic_cast( (*itr).operator->() ); if ( subOwner ) { QString entry = subOwner->entry(); @@ -191,7 +191,7 @@ void GEOMGUI_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList ) } else // the owner is NOT a sub owner, maybe it is a DataOwner == GLOBAL selection { - const SalomeApp_DataOwner* owner = dynamic_cast( (*itr).operator->() ); + const LightApp_DataOwner* owner = dynamic_cast( (*itr).operator->() ); if ( owner ) { globalSelMap[owner->entry()] = 1; diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.h b/src/GEOMGUI/GEOMGUI_OCCSelector.h index 70ab0b77c..dbcdc0cd5 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.h +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.h @@ -1,9 +1,9 @@ #ifndef GEOMGUI_OCCSELECTOR_H #define GEOMGUI_OCCSELECTOR_H -#include +#include -class GEOMGUI_OCCSelector : public SalomeApp_OCCSelector +class GEOMGUI_OCCSelector : public LightApp_OCCSelector { public: GEOMGUI_OCCSelector( OCCViewer_Viewer*, SUIT_SelectionMgr* ); diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx index c7494b8c7..cf51829ca 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.cxx +++ b/src/GEOMGUI/GEOMGUI_Selection.cxx @@ -3,7 +3,7 @@ #include "GeometryGUI.h" #include "GEOM_Displayer.h" -#include +#include #include #include @@ -47,8 +47,8 @@ GEOMGUI_Selection::~GEOMGUI_Selection() QtxValue GEOMGUI_Selection::globalParam( const QString& p ) const { if ( p == "isOCC" ) return QtxValue( activeViewType() == OCCViewer_Viewer::Type() ); - - return SalomeApp_Selection::globalParam( p ); + + return LightApp_Selection::globalParam( p ); } QtxValue GEOMGUI_Selection::param( const int ind, const QString& p ) const @@ -57,7 +57,7 @@ QtxValue GEOMGUI_Selection::param( const int ind, const QString& p ) const else if ( p == "type" ) return QtxValue( typeName( ind ) ); else if ( p == "displaymode" ) return QtxValue( displayMode( ind ) ); - return SalomeApp_Selection::param( ind, p ); + return LightApp_Selection::param( ind, p ); } QString GEOMGUI_Selection::typeName( const int index ) const diff --git a/src/GEOMGUI/GEOMGUI_Selection.h b/src/GEOMGUI/GEOMGUI_Selection.h index 0a6f9f217..fe7a6bc9a 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.h +++ b/src/GEOMGUI/GEOMGUI_Selection.h @@ -29,12 +29,12 @@ #ifndef GEOMGUI_SELECTION_HeaderFile #define GEOMGUI_SELECTION_HeaderFile -#include +#include #include #include CORBA_SERVER_HEADER(GEOM_Gen) -class GEOMGUI_Selection : public SalomeApp_Selection +class GEOMGUI_Selection : public LightApp_Selection { public: GEOMGUI_Selection(); diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 26313ac05..22aa8e573 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include @@ -879,7 +879,7 @@ void GEOM_Displayer::LocalSelection( const Handle(SALOME_InteractiveObject)& the if ( !app ) return; - SalomeApp_SelectionMgr* sm = app->selectionMgr(); + LightApp_SelectionMgr* sm = app->selectionMgr(); // remove all filters from selection sm->clearFilters(); @@ -930,7 +930,7 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes, vf->GlobalSelection( update ); // Set selection filters in accordance with current mode - SalomeApp_SelectionMgr* sm = app->selectionMgr(); + LightApp_SelectionMgr* sm = app->selectionMgr(); if ( !sm ) return; @@ -1103,7 +1103,7 @@ bool GEOM_Displayer::ToActivate() const * Removes from selection temporary objects */ //================================================================= -void GEOM_Displayer::clearTemporary( SalomeApp_SelectionMgr* theSelMgr ) +void GEOM_Displayer::clearTemporary( LightApp_SelectionMgr* theSelMgr ) { SALOME_ListIO selected, toSelect; theSelMgr->selectedObjects( selected ); diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index 18be72e31..e69741010 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -48,7 +48,7 @@ typedef std::list ObjectList; class TColStd_MapOfInteger; -class SalomeApp_SelectionMgr; +class LightApp_SelectionMgr; class SalomeApp_Study; class SUIT_SelectionFilter; //class SALOME_Selection; @@ -171,7 +171,7 @@ protected: /* Resets internal data */ void internalReset(); - void clearTemporary( SalomeApp_SelectionMgr* theSelMgr ); + void clearTemporary( LightApp_SelectionMgr* theSelMgr ); SUIT_SelectionFilter* getFilter( const int theMode ); diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 4f72ceb79..dac519fbe 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -47,10 +47,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -1102,7 +1102,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) it.data()->activate( application()->desktop() ); - SalomeApp_SelectionMgr* sm = getApp()->selectionMgr(); + LightApp_SelectionMgr* sm = (LightApp_SelectionMgr*)getApp()->selectionMgr(); SUIT_ViewManager* vm; ViewManagerList OCCViewManagers, VTKViewManagers; application()->viewManagers( OCCViewer_Viewer::Type(), OCCViewManagers ); @@ -1110,7 +1110,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) ); application()->viewManagers( VTKViewer_Viewer::Type(), VTKViewManagers ); for ( vm = VTKViewManagers.first(); vm; vm = VTKViewManagers.next() ) - myVTKSelectors.append( new SalomeApp_VTKSelector( (SVTK_Viewer*)vm->getViewModel(), sm ) ); + myVTKSelectors.append( new LightApp_VTKSelector( (SVTK_Viewer*)vm->getViewModel(), sm ) ); // disable OCC selectors getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() ); @@ -1119,7 +1119,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) // disable VTK selectors getApp()->selectionMgr()->setEnabled( false, VTKViewer_Viewer::Type() ); - for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) + for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) sr->setEnabled(true); return true; @@ -1509,7 +1509,7 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm ) { if ( vm->getType() == OCCViewer_Viewer::Type() ) { - SalomeApp_SelectionMgr* sm = getApp()->selectionMgr(); + LightApp_SelectionMgr* sm = (LightApp_SelectionMgr*)getApp()->selectionMgr(); myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) ); // disable OCC selectors @@ -1519,12 +1519,12 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm ) } else if ( vm->getType() == VTKViewer_Viewer::Type() ) { - SalomeApp_SelectionMgr* sm = getApp()->selectionMgr(); - myVTKSelectors.append( new SalomeApp_VTKSelector( (SVTK_Viewer*)vm->getViewModel(), sm ) ); + LightApp_SelectionMgr* sm = (LightApp_SelectionMgr*)getApp()->selectionMgr(); + myVTKSelectors.append( new LightApp_VTKSelector( (SVTK_Viewer*)vm->getViewModel(), sm ) ); // disable VTK selectors getApp()->selectionMgr()->setEnabled( false, VTKViewer_Viewer::Type() ); - for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) + for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) sr->setEnabled(true); } } @@ -1543,7 +1543,7 @@ void GeometryGUI::onViewManagerRemoved( SUIT_ViewManager* vm ) } if ( vm->getType() == VTKViewer_Viewer::Type() ) { - for ( SalomeApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) + for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) if ( sr->viewer() == viewer ) { myVTKSelectors.remove( sr ); @@ -1559,7 +1559,7 @@ QString GeometryGUI::engineIOR() const return QString( "" ); } -SalomeApp_Selection* GeometryGUI::createSelection() const +LightApp_Selection* GeometryGUI::createSelection() const { return new GEOMGUI_Selection(); } @@ -1585,11 +1585,11 @@ void GeometryGUI::createPreferences() int genGroup = addPreference( tr( "PREF_GROUP_GENERAL" ), tabId ); addPreference( tr( "PREF_SHADING_COLOR" ), genGroup, - SalomeApp_Preferences::Color, "Geometry", "shading_color" ); + LightApp_Preferences::Color, "Geometry", "shading_color" ); int step = addPreference( tr( "PREF_STEP_VALUE" ), genGroup, - SalomeApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" ); + LightApp_Preferences::IntSpin, "Geometry", "SettingsGeomStep" ); int dispmode = addPreference( tr( "PREF_DISPLAY_MODE" ), genGroup, - SalomeApp_Preferences::Selector, "Geometry", "display_mode" ); + LightApp_Preferences::Selector, "Geometry", "display_mode" ); setPreferenceProperty( genGroup, "columns", 1 ); diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index 854dbc615..625731f7f 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -70,7 +70,8 @@ typedef QMap GUIMap; class QDialog; class QPopupMenu; class GEOMGUI_OCCSelector; -class SalomeApp_VTKSelector; +class LightApp_VTKSelector; +class LightApp_Selection; class SUIT_ViewManager; //================================================================================= @@ -156,7 +157,7 @@ signals : void SignalDefaultStepValueChanged( double newVal ); protected: - virtual SalomeApp_Selection* createSelection() const; + virtual LightApp_Selection* createSelection() const; private: GEOMGUI* getLibrary( const QString& libraryName ); @@ -180,7 +181,7 @@ private: QMap myRules; // popup rules QPtrList myOCCSelectors; - QPtrList myVTKSelectors; + QPtrList myVTKSelectors; }; #endif