#include <OCCViewer_ViewManager.h>
+#include <SalomeApp_Study.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_DataOwner.h>
{
closePreview();
+ bool aNoActiveOps = module()->getActiveOperations().isEmpty();
+
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()
// Split land cover(s) inside edited land cover map
if ( myOperationId == SplitLandCoverId )
{
- bool aLandCoverSplitted = false;
+ bool aLandCoverSplit = false;
if ( !aPolyline.IsNull() )
- aLandCoverSplitted = aLandCoverMapObj->Split( aPolyline );
+ aLandCoverSplit = aLandCoverMapObj->Split( aPolyline );
else if ( !aFace.IsNull() )
{
// Get the complete boundary of the object face as the splitting polyline
continue;
bool aSplitResult = aLandCoverMapObj->Split( aShape );
- aLandCoverSplitted = ( i==0 ? aSplitResult : aLandCoverSplitted && aSplitResult );
+ aLandCoverSplit = ( i==0 ? aSplitResult : aLandCoverSplit && aSplitResult );
}
}
- if ( !aLandCoverSplitted )
+ if ( !aLandCoverSplit )
{
- theErrorMsg = tr( "LAND_COVER_NOT_SPLITTED" );
+ theErrorMsg = tr( "LAND_COVER_NOT_SPLIT" );
return false;
}
}
if ( myOperationId == CreateLandCoverMapId )
module()->enableLCMActions();
+ if ( myOperationId == RemoveLandCoverId || myOperationId == MergeLandCoverId || myOperationId == ChangeLandCoverTypeId )
+ aPanel->updateSelectedLandCoversLabel( getNbSelected() );
+
return true;
}