From: mkr <mkr@opencascade.com>
Date: Tue, 24 Nov 2015 10:03:58 +0000 (+0300)
Subject: refs #748: fix error, when included objects are not shown during calculation case... 
X-Git-Tag: v1.5~6^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=515a4d6056e4c2bf473dd118e5dba4ca49fae34b;p=modules%2Fhydro.git

refs #748: fix error, when included objects are not shown during calculation case creation.
---

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 2cfd445d..b06fbb3b 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -166,6 +166,8 @@ void HYDROGUI_CalculationOp::startOperation()
   aPanel->setObjectName( anObjectName );
   aPanel->setEditedObject( myEditedObject );
 
+  setGeomObjectsVisible( true );
+
   createPreview( false );
 }
 
diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
index 4b095607..16162cfb 100644
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
@@ -155,10 +155,12 @@ void HYDROGUI_LandCoverMapOp::abortOperation()
 {
   closePreview();
 
+  bool aNoActiveOps = module()->getActiveOperations().isEmpty();
+
   HYDROGUI_Operation::abortOperation();
 
   SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( module()->getApp()->activeStudy() );
-  if ( aStudy )
+  if ( aStudy && !aNoActiveOps )
     module()->update( UF_OCCViewer | UF_FitAll );
 }