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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 2cfd445de581bb468578876ac23992711f01a680..b06fbb3b80eb9a134167b908e68ce5089de34b51 100644 (file)
--- 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 4b095607e27d3c87fb93c887c2a0b22d8c020c6d..16162cfbc943f4302de60bbe10895303f2cf1ca0 100644 (file)
--- 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 );
 }