#include "HYDROGUI.h"
#include "HYDROGUI_DataModel.h"
+#include "HYDROGUI_DataObject.h"
#include "HYDROGUI_Displayer.h"
#include "HYDROGUI_GVSelector.h"
#include "HYDROGUI_InputPanel.h"
#include "HYDROGUI_AbstractDisplayer.h"
#include "HYDROGUI_PolylineOp.h"
#include "HYDROGUI_SetColorOp.h"
+#include "HYDROGUI_ImportGeomObjectOp.h"
#include <HYDROData_Image.h>
#include <HYDROData_Profile.h>
#include <HYDROData_OperationsFactory.h>
+#include <CurveCreator_Utils.h>
+
#include <GraphicsView_ViewFrame.h>
#include <GraphicsView_ViewManager.h>
#include <GraphicsView_ViewPort.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_UpdateFlags.h>
+#include <SalomeApp_Study.h>
+
#include <OCCViewer_ViewFrame.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewModel.h>
#include <SUIT_Desktop.h>
#include <SUIT_Study.h>
#include <SUIT_ViewManager.h>
+#include <SUIT_ResourceMgr.h>
#include <SVTK_ViewManager.h>
#include <SVTK_ViewModel.h>
+#include <SVTK_ViewWindow.h>
#include <SVTK_Selector.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkRenderer.h>
+#include <vtkWorldPointPicker.h>
+#include <vtkCamera.h>
#include <OCCViewer_ViewPort3d.h>
#include <GEOMUtils.hxx>
+#include <GeometryGUI.h>
+
+#include <SALOMEDS_wrap.hxx>
#include <QAction>
#include <QApplication>
#include <QMouseEvent>
#include <QStatusBar>
+const double LOCAL_SELECTION_TOLERANCE = 0.0001;
+
static int ViewManagerId = 0;
extern "C" HYDRO_EXPORT CAM_Module* createModule()
foreach ( const int anId, anObsoleteIds ) {
myViewManagerMap.remove( anId );
myObjectStateMap.remove( anId );
+ myObjectDisplayOrderMap.remove( anId );
myShapesMap.remove( anId );
myVTKPrsMap.remove( anId );
}
updateCommandsStatus();
- connect( anApp, SIGNAL( operationFinished( const QString&, const QString&, const QStringList& ) ),
- this, SLOT( onExternalOperationFinished( const QString&, const QString&, const QStringList& ) ) );
-
HYDROGUI_Tool::setOCCActionShown( this, OCCViewer_ViewWindow::MaximizedId, false );
ViewManagerList anOCCViewManagers;
}
}
+ // Load GEOM data
+ SalomeApp_Study* aStudy =
+ dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() );
+ if ( aStudy ) {
+ SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy->studyDS() );
+ GEOM::GEOM_Gen_var aGeomEngine = GeometryGUI::GetGeomGen();
+ if ( !aGeomEngine->_is_nil() && !aGeomEngine->_is_nil() ) {
+ SALOMEDS::StudyBuilder_var aStudyBuilder = aDSStudy->NewBuilder();
+ SALOMEDS::SComponent_wrap GEOM_var = aDSStudy->FindComponent( "GEOM" );
+ if( !GEOM_var->_is_nil() ) {
+ aStudyBuilder->LoadWith( GEOM_var, aGeomEngine );
+ }
+ }
+ }
+
return aRes;
}
getApp()->setEditEnabled( true ); // show SalomeApp copy/paste actions
- disconnect( getApp(), SIGNAL( operationFinished( const QString&, const QString&, const QStringList& ) ),
- this, SLOT( onExternalOperationFinished( const QString&, const QString&, const QStringList& ) ) );
-
HYDROGUI_Tool::setOCCActionShown( this, OCCViewer_ViewWindow::MaximizedId, true );
return LightApp_Module::deactivateModule( theStudy );
bool anIsChannel = false;
bool anIsDigue = false;
bool anIsDummyObject3D = false;
+ bool anIsGroup = false;
bool anIsObjectCanBeColored = false;
- // check the selected GEOM objects
- if ( anIsObjectBrowser && !HYDROGUI_Tool::GetSelectedGeomObjects( this ).isEmpty() ) {
- theMenu->addAction( action( ImportGeomObjectId ) );
- theMenu->addSeparator();
+ // Check the selected GEOM objects (take into account the Object Browser only)
+ if ( anIsObjectBrowser ) {
+ QList<GEOM::shape_type> anObstacleTypes =
+ HYDROGUI_ImportGeomObjectOp::getObstacleTypes();
+ QList<GEOM::shape_type> aPolylineTypes =
+ HYDROGUI_ImportGeomObjectOp::getPolylineTypes();
+
+ bool isCanBeImportedAsObstacle =
+ !HYDROGUI_Tool::GetSelectedGeomObjects( this, anObstacleTypes ).isEmpty();
+ bool isCanBeImportedAsPolyline =
+ !HYDROGUI_Tool::GetSelectedGeomObjects( this, aPolylineTypes ).isEmpty();
+
+ // Add import as obstacle action
+ if ( isCanBeImportedAsObstacle ) {
+ theMenu->addAction( action( ImportGeomObjectAsObstacleId ) );
+ }
+ // Add import as polyline action
+ if ( isCanBeImportedAsPolyline ) {
+ theMenu->addAction( action( ImportGeomObjectAsPolylineId ) );
+ }
+ // Add separator
+ if ( isCanBeImportedAsObstacle || isCanBeImportedAsPolyline ) {
+ theMenu->addSeparator();
+ }
}
// check the selected data model objects
anIsDigue = true;
else if( anObjectKind == KIND_DUMMY_3D )
anIsDummyObject3D = true;
+ else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLITTED_GROUP )
+ anIsGroup = true;
}
if ( !anIsObjectCanBeColored )
theMenu->addAction( action( UpdateObjectId ) );
theMenu->addSeparator();
}
+ else
+ {
+ theMenu->addAction( action( ForcedUpdateObjectId ) );
+ theMenu->addSeparator();
+ }
+
if( aSeq.Length() == 1 )
{
else if( anIsBathymetry )
{
theMenu->addAction( action( EditImportedBathymetryId ) );
+ theMenu->addAction( action( BathymetryBoundsId ) );
theMenu->addSeparator();
}
else if( anIsPolyline )
theMenu->addAction( action( SetColorId ) );
theMenu->addSeparator();
}
+
+ // Add copy action
+ if( aModel->canCopy() ) {
+ theMenu->addAction( action( CopyId ) );
+ theMenu->addSeparator();
+ }
} else if ( anAllAreProfiles ) {
theMenu->addAction( action( SelectedGeoreferencementId ) );
theMenu->addSeparator();
}
- theMenu->addAction( action( DeleteId ) );
+ if( !anIsDummyObject3D )
+ theMenu->addAction( action( DeleteId ) );
theMenu->addSeparator();
if( anIsImage || anIsPolyline || anIsPolyline3D ||
anIsImmersibleZone || anIsZone || anIsRegion ||
anIsBathymetry || anIsObstacle || anIsStream ||
anIsChannel || anIsDigue || anIsDummyObject3D ||
- anIsValidProfile )
+ anIsValidProfile || anIsGroup )
{
if( anIsHiddenInSelection )
theMenu->addAction( action( ShowId ) );
// the selection in the object browser.
// Note: processEvents() should be called after updateGV(),
// otherwise the application crashes from time to time.
- //RKV: qApp->processEvents();
+ //RKV: qApp->processEvents();
+ SUIT_ResourceMgr* aResMgr = getApp()->resourceMgr();
+ bool isResizeOnExpandItem = aResMgr->booleanValue( "ObjectBrowser", "resize_on_expand_item", false );
+ SUIT_DataBrowser* anObjectBrowser = getApp()->objectBrowser();
+ if ( isResizeOnExpandItem && anObjectBrowser ) {
+ anObjectBrowser->setResizeOnExpandItem( false ); // MZN: ISSUE #280
+ }
getApp()->updateObjectBrowser( true );
+ if ( isResizeOnExpandItem && anObjectBrowser ) {
+ anObjectBrowser->setResizeOnExpandItem( true ); // MZN: ISSUE #280
+ }
}
// Object browser is currently updated by using UF_Model flag
if( theObject.IsNull() )
return false;
- ViewId2Name2ObjectStateMap::const_iterator anIter1 = myObjectStateMap.find( theViewId );
+ ViewId2Entry2ObjectStateMap::const_iterator anIter1 = myObjectStateMap.find( theViewId );
if( anIter1 != myObjectStateMap.end() )
{
- const Name2ObjectStateMap& aName2ObjectStateMap = anIter1.value();
- Name2ObjectStateMap::const_iterator anIter2 = aName2ObjectStateMap.find( theObject->GetName());
- if( anIter2 != aName2ObjectStateMap.end() )
+ const Entry2ObjectStateMap& aEntry2ObjectStateMap = anIter1.value();
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( theObject );
+
+ Entry2ObjectStateMap::const_iterator anIter2 = aEntry2ObjectStateMap.find( anEntry );
+ if( anIter2 != aEntry2ObjectStateMap.end() )
{
const ObjectState& anObjectState = anIter2.value();
return anObjectState.Visibility;
{
if( !theObject.IsNull() )
{
- Name2ObjectStateMap& aName2ObjectStateMap = myObjectStateMap[ theViewId ];
- ObjectState& anObjectState = aName2ObjectStateMap[ theObject->GetName() ];
+ Entry2ObjectStateMap& aEntry2ObjectStateMap = myObjectStateMap[ theViewId ];
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( theObject );
+
+ ObjectState& anObjectState = aEntry2ObjectStateMap[ anEntry ];
anObjectState.Visibility = theState;
+
+ // Remember the display order ( needed for Z layers assignment only )
+ QStringList& anObjectEntries = myObjectDisplayOrderMap[ theViewId ];
+ anObjectEntries.removeAll( anEntry );
+ if ( theState ) {
+ anObjectEntries.append( anEntry );
+ }
+ }
+}
+
+void HYDROGUI_Module::setIsToUpdate( const Handle(HYDROData_Entity)& theObject,
+ const bool theState )
+{
+ if( !theObject.IsNull() )
+ {
+ // Process OCC shapes
+ ViewId2ListOfShapes::const_iterator aShapesMapIter( myShapesMap.begin() );
+ while( aShapesMapIter != myShapesMap.end() )
+ {
+ const ListOfShapes& aShapesList = aShapesMapIter.value();
+ foreach ( HYDROGUI_Shape* aShape, aShapesList )
+ {
+ if ( aShape && IsEqual( aShape->getObject(), theObject ) )
+ {
+ aShape->setIsToUpdate( theState );
+ }
+ }
+ aShapesMapIter++;
+ }
+ // Process VTK shapes
+ ViewId2ListOfVTKPrs::const_iterator aVTKPrsMapIter( myVTKPrsMap.begin() );
+ while( aVTKPrsMapIter != myVTKPrsMap.end() )
+ {
+ const ListOfVTKPrs& aShapesList = aVTKPrsMapIter.value();
+ foreach ( HYDROGUI_VTKPrs* aShape, aShapesList )
+ {
+ if ( aShape && IsEqual( aShape->getObject(), theObject ) )
+ {
+ aShape->setIsToUpdate( theState );
+ }
+ }
+ aVTKPrsMapIter++;
+ }
}
}
if( theObject.IsNull() )
return;
- // Compute the new global Z range from the added presentation and the old global Z range.
- double* aGlobalRange = getVTKDisplayer()->GetZRange( theViewId );
- double* aRange = theShape->getInternalZRange();
- bool anIsUpdate = false;
- if ( aRange[0] < aGlobalRange[0] )
+ if( theShape && theShape->needScalarBar() )
{
- aGlobalRange[0] = aRange[0];
- anIsUpdate = true;
- }
- if ( aRange[1] > aGlobalRange[1] )
- {
- aGlobalRange[1] = aRange[1];
- anIsUpdate = true;
- }
+ // Compute the new global Z range from the added presentation and the old global Z range.
+ double* aGlobalRange = getVTKDisplayer()->GetZRange( theViewId );
+ double* aRange = theShape->getInternalZRange();
+ bool anIsUpdate = false;
+ if ( aRange[0] < aGlobalRange[0] )
+ {
+ aGlobalRange[0] = aRange[0];
+ anIsUpdate = true;
+ }
+ if ( aRange[1] > aGlobalRange[1] )
+ {
+ aGlobalRange[1] = aRange[1];
+ anIsUpdate = true;
+ }
- //if ( anIsUpdate )
- //{
- updateVTKZRange( theViewId, aGlobalRange );
- //}
+ //if ( anIsUpdate )
+ //{
+ updateVTKZRange( theViewId, aGlobalRange );
+ //}
+ }
ListOfVTKPrs& aViewShapes = myVTKPrsMap[ theViewId ];
aViewShapes.append( theShape );
for ( int i = 0, n = aViewShapes.length(); i < n; ++i )
{
aShape = aViewShapes.at( i );
- if ( aShape )
+ if ( aShape && aShape->needScalarBar() )
{
aShape->setZRange( theRange );
}
}
}
}
+ else if ( theObj->inherits( "SVTK_ViewWindow" ) )
+ {
+ if( aType == QEvent::Leave )
+ {
+ SUIT_Desktop* aDesktop = getApp()->desktop();
+ if ( aDesktop && aDesktop->statusBar() ) {
+ aDesktop->statusBar()->clearMessage();
+ }
+ }
+ }
return LightApp_Module::eventFilter( theObj, theEvent );
}
connect( theViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
}
+ else if( theViewManager->getType() == SVTK_Viewer::Type() )
+ {
+ connect( theViewManager, SIGNAL( viewCreated( SUIT_ViewWindow* ) ),
+ this, SLOT( onViewCreated( SUIT_ViewWindow* ) ) );
+ connect( theViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
+ this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) );
+ }
createSelector( theViewManager ); // replace the default selector
SVTK_Viewer* aVTKViewer = getVTKViewer( anId );
if ( aVTKViewer )
{
- getVTKDisplayer()->DeleteScalarBar( anId );
+ getVTKDisplayer()->EraseScalarBar( anId, true );
removeViewShapes( (size_t)aVTKViewer );
}
}
}
}
}
+ else if( theViewWindow && theViewWindow->inherits( "SVTK_ViewWindow" ) )
+ {
+ if( SVTK_ViewWindow* aViewFrame = dynamic_cast<SVTK_ViewWindow*>( theViewWindow ) )
+ {
+ aViewFrame->installEventFilter( this );
+ }
+ }
}
void HYDROGUI_Module::onViewPortMouseEvent( QGraphicsSceneMouseEvent* theEvent )
{
OCCViewer_ViewWindow* anOCCViewWindow =
dynamic_cast<OCCViewer_ViewWindow*>(theViewWindow);
- if ( !anOCCViewWindow ) {
- return;
- }
+ bool doShow = false;
+ gp_Pnt aPnt;
+ if ( anOCCViewWindow ) {
+ // Get the selected point coordinates
+ OCCViewer_ViewPort3d* aViewPort = anOCCViewWindow->getViewPort();
+ if ( !aViewPort ) {
+ return;
+ }
- // Get the selected point coordinates
- OCCViewer_ViewPort3d* aViewPort = anOCCViewWindow->getViewPort();
- if ( !aViewPort ) {
- return;
+ aPnt = CurveCreator_Utils::ConvertClickToPoint( theEvent->x(), theEvent->y(),
+ aViewPort->getView() );
+ doShow = true;
+ }
+ else
+ {
+ SVTK_ViewWindow* aViewWindow =
+ dynamic_cast<SVTK_ViewWindow*>(theViewWindow);
+ if ( aViewWindow ) {
+ vtkRenderer* aRen = aViewWindow->getRenderer();
+ if ( aRen )
+ {
+ vtkCamera* aCamera = aRen->GetActiveCamera();
+ double* aNormal = aCamera->GetViewPlaneNormal();
+ int event_x, event_y;
+ vtkRenderWindowInteractor* anInteractor = aViewWindow->getInteractor();
+ if ( anInteractor )
+ {
+ anInteractor->GetLastEventPosition(event_x, event_y);
+ // Use a WorldPicker to get current coords
+ myPicker->Pick( event_x, event_y, 0, aRen );
+ double* aCoords = myPicker->GetPickPosition();
+ /////////////////////// Use the same algorithm as for OCC
+ double X, Y, Z;
+ double aXp, aYp, aZp;
+ double Vx, Vy, Vz;
+ X = aCoords[0];
+ Y = aCoords[1];
+ Z = aCoords[2];
+ Vx = aNormal[0];
+ Vy = aNormal[1];
+ Vz = aNormal[2];
+ Standard_Real aPrec = LOCAL_SELECTION_TOLERANCE;
+ if ( fabs( Vz ) > aPrec ) {
+ double aT = -Z/Vz;
+ aXp = X + aT*Vx;
+ aYp = Y + aT*Vy;
+ aZp = Z + aT*Vz;
+ }
+ else { // Vz = 0 - the eyed plane is orthogonal to Z plane - XOZ, or YOZ
+ aXp = aYp = aZp = 0;
+ if ( fabs( Vy ) < aPrec ) // Vy = 0 - the YOZ plane
+ aYp = Y;
+ else if ( fabs( Vx ) < aPrec ) // Vx = 0 - the XOZ plane
+ aXp = X;
+ }
+ /////////////////////////
+ doShow = true;
+ aPnt.SetX( aXp );
+ aPnt.SetY( aYp );
+ }
+ }
+ }
+ }
+ if ( doShow )
+ {
+ // Show the coordinates in the status bar
+ SUIT_Desktop* aDesktop = getApp()->desktop();
+ if ( aDesktop && aDesktop->statusBar() ) {
+ QString aX = HYDROGUI_Tool::GetCoordinateString( aPnt.X() );
+ QString anY = HYDROGUI_Tool::GetCoordinateString( aPnt.Y() );
+ aDesktop->statusBar()->showMessage( tr("COORDINATES_INFO").arg( aX ).arg( anY ) );
+ }
}
+}
- gp_Pnt aPnt = GEOMUtils::ConvertClickToPoint( theEvent->x(), theEvent->y(),
- aViewPort->getView() );
+/**
+ * Get the object display order. Needed for Z layers assignment only.
+ */
+int HYDROGUI_Module::getObjectDisplayOrder(
+ const int theViewId, const Handle(HYDROData_Entity)& theObject) const
+{
+ if( theObject.IsNull() )
+ return -1;
- // Show the coordinates in the status bar
- SUIT_Desktop* aDesktop = getApp()->desktop();
- if ( aDesktop && aDesktop->statusBar() ) {
- QString aX = HYDROGUI_Tool::GetCoordinateString( aPnt.X() );
- QString anY = HYDROGUI_Tool::GetCoordinateString( aPnt.Y() );
- aDesktop->statusBar()->showMessage( tr("COORDINATES_INFO").arg( aX ).arg( anY ) );
- }
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( theObject );
+ QStringList anObjectEntries = myObjectDisplayOrderMap.value( theViewId );
+
+ return anObjectEntries.indexOf( anEntry );
}
\ No newline at end of file
