#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"
bool anIsImageHasRefs = false;
bool anIsFusedImage = false;
bool anIsCutImage = false;
- bool anIsSplittedImage = false;
+ bool anIsSplitImage = false;
bool anIsMustObjectBeUpdated = false;
bool anIsPolyline = false;
bool anIsPolyline3D = false;
else if( anOperatorName == ImageComposer_CutOperator::Type() )
anIsCutImage = true;
else if( anOperatorName == ImageComposer_CropOperator::Type() )
- anIsSplittedImage = true;
+ anIsSplitImage = true;
}
}
}
anIsDigue = true;
else if( anObjectKind == KIND_DUMMY_3D )
anIsDummyObject3D = true;
- else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLITTED_GROUP )
+ else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLIT_GROUP )
anIsGroup = true;
}
theMenu->addAction( action( EditFusedImageId ) );
else if( anIsCutImage )
theMenu->addAction( action( EditCutImageId ) );
- else if( anIsSplittedImage )
- theMenu->addAction( action( EditSplittedImageId ) );
+ else if( anIsSplitImage )
+ theMenu->addAction( action( EditSplitImageId ) );
}
//RKV: BUG#98: theMenu->addAction( action( ObserveImageId ) );
theMenu->addSeparator();
//
theMenu->addAction( action( ExportToShapeFileID ) );
+ theMenu->addSeparator();
}
else if( anIsVisualState && anIsObjectBrowser )
{
if ( anIsObjectCanBeColored )
{
theMenu->addAction( action( SetColorId ) );
- if ( anIsLandCoverMap )
- theMenu->addAction( action( SetTransparencyId ) );
+ theMenu->addSeparator();
+ }
+
+ // Add transparency action for land cover map objects
+ if ( anIsLandCoverMap )
+ {
+ theMenu->addAction( action( SetTransparencyId ) );
theMenu->addSeparator();
}
} else if ( anAllAreProfiles ) {
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 );
+ }
}
if ( theObject->GetKind() == KIND_BATHYMETRY && theState ) {
}
else if( theViewManager->getType() == OCCViewer_Viewer::Type() )
{
+ OCCViewer_ViewManager* mgr = dynamic_cast<OCCViewer_ViewManager*>( theViewManager );
+ mgr->setChainedOperations( true );//TODO: via preferences
+
connect( theViewManager, SIGNAL( viewCreated( SUIT_ViewWindow* ) ),
this, SLOT( onViewCreated( SUIT_ViewWindow* ) ) );
connect( theViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
aViewFrame->installEventFilter( this );
GraphicsView_ViewPort* aViewPort = aViewFrame->getViewPort();
+ aViewPort->setInteractionFlag( GraphicsView_ViewPort::GlobalWheelScaling );
connect( aViewPort, SIGNAL( vpMouseEvent( QGraphicsSceneMouseEvent* ) ),
this, SLOT( onViewPortMouseEvent( QGraphicsSceneMouseEvent* ) ) );
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