From: mzn Date: Mon, 24 Mar 2014 14:03:39 +0000 (+0000) Subject: Get rid of old display order map. X-Git-Tag: BR_hydro_v1_0_1~24 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=08a6054b6b183f0e547ae60e36a96e4bc6c8243a;p=modules%2Fhydro.git Get rid of old display order map. --- diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx index 26ee9fd7..5e03c129 100644 --- a/src/HYDROGUI/HYDROGUI_Module.cxx +++ b/src/HYDROGUI/HYDROGUI_Module.cxx @@ -186,7 +186,6 @@ bool HYDROGUI_Module::activateModule( SUIT_Study* theStudy ) foreach ( const int anId, anObsoleteIds ) { myViewManagerMap.remove( anId ); myObjectStateMap.remove( anId ); - myObjectDisplayOrderMap.remove( anId ); myShapesMap.remove( anId ); myVTKPrsMap.remove( anId ); } @@ -883,13 +882,6 @@ void HYDROGUI_Module::setObjectVisible( const int theViewId, ObjectState& anObjectState = aEntry2ObjectStateMap[ anEntry ]; anObjectState.Visibility = theState; - - // Remember the display order ( needed for Z layers assignment only ) - QStringList& anObjectEntries = myObjectDisplayOrderMap[ theViewId ]; - anObjectEntries.removeAll( anEntry ); - if ( theState ) { - anObjectEntries.append( anEntry ); - } } } @@ -1513,21 +1505,6 @@ void HYDROGUI_Module::onMouseMove( SUIT_ViewWindow* theViewWindow, QMouseEvent* } } -/** - * Get the object display order. Needed for Z layers assignment only. - */ -int HYDROGUI_Module::getObjectDisplayOrder( - const int theViewId, const Handle(HYDROData_Entity)& theObject) const -{ - if( theObject.IsNull() ) - return -1; - - QString anEntry = HYDROGUI_DataObject::dataObjectEntry( theObject ); - QStringList anObjectEntries = myObjectDisplayOrderMap.value( theViewId ); - - return anObjectEntries.indexOf( anEntry ); -} - /** * Returns stack of active operations; */ diff --git a/src/HYDROGUI/HYDROGUI_Module.h b/src/HYDROGUI/HYDROGUI_Module.h index 97ae84b0..e2dee3ee 100644 --- a/src/HYDROGUI/HYDROGUI_Module.h +++ b/src/HYDROGUI/HYDROGUI_Module.h @@ -173,9 +173,6 @@ public: */ virtual bool renameObject( const QString& theEntry, const QString& theName ); - int getObjectDisplayOrder( const int theViewId, - const Handle(HYDROData_Entity)& theObject ) const; - QStack& getActiveOperations(); HYDROGUI_Operation* activeOperation(); @@ -246,7 +243,6 @@ private: ViewManagerMap myViewManagerMap; ViewId2Entry2ObjectStateMap myObjectStateMap; - QMap myObjectDisplayOrderMap; QStack myActiveOperationMap; ViewId2ListOfShapes myShapesMap;