#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_SetColorOp.h"
#include "HYDROGUI_ImportGeomObjectOp.h"
#include "HYDROGUI_ShowHideOp.h"
+#include "HYDROGUI_Overview.h"
#include <HYDROData_Tool.h>
#include <HYDROData_Image.h>
: LightApp_Module( "HYDRO" ),
myDisplayer( 0 ),
myOCCDisplayer( 0 ),
- myIsUpdateEnabled( true )
+ myIsUpdateEnabled( true ),
+ myOverview( 0 )
{
}
ViewManagerList anOCCViewManagers;
anApp->viewManagers( OCCViewer_Viewer::Type(), anOCCViewManagers );
- foreach ( const SUIT_ViewManager* aViewManager, anOCCViewManagers ) {
+
+ foreach ( const SUIT_ViewManager* aViewManager, anOCCViewManagers )
+ {
connect( aViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
- foreach( SUIT_ViewWindow* aViewWindow, aViewManager->getViews() ) {
+ connect( aViewManager, SIGNAL( activated( SUIT_ViewManager* ) ),
+ this, SLOT( onViewActivated( SUIT_ViewManager* ) ) );
+
+ foreach( SUIT_ViewWindow* aViewWindow, aViewManager->getViews() )
+ {
OCCViewer_ViewFrame* aViewFrame = dynamic_cast<OCCViewer_ViewFrame*>( aViewWindow );
- if ( aViewFrame && aViewFrame->getViewPort() ) {
+ if ( aViewFrame && aViewFrame->getViewPort() )
+ {
aViewFrame->getViewPort()->installEventFilter( this );
}
}
void HYDROGUI_Module::windows( QMap<int, int>& theMap ) const
{
+ static bool inWindows = false;
+ if( inWindows )
+ return;
+
theMap.clear();
theMap.insert( LightApp_Application::WT_LogWindow, Qt::BottomDockWidgetArea );
#ifndef DISABLE_PYCONSOLE
theMap.insert( LightApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
#endif
theMap.insert( LightApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+ theMap.insert( OverviewWindow, Qt::LeftDockWidgetArea );
+
+ inWindows = true;
+ LightApp_Application* app = getApp();
+ if( app && app->getWindow( OverviewWindow )==0 )
+ {
+ const_cast<HYDROGUI_Module*>( this )->myOverview =
+ new HYDROGUI_Overview( tr( "OVERVIEW" ), 0, app->desktop() );
+ myOverview->setGeometry( 0, 0, 320, 240 );
+ app->insertDockWindow( OverviewWindow, myOverview );
+ }
+ inWindows = false;
}
void HYDROGUI_Module::viewManagers( QStringList& theTypesList ) const
bool anIsImageHasRefs = false;
bool anIsFusedImage = false;
bool anIsCutImage = false;
- bool anIsSplittedImage = false;
+ bool anIsSplitImage = false;
bool anIsMustObjectBeUpdated = false;
bool anIsPolyline = false;
bool anIsPolyline3D = false;
bool anIsZone = false;
bool anIsObstacle = false;
bool anIsStricklerTable = false;
- bool anIsLandCover = false;
+ bool anIsLandCoverMap = false;
bool anIsStream = false;
bool anIsChannel = false;
bool anIsDigue = false;
anIsVisibleInSelection |= aVisibility;
anIsHiddenInSelection |= !aVisibility;
- if ( anObject->CanBeUpdated() && anObject->IsMustBeUpdated() )
+ if ( anObject->CanBeUpdated() && anObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) )
{
anIsMustObjectBeUpdated = true;
}
else if( anOperatorName == ImageComposer_CutOperator::Type() )
anIsCutImage = true;
else if( anOperatorName == ImageComposer_CropOperator::Type() )
- anIsSplittedImage = true;
+ anIsSplitImage = true;
}
}
}
anIsObstacle = true;
else if( anObjectKind == KIND_STRICKLER_TABLE )
anIsStricklerTable = true;
- else if( anObjectKind == KIND_LAND_COVER )
- anIsLandCover = true;
+ else if( anObjectKind == KIND_LAND_COVER_MAP )
+ anIsLandCoverMap = true;
else if( anObjectKind == KIND_STREAM )
{
anIsStream = 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;
}
case KIND_STRICKLER_TABLE:
theMenu->addAction( action( ImportStricklerTableFromFileId ) );
break;
- case KIND_LAND_COVER:
- theMenu->addAction( action( CreateLandCoverId ) );
+ case KIND_LAND_COVER_MAP:
+ theMenu->addAction( action( CreateLandCoverMapId ) );
+ theMenu->addAction( action( ImportLandCoverMapId ) );
break;
case KIND_CALCULATION:
theMenu->addAction( action( CreateCalculationId ) );
break;
case KIND_POLYLINEXY:
+ theMenu->addAction( action( ImportPolylineId ) );
theMenu->addAction( action( CreatePolylineId ) );
break;
case KIND_POLYLINE:
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->addAction( action( EditPolylineId ) );
theMenu->addSeparator();
+ theMenu->addAction( action( SplitPolylinesId ) );
+ theMenu->addAction( action( MergePolylinesId ) );
+ theMenu->addSeparator();
}
else if( anIsPolyline3D )
{
theMenu->addAction( action( DuplicateStricklerTableId ) );
theMenu->addSeparator();
- if ( !isLandCoversScalarMapModeOn( anActiveViewId ) ) {
+ Handle(HYDROData_StricklerTable) aTable =
+ Handle(HYDROData_StricklerTable)::DownCast( aSeq.First() );
+ QString aCurrentTable =
+ HYDROGUI_DataObject::dataObjectEntry( getLandCoverColoringTable( anActiveViewId ) );
+ bool isUsed = aCurrentTable == HYDROGUI_DataObject::dataObjectEntry( aTable );
+
+ if ( !isUsed && !getObjectShapes( anActiveViewId, KIND_LAND_COVER_MAP ).isEmpty() ) {
theMenu->addAction( action( LandCoverScalarMapModeOnId ) );
theMenu->addSeparator();
}
}
- else if( anIsLandCover )
+ else if( anIsLandCoverMap )
{
- theMenu->addAction( action( EditLandCoverId ) );
+ theMenu->addAction( action( AddLandCoverId ) );
+ theMenu->addAction( action( RemoveLandCoverId ) );
+ theMenu->addSeparator();
+ theMenu->addAction( action( SplitLandCoverId ) );
+ theMenu->addAction( action( MergeLandCoverId ) );
+ theMenu->addAction( action( ChangeLandCoverTypeId ) );
+ theMenu->addSeparator();
+ //
+ theMenu->addAction( action( ExportToShapeFileID ) );
theMenu->addSeparator();
}
else if( anIsVisualState && anIsObjectBrowser )
theMenu->addSeparator();
}
+ if ( anIsStream || anIsChannel || anIsDigue || anIsObstacle )
+ {
+ theMenu->addAction( action( PolylineExtractionId ) );
+ theMenu->addSeparator();
+ }
+
// Add set color action for geometrical objects
if ( anIsObjectCanBeColored )
{
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();
}
- if (anIsPolyline || anIsPolyline3D)
- theMenu->addAction( action( ExportPolylineId ) );
+ bool anIsPoly = anIsPolyline || anIsPolyline3D;
+ if (anIsPoly && !anIsLandCoverMap)
+ theMenu->addAction( action( ExportToShapeFileID ) );
// Add copy action
QAction* aCopyAction = action( CopyId );
anIsImmersibleZone || anIsZone || anIsRegion ||
anIsBathymetry || anIsObstacle || anIsStream ||
anIsChannel || anIsDigue || anIsDummyObject3D ||
- anIsValidProfile || anIsGroup || anIsLandCover )
+ anIsValidProfile || anIsGroup || anIsLandCoverMap )
{
if( anIsHiddenInSelection )
theMenu->addAction( action( ShowId ) );
setPreferenceProperty( defaultStricklerCoef, "step", 0.01 );
}
+void HYDROGUI_Module::preferencesChanged( const QString& theSection, const QString& thePref )
+{
+ if ( theSection == "preferences" && thePref == "default_strickler_coefficient" )
+ {
+ SUIT_ResourceMgr* resMgr = application()->resourceMgr();
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( application()->activeStudy()->id() );
+ if ( resMgr && !aDoc.IsNull() )
+ aDoc->SetDefaultStricklerCoefficient( resMgr->doubleValue( theSection, thePref, 0 ) );
+ }
+ else
+ LightApp_Module::preferencesChanged( theSection, thePref );
+}
+
QCursor HYDROGUI_Module::getPrefEditCursor() const
{
int aCursorType = SUIT_Session::session()->resourceMgr()->integerValue("preferences", "type_of_cursor", (int)CT_CrossCursor );
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 ) {
setLandCoversScalarMapModeOff( theViewId );
+ } else if ( theObject->GetKind() == KIND_LAND_COVER_MAP && theState ) {
+ getOCCDisplayer()->SetToUpdateColorScale();
}
}
}
}
/////////////////// END OF VTKPrs PROCESSING
+void HYDROGUI_Module::clearCache()
+{
+ myObjectStateMap.clear();
+}
+
CAM_DataModel* HYDROGUI_Module::createDataModel()
{
return new HYDROGUI_DataModel( this );
}
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* ) ),
this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
+ connect( theViewManager, SIGNAL( activated( SUIT_ViewManager* ) ),
+ this, SLOT( onViewActivated( SUIT_ViewManager* ) ) );
}
else if( theViewManager->getType() == SVTK_Viewer::Type() )
{
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
{
return myLandCoverColoringMap.contains( theViewId );
}
+
+void HYDROGUI_Module::setObjectRemoved( const Handle(HYDROData_Entity)& theObject )
+{
+ if ( theObject.IsNull() || !theObject->IsRemoved() ) {
+ return;
+ }
+
+ if ( theObject->GetKind() == KIND_STRICKLER_TABLE ) {
+ Handle(HYDROData_StricklerTable) aTable =
+ Handle(HYDROData_StricklerTable)::DownCast( theObject );
+ QList<int> aViewIds;
+ QMutableMapIterator<int, Handle(HYDROData_StricklerTable)> anIter( myLandCoverColoringMap );
+ while ( anIter.hasNext() ) {
+ if ( HYDROGUI_DataObject::dataObjectEntry( anIter.next().value() ) ==
+ HYDROGUI_DataObject::dataObjectEntry( aTable ) ) {
+ anIter.remove();
+ }
+ }
+ }
+}
+
+void HYDROGUI_Module::onViewActivated( SUIT_ViewManager* theMgr )
+{
+ if( !theMgr )
+ return;
+
+ SUIT_ViewWindow* wnd = theMgr->getActiveView();
+ OCCViewer_ViewFrame* occwnd = dynamic_cast<OCCViewer_ViewFrame*>( wnd );
+ if( !occwnd )
+ return;
+
+ myOverview->setMainView( occwnd );
+}
