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
Merge branch 'BR_HYDRO_IMPS_2016' into pre/IMPS_2016
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Module.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_Module.cxx
b/src/HYDROGUI/HYDROGUI_Module.cxx
index f8baa64dad4958f33f13aca77f8a121ee9a141ef..38090fe5441884545f6a71db1a63a3e70a8c014c 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/
src/HYDROGUI/HYDROGUI_Module.cxx
@@
-30,6
+30,7
@@
#include "HYDROGUI_Operations.h"
#include "HYDROGUI_PrsImage.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_Operations.h"
#include "HYDROGUI_PrsImage.h"
#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_VTKPrs.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_VTKPrs.h"
@@
-323,7
+324,7
@@
void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
bool anIsImageHasRefs = false;
bool anIsFusedImage = false;
bool anIsCutImage = false;
bool anIsImageHasRefs = false;
bool anIsFusedImage = false;
bool anIsCutImage = false;
- bool anIsSplit
ted
Image = false;
+ bool anIsSplitImage = false;
bool anIsMustObjectBeUpdated = false;
bool anIsPolyline = false;
bool anIsPolyline3D = false;
bool anIsMustObjectBeUpdated = false;
bool anIsPolyline = false;
bool anIsPolyline3D = false;
@@
-423,7
+424,7
@@
void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
else if( anOperatorName == ImageComposer_CutOperator::Type() )
anIsCutImage = true;
else if( anOperatorName == ImageComposer_CropOperator::Type() )
else if( anOperatorName == ImageComposer_CutOperator::Type() )
anIsCutImage = true;
else if( anOperatorName == ImageComposer_CropOperator::Type() )
- anIsSplit
ted
Image = true;
+ anIsSplitImage = true;
}
}
}
}
}
}
@@
-475,7
+476,7
@@
void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
anIsDigue = true;
else if( anObjectKind == KIND_DUMMY_3D )
anIsDummyObject3D = true;
anIsDigue = true;
else if( anObjectKind == KIND_DUMMY_3D )
anIsDummyObject3D = true;
- else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLIT
TED
_GROUP )
+ else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLIT_GROUP )
anIsGroup = true;
}
anIsGroup = true;
}
@@
-570,8
+571,8
@@
void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
theMenu->addAction( action( EditFusedImageId ) );
else if( anIsCutImage )
theMenu->addAction( action( EditCutImageId ) );
theMenu->addAction( action( EditFusedImageId ) );
else if( anIsCutImage )
theMenu->addAction( action( EditCutImageId ) );
- else if( anIsSplit
ted
Image )
- theMenu->addAction( action( EditSplit
ted
ImageId ) );
+ else if( anIsSplitImage )
+ theMenu->addAction( action( EditSplitImageId ) );
}
//RKV: BUG#98: theMenu->addAction( action( ObserveImageId ) );
}
//RKV: BUG#98: theMenu->addAction( action( ObserveImageId ) );
@@
-678,9
+679,11
@@
void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
theMenu->addSeparator();
theMenu->addAction( action( SplitLandCoverId ) );
theMenu->addAction( action( MergeLandCoverId ) );
theMenu->addSeparator();
theMenu->addAction( action( SplitLandCoverId ) );
theMenu->addAction( action( MergeLandCoverId ) );
+ theMenu->addAction( action( ChangeLandCoverTypeId ) );
theMenu->addSeparator();
//
theMenu->addAction( action( ExportToShapeFileID ) );
theMenu->addSeparator();
//
theMenu->addAction( action( ExportToShapeFileID ) );
+ theMenu->addSeparator();
}
else if( anIsVisualState && anIsObjectBrowser )
{
}
else if( anIsVisualState && anIsObjectBrowser )
{
@@
-701,6
+704,13
@@
void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
theMenu->addAction( action( SetColorId ) );
theMenu->addSeparator();
}
theMenu->addAction( action( SetColorId ) );
theMenu->addSeparator();
}
+
+ // Add transparency action for land cover map objects
+ if ( anIsLandCoverMap )
+ {
+ theMenu->addAction( action( SetTransparencyId ) );
+ theMenu->addSeparator();
+ }
} else if ( anAllAreProfiles ) {
theMenu->addAction( action( SelectedGeoreferencementId ) );
theMenu->addSeparator();
} else if ( anAllAreProfiles ) {
theMenu->addAction( action( SelectedGeoreferencementId ) );
theMenu->addSeparator();
@@
-1079,10
+1089,13
@@
void HYDROGUI_Module::setObjectVisible( const int theViewId,
if ( hydroObject )
{
SUIT_AbstractModel* treeModel = dynamic_cast<SUIT_AbstractModel*>( getApp()->objectBrowser()->model() );
if ( hydroObject )
{
SUIT_AbstractModel* treeModel = dynamic_cast<SUIT_AbstractModel*>( getApp()->objectBrowser()->model() );
- QString id = hydroObject->text( hydroObject->customData( Qtx::IdType ).toInt() );
- Qtx::VisibilityState visState = treeModel->visibilityState( id );
- if ( visState != Qtx::UnpresentableState )
+ if ( treeModel )
+ {
+ QString id = hydroObject->text( hydroObject->customData( Qtx::IdType ).toInt() );
+ Qtx::VisibilityState visState = treeModel->visibilityState( id );
+ if ( visState != Qtx::UnpresentableState )
treeModel->setVisibilityState( id, theState ? Qtx::ShownState : Qtx::HiddenState );
treeModel->setVisibilityState( id, theState ? Qtx::ShownState : Qtx::HiddenState );
+ }
}
if ( theObject->GetKind() == KIND_BATHYMETRY && theState ) {
}
if ( theObject->GetKind() == KIND_BATHYMETRY && theState ) {
@@
-1808,7
+1821,7
@@
void HYDROGUI_Module::onObjectClicked( SUIT_DataObject* theObject, int theColumn
setObjectVisible( HYDROGUI_Tool::GetActiveViewId( this ), hydroObject->modelObject(), vis );
setObjectVisible( HYDROGUI_Tool::GetActiveViewId( this ), hydroObject->modelObject(), vis );
- update( UF_OCCViewer | ( visState == Qtx::ShownState ? UF_FitAll : 0 ) );
+ update( UF_OCCViewer |
UF_VTKViewer |
( visState == Qtx::ShownState ? UF_FitAll : 0 ) );
}
Handle(HYDROData_StricklerTable) HYDROGUI_Module::getLandCoverColoringTable( const int theViewId ) const
}
Handle(HYDROData_StricklerTable) HYDROGUI_Module::getLandCoverColoringTable( const int theViewId ) const