Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quick optimization patch (bytearray for images)
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_LandCoverMapOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
index 3f54816fdc09b1c7a81bf4016691cd9454b9d499..16162cfbc943f4302de60bbe10895303f2cf1ca0 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
@@
-40,6
+40,7
@@
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewManager.h>
+#include <SalomeApp_Study.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_DataOwner.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_DataOwner.h>
@@
-154,9
+155,13
@@
void HYDROGUI_LandCoverMapOp::abortOperation()
{
closePreview();
{
closePreview();
+ bool aNoActiveOps = module()->getActiveOperations().isEmpty();
+
HYDROGUI_Operation::abortOperation();
HYDROGUI_Operation::abortOperation();
- module()->update( UF_OCCViewer | UF_FitAll );
+ SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( module()->getApp()->activeStudy() );
+ if ( aStudy && !aNoActiveOps )
+ module()->update( UF_OCCViewer | UF_FitAll );
}
void HYDROGUI_LandCoverMapOp::commitOperation()
}
void HYDROGUI_LandCoverMapOp::commitOperation()
@@
-371,6
+376,9
@@
bool HYDROGUI_LandCoverMapOp::processApply( int& theUpdateFlags,
if ( myOperationId == CreateLandCoverMapId )
module()->enableLCMActions();
if ( myOperationId == CreateLandCoverMapId )
module()->enableLCMActions();
+ if ( myOperationId == RemoveLandCoverId || myOperationId == MergeLandCoverId || myOperationId == ChangeLandCoverTypeId )
+ aPanel->updateSelectedLandCoversLabel( getNbSelected() );
+
return true;
}
return true;
}