X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileDlg.cxx;h=611e888f23d5589dbecef5ea1ba69e4f91fc435b;hb=8c36538920c44b66924b596a8d2c8a10bab9b7e5;hp=e6e24a486302691f93e9e895cabd9dc51d060ebe;hpb=8cf8e5df32a76302cf00863147bbab55a3b45dbe;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx index e6e24a48..611e888f 100644 --- a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx @@ -23,12 +23,17 @@ #include "HYDROGUI_ProfileDlg.h" #include "HYDROGUI_Module.h" +#include "HYDROGUI_Tool.h" + #include #include +#include -#include #include #include +#include +#include +#include #include #include @@ -37,6 +42,7 @@ #include #include #include +#include HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle ) : HYDROGUI_InputPanel( theModule, theTitle ), myName(NULL) @@ -49,68 +55,83 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr addLayout(aNameLayout); - myEditorWidget = new CurveCreator_Widget( this, NULL ); + int anActionFlags = + CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode | + CurveCreator_Widget::DisableClosedSection; + myEditorWidget = new CurveCreator_Widget( this, NULL, anActionFlags ); addWidget( myEditorWidget, 3 ); - myViewWidget = new OCCViewer_ViewWidget( this, false ); - OCCViewer_ViewPort3d* aViewPort = myViewWidget->getViewPort(); - SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); - if ( aResMgr ) - aViewPort->setBackground( aResMgr->backgroundValue( "OCCViewer", "background", - Qtx::BackgroundData( Qt::black ) ) ); - OCCViewer_Utilities::setViewWidget2DMode( myViewWidget, OCCViewer_ViewWidget::XZPlane ); - addWidget( myViewWidget, 4 ); + myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this ); + addWidget( myAddElementBox, 2 ); + + QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox ); + anAddElementLayout->setMargin( 0 ); + anAddElementLayout->setSpacing( 5 ); - //myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this ); - //addWidget( myAddElementBox, 2 ); + myViewManager = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 ); + OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( true ); - //QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox ); - //anAddElementLayout->setMargin( 0 ); - //anAddElementLayout->setSpacing( 5 ); + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + 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(); + addWidget( aViewWin, 4 ); + 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(); - - myEditorWidget->setOCCViewWidget( myViewWidget ); -} + myAddElementBox->hide(); -HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg() -{ -} - -void HYDROGUI_ProfileDlg::processStartedSubOperation( QWidget* theWidget ) -{ - //myEditorWidget->setEnabled( false ); + // 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 ); + } + } - //QBoxLayout* anAddElementLayout = dynamic_cast( myAddElementBox->layout() ); - //anAddElementLayout->addWidget( theWidget ); + myCoordLabel = new QLabel( this ); + QHBoxLayout* aCoordLayout = new QHBoxLayout(); + aCoordLayout->addWidget( myCoordLabel ); + aCoordLayout->addStretch(); - //theWidget->show(); - //myAddElementBox->show(); + addLayout( aCoordLayout ); } -void HYDROGUI_ProfileDlg::processFinishedSubOperation( QWidget* theWidget ) +HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg() { - /*myEditorWidget->setEnabled( true ); - - QBoxLayout* anAddElementLayout = dynamic_cast( myAddElementBox->layout() ); - anAddElementLayout->removeWidget( theWidget ); - - theWidget->hide(); - myAddElementBox->hide();*/ + delete myViewManager; } void HYDROGUI_ProfileDlg::reset() { myEditorWidget->reset(); + myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode ); } Handle(AIS_InteractiveContext) HYDROGUI_ProfileDlg::getAISContext() { - return myViewWidget->getAISContext(); + OCCViewer_Viewer* aViewer = (OCCViewer_Viewer*)myViewManager->getViewModel(); + return aViewer ? aViewer->getAISContext() : 0; } void HYDROGUI_ProfileDlg::setProfileName( const QString& theName ) @@ -126,6 +147,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() @@ -133,11 +159,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 */ @@ -153,3 +174,51 @@ bool HYDROGUI_ProfileDlg::deleteEnabled() { return myEditorWidget->removeEnabled(); } + +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 ); + + theWidget->show(); + myAddElementBox->show(); +} + +void HYDROGUI_ProfileDlg::processFinishedSubOperation( QWidget* theWidget ) +{ + myEditorWidget->setEnabled( true ); + + QBoxLayout* anAddElementLayout = dynamic_cast( myAddElementBox->layout() ); + anAddElementLayout->removeWidget( 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() ); + QString anY = HYDROGUI_Tool::GetCoordinateString( aPnt.Y() ); + myCoordLabel->setText( tr("COORDINATES_INFO").arg( aX ).arg( anY ) ); + } +} + +bool HYDROGUI_ProfileDlg::eventFilter( QObject* theObj, QEvent* theEvent ) +{ + if ( theObj->inherits( "OCCViewer_ViewPort" ) && + theEvent->type() == QEvent::Leave ) { + myCoordLabel->clear(); + } + + return HYDROGUI_InputPanel::eventFilter( theObj, theEvent ); +} \ No newline at end of file