refs #525: autocolor of zones in a calculation case.

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
index 58ca39f3bcef537c399e36802742ff456b55668e..6a28b63737811f8a6b2001d00188982451c4f65c 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportImageOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,6 +23,7 @@
 #include "HYDROGUI_ImportImageOp.h"
 
 #include "HYDROGUI_DataModel.h"
+#include <HYDROGUI_DataObject.h>
 #include "HYDROGUI_ImportImageDlg.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_PrsImage.h"
@@ -344,7 +345,8 @@ bool HYDROGUI_ImportImageOp::checkPoints( const QPointF& thePointA,
 }
 
 bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
-                                           QString& theErrorMsg )
+                                           QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_ImportImageDlg* aPanel = (HYDROGUI_ImportImageDlg*)inputPanel();
 
@@ -446,7 +448,11 @@ bool HYDROGUI_ImportImageOp::processApply( int& theUpdateFlags,
   if( myIsEdit )
     anImageObj = myEditedObject;
   else
+  {
     anImageObj = Handle(HYDROData_Image)::DownCast( doc()->CreateObject( KIND_IMAGE ) );
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( anImageObj );
+    theBrowseObjectsEntries.append( anEntry );
+  }
 
   if( anImageObj.IsNull() )
     return false;
@@ -609,7 +615,12 @@ void HYDROGUI_ImportImageOp::onCreatePreview( QImage theImage )
 
           aViewPort->addItem( myPreviewPrs );
           aViewPort->fitAll();
-
+          
+          if ( myEditedObject ) {
+            size_t aViewId = (size_t)aViewer;
+            module()->setObjectVisible( aViewId, myEditedObject, true );
+          }
+          
           myPreviewPrs->setIsTransformationPointPreview( true );
         }
         connect( aViewer, SIGNAL( selectionChanged( GV_SelectionChangeStatus ) ),
@@ -732,9 +743,13 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
   if( !aViewPort )
     return;
 
+  size_t aViewId = (size_t)myRefViewManager->getViewer();
+
   // Remove the old presentation of the reference image if any
   if( myRefPreviewPrs )
   {
+    module()->setObjectVisible( aViewId, myRefPreviewPrs->getObject(), false );
+
     myRefPreviewPrs->setCaption( QString() );
     aViewPort->removeItem( myRefPreviewPrs );
 
@@ -761,6 +776,8 @@ void HYDROGUI_ImportImageOp::onRefImageActivated( const QString& theName )
 
     // Add the new reference image presentation to the appropriate view
     aViewPort->addItem( myRefPreviewPrs );
+
+    module()->setObjectVisible( aViewId, anImageObj, true );
   }
 
   aViewPort->fitAll();