X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileDlg.cxx;h=0829ac445474b8d2c741cbc5090314cb0ac5e024;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=e05d473911d14939d1da86de28c66755cad91319;hpb=d9bced84874275b38f81e0878e197d40782834d2;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx index e05d4739..0829ac44 100644 --- a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx @@ -23,8 +23,12 @@ #include "HYDROGUI_ProfileDlg.h" #include "HYDROGUI_Module.h" +#include "HYDROGUI_Tool.h" +#include "HYDROGUI_AISTrihedron.h" + #include #include +#include #include #include @@ -39,6 +43,7 @@ #include #include #include +#include HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle ) : HYDROGUI_InputPanel( theModule, theTitle ), myName(NULL) @@ -52,8 +57,11 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr addLayout(aNameLayout); int anActionFlags = - CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode; - myEditorWidget = new CurveCreator_Widget( this, NULL, anActionFlags ); + CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode | + CurveCreator_Widget::DisableClosedSection; + QStringList aCoordTitles; + aCoordTitles << tr( "U_TITLE" ) << tr( "Z_TITLE" ); + myEditorWidget = new CurveCreator_Widget( this, NULL, anActionFlags, aCoordTitles ); addWidget( myEditorWidget, 3 ); myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this ); @@ -63,51 +71,80 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr anAddElementLayout->setMargin( 0 ); anAddElementLayout->setSpacing( 5 ); - - OCCViewer_ViewManager* aViewMgr = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 ); - myViewer = new OCCViewer_Viewer( true ); + myViewManager = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 ); + OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( false /*erase trihedron*/); SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); - myViewer->setBackground( OCCViewer_ViewFrame::TOP_LEFT, - aResMgr->backgroundValue( "OCCViewer", "xz_background", myViewer->background(OCCViewer_ViewFrame::TOP_LEFT) ) ); - myViewer->setBackground( OCCViewer_ViewFrame::TOP_RIGHT, - aResMgr->backgroundValue( "OCCViewer", "yz_background", myViewer->background(OCCViewer_ViewFrame::TOP_RIGHT) ) ); - myViewer->setBackground( OCCViewer_ViewFrame::BOTTOM_LEFT, - aResMgr->backgroundValue( "OCCViewer", "xy_background", myViewer->background(OCCViewer_ViewFrame::BOTTOM_LEFT) ) ); - myViewer->setBackground( OCCViewer_ViewFrame::BOTTOM_RIGHT, - aResMgr->backgroundValue( "OCCViewer", "background", myViewer->background(OCCViewer_ViewFrame::MAIN_VIEW) ) ); - - myViewer->setTrihedronSize( aResMgr->doubleValue( "3DViewer", "trihedron_size", myViewer->trihedronSize() ), - aResMgr->booleanValue( "3DViewer", "relative_size", myViewer->trihedronRelative() )); - myViewer->setInteractionStyle( aResMgr->integerValue( "3DViewer", "navigation_mode", myViewer->interactionStyle() ) ); - myViewer->setZoomingStyle( aResMgr->integerValue( "3DViewer", "zooming_mode", myViewer->zoomingStyle() ) ); - myViewer->enablePreselection( aResMgr->booleanValue( "OCCViewer", "enable_preselection", myViewer->isPreselectionEnabled() ) ); - myViewer->enableSelection( aResMgr->booleanValue( "OCCViewer", "enable_selection", myViewer->isSelectionEnabled() ) ); - - aViewMgr->setViewModel( myViewer );// custom view model, which extends SALOME_View interface - SUIT_ViewWindow* aViewWin = aViewMgr->createViewWindow(); + aViewer->setBackground( OCCViewer_ViewFrame::TOP_LEFT, + aResMgr->backgroundValue( "OCCViewer", "xz_background", aViewer->background(OCCViewer_ViewFrame::TOP_LEFT) ) ); + aViewer->setBackground( OCCViewer_ViewFrame::TOP_RIGHT, + aResMgr->backgroundValue( "OCCViewer", "yz_background", aViewer->background(OCCViewer_ViewFrame::TOP_RIGHT) ) ); + aViewer->setBackground( OCCViewer_ViewFrame::BOTTOM_LEFT, + aResMgr->backgroundValue( "OCCViewer", "xy_background", aViewer->background(OCCViewer_ViewFrame::BOTTOM_LEFT) ) ); + aViewer->setBackground( OCCViewer_ViewFrame::BOTTOM_RIGHT, + aResMgr->backgroundValue( "OCCViewer", "background", aViewer->background(OCCViewer_ViewFrame::MAIN_VIEW) ) ); + + aViewer->setTrihedronSize( aResMgr->doubleValue( "3DViewer", "trihedron_size", aViewer->trihedronSize() ), + aResMgr->booleanValue( "3DViewer", "relative_size", aViewer->trihedronRelative() )); + aViewer->setInteractionStyle( aResMgr->integerValue( "3DViewer", "navigation_mode", aViewer->interactionStyle() ) ); + aViewer->setZoomingStyle( aResMgr->integerValue( "3DViewer", "zooming_mode", aViewer->zoomingStyle() ) ); + aViewer->enablePreselection( aResMgr->booleanValue( "OCCViewer", "enable_preselection", aViewer->isPreselectionEnabled() ) ); + aViewer->enableSelection( aResMgr->booleanValue( "OCCViewer", "enable_selection", aViewer->isSelectionEnabled() ) ); + + myViewManager->setViewModel( aViewer );// custom view model, which extends SALOME_View interface + SUIT_ViewWindow* aViewWin = myViewManager->createViewWindow(); + aViewer->setStaticTrihedronDisplayed( false ); + Handle(AIS_Trihedron) aTrihedron = HYDROGUI_AISTrihedron::createTrihedron( + aResMgr->doubleValue( "3DViewer", "trihedron_size", + aViewer->trihedronSize() )); + Handle(AIS_InteractiveContext) anAISContext = aViewer->getAISContext(); + if ( !anAISContext.IsNull() ) { + anAISContext->Display( aTrihedron ); + anAISContext->Deactivate( aTrihedron ); + } + addWidget( aViewWin, 4 ); - myEditorWidget->setOCCViewer( myViewer ); + myEditorWidget->setOCCViewer( aViewer ); connect( myEditorWidget, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) ); - connect( myEditorWidget, SIGNAL( subOperationStarted(QWidget*) ), this, SLOT( processStartedSubOperation(QWidget*) ) ); + connect( myEditorWidget, SIGNAL( subOperationStarted(QWidget*, bool) ), this, SLOT( processStartedSubOperation(QWidget*, bool) ) ); connect( myEditorWidget, SIGNAL( subOperationFinished(QWidget*) ), this, SLOT( processFinishedSubOperation(QWidget*) ) ); myAddElementBox->hide(); + + // Coordinates + connect( myViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ), + this, SLOT( onMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) ); + if ( aViewWin ) { + OCCViewer_ViewFrame* aViewFrame = dynamic_cast( aViewWin ); + if ( aViewFrame && aViewFrame->getViewPort() ) { + aViewFrame->getViewPort()->installEventFilter( this ); + } + } + + myCoordLabel = new QLabel( this ); + QHBoxLayout* aCoordLayout = new QHBoxLayout(); + aCoordLayout->addWidget( myCoordLabel ); + aCoordLayout->addStretch(); + + addLayout( aCoordLayout ); } HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg() { + delete myViewManager; } void HYDROGUI_ProfileDlg::reset() { myEditorWidget->reset(); + myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode ); } Handle(AIS_InteractiveContext) HYDROGUI_ProfileDlg::getAISContext() { - return myViewer->getAISContext(); + OCCViewer_Viewer* aViewer = (OCCViewer_Viewer*)myViewManager->getViewModel(); + return aViewer ? aViewer->getAISContext() : 0; } void HYDROGUI_ProfileDlg::setProfileName( const QString& theName ) @@ -123,6 +160,11 @@ QString HYDROGUI_ProfileDlg::getProfileName() const void HYDROGUI_ProfileDlg::setProfile( CurveCreator_ICurve* theProfile ) { myEditorWidget->setCurve( theProfile ); + + // select the single section by default + QList aSections; + aSections << 0; + myEditorWidget->setSelectedSections( aSections ); } QList HYDROGUI_ProfileDlg::getSelectedSections() @@ -130,11 +172,6 @@ QList HYDROGUI_ProfileDlg::getSelectedSections() return myEditorWidget->getSelectedSections(); } -QList< QPair< int, int > > HYDROGUI_ProfileDlg::getSelectedPoints() -{ - return myEditorWidget->getSelectedPoints(); -} - /** * Redirect the delete action to editor widget */ @@ -151,10 +188,11 @@ bool HYDROGUI_ProfileDlg::deleteEnabled() return myEditorWidget->removeEnabled(); } -void HYDROGUI_ProfileDlg::processStartedSubOperation( QWidget* theWidget ) +void HYDROGUI_ProfileDlg::processStartedSubOperation( QWidget* theWidget, bool theIsEdit ) { myEditorWidget->setEnabled( false ); + myAddElementBox->setTitle( theIsEdit ? tr( "EDIT_ELEMENT" ) : tr( "ADD_ELEMENT" ) ); QBoxLayout* anAddElementLayout = dynamic_cast( myAddElementBox->layout() ); anAddElementLayout->addWidget( theWidget ); @@ -172,3 +210,31 @@ void HYDROGUI_ProfileDlg::processFinishedSubOperation( QWidget* theWidget ) theWidget->hide(); myAddElementBox->hide(); } + +void HYDROGUI_ProfileDlg::onMouseMove( SUIT_ViewWindow* theViewWindow, QMouseEvent* theEvent ) +{ + OCCViewer_ViewWindow* anOCCViewWindow = + dynamic_cast(theViewWindow); + if ( anOCCViewWindow && anOCCViewWindow->getViewPort() ) { + gp_Pnt aPnt = CurveCreator_Utils::ConvertClickToPoint( + theEvent->x(), theEvent->y(), anOCCViewWindow->getViewPort()->getView() ); + + // Show the coordinates + QString aX = HYDROGUI_Tool::GetCoordinateString( aPnt.X(), true ); + QString anY = HYDROGUI_Tool::GetCoordinateString( aPnt.Y(), true ); + myCoordLabel->setText( tr("UZ_COORDINATES_INFO").arg( aX ).arg( anY ) ); + } +} + +bool HYDROGUI_ProfileDlg::eventFilter( QObject* theObj, QEvent* theEvent ) +{ + if ( theObj->inherits( "OCCViewer_ViewPort" ) ) + { + if ( theEvent->type() == QEvent::Leave ) + myCoordLabel->clear(); + + return false; + } + + return HYDROGUI_InputPanel::eventFilter( theObj, theEvent ); +}