HYDRO Feature 1: Import images (T 1.3)

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Tool.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Tool.cxx b/src/HYDROGUI/HYDROGUI_Tool.cxx
index 39b6bb97dcbed1f0dbe1a38023ca1a3238b99643..b30f5ec8372fe6bc91e4fbfde74ee7ac99246193 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Tool.cxx
+++ b/src/HYDROGUI/HYDROGUI_Tool.cxx
@@ -152,6 +152,14 @@ void HYDROGUI_Tool::DoubleToLambert( const double theCoord,
   theSeconds = aRemainder - theMinutes * 60;
 }
 
+bool HYDROGUI_Tool::IsEqual( const Handle(HYDROData_Object)& theObj1,
+                             const Handle(HYDROData_Object)& theObj2 )
+{
+  if( !theObj1.IsNull() && !theObj2.IsNull() )
+    return theObj1->Label() == theObj2->Label(); //ouv: check that the names can be used here
+  return false;
+}
+
 void HYDROGUI_Tool::SetActiveViewManager( HYDROGUI_Module* theModule,
                                           SUIT_ViewManager* theViewManager )
 {
@@ -197,7 +205,7 @@ HYDROGUI_Prs* HYDROGUI_Tool::GetPresentation( const Handle(HYDROData_Object)& th
       if( HYDROGUI_Prs* aPrs = dynamic_cast<HYDROGUI_Prs*>( anIter.next() ) )
       {
         Handle(HYDROData_Object) anObj = aPrs->getObject();
-        if( !anObj.IsNull() && anObj->Label() == theObj->Label() )
+        if( IsEqual( anObj, theObj ) )
           return aPrs;
       }
     }
@@ -288,21 +296,21 @@ QString HYDROGUI_Tool::GenerateObjectName( HYDROGUI_Module* theModule,
   return aName;
 }
 
-int HYDROGUI_Tool::GetActiveGraphicsViewId( HYDROGUI_Module* theModule )
+size_t HYDROGUI_Tool::GetActiveGraphicsViewId( HYDROGUI_Module* theModule )
 {
-  int aViewId = 0;
+  size_t aViewId = 0;
   SUIT_ViewManager* aViewMgr = theModule->getApp()->activeViewManager();
   if( !aViewMgr || aViewMgr->getType() != GraphicsView_Viewer::Type() )
     return aViewId;
 
   if( SUIT_ViewModel* aViewer = aViewMgr->getViewModel() )
-    aViewId = (int)aViewer;
+    aViewId = (size_t)aViewer;
   return aViewId;
 }
 
-QList<int> HYDROGUI_Tool::GetGraphicsViewIdList( HYDROGUI_Module* theModule )
+QList<size_t> HYDROGUI_Tool::GetGraphicsViewIdList( HYDROGUI_Module* theModule )
 {
-  QList<int> aList;
+  QList<size_t> aList;
   ViewManagerList aViewMgrs;
   theModule->getApp()->viewManagers( GraphicsView_Viewer::Type(), aViewMgrs );
   QListIterator<SUIT_ViewManager*> anIter( aViewMgrs );
@@ -311,7 +319,7 @@ QList<int> HYDROGUI_Tool::GetGraphicsViewIdList( HYDROGUI_Module* theModule )
     if( SUIT_ViewManager* aViewMgr = anIter.next() )
     {
       if( SUIT_ViewModel* aViewer = aViewMgr->getViewModel() )
-        aList.append( (int)aViewer );
+        aList.append( (size_t)aViewer );
     }
   }
   return aList;