X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileDlg.cxx;h=1f98c732f78ce140c9f58accef36780766057d05;hb=53641ec32e8a7e7d3afe059ef050e1c42d2c83b6;hp=1dc3901f0cfee0cc26178b1391ee5e1db7bec247;hpb=7458685cffd3529d28382fd42c5ad66d5348445c;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx index 1dc3901f..1f98c732 100644 --- a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx @@ -1,12 +1,8 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,9 +20,11 @@ #include "HYDROGUI_Module.h" #include "HYDROGUI_Tool.h" +#include "HYDROGUI_AISTrihedron.h" #include #include +#include #include #include @@ -37,8 +35,6 @@ #include #include -#include - #include #include #include @@ -46,7 +42,8 @@ #include HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle ) -: HYDROGUI_InputPanel( theModule, theTitle ), myName(NULL) +: HYDROGUI_ViewerDlg( theModule, theTitle ), + myName( NULL ) { QHBoxLayout* aNameLayout = new QHBoxLayout(); QLabel* aNameLabel = new QLabel(tr("PROFILE_NAME_TLT"), this); @@ -59,7 +56,9 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr int anActionFlags = CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode | CurveCreator_Widget::DisableClosedSection; - myEditorWidget = new CurveCreator_Widget( this, NULL, anActionFlags ); + 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 ); @@ -69,69 +68,23 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr anAddElementLayout->setMargin( 0 ); anAddElementLayout->setSpacing( 5 ); - myViewManager = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 ); - OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( true ); - - 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 ); + myEditorWidget->setOCCViewer( viewer() ); connect( myEditorWidget, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) ); 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(); -} - -Handle(AIS_InteractiveContext) HYDROGUI_ProfileDlg::getAISContext() -{ - OCCViewer_Viewer* aViewer = (OCCViewer_Viewer*)myViewManager->getViewModel(); - return aViewer ? aViewer->getAISContext() : 0; + myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode ); } void HYDROGUI_ProfileDlg::setProfileName( const QString& theName ) @@ -147,6 +100,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() @@ -154,11 +112,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 */ @@ -198,27 +151,10 @@ void HYDROGUI_ProfileDlg::processFinishedSubOperation( QWidget* theWidget ) myAddElementBox->hide(); } -void HYDROGUI_ProfileDlg::onMouseMove( SUIT_ViewWindow* theViewWindow, QMouseEvent* theEvent ) +Handle(AIS_Trihedron) HYDROGUI_ProfileDlg::trihedron() { - OCCViewer_ViewWindow* anOCCViewWindow = - dynamic_cast(theViewWindow); - if ( anOCCViewWindow && anOCCViewWindow->getViewPort() ) { - gp_Pnt aPnt = GEOMUtils::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 ) ); - } + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + Handle(AIS_Trihedron) aTrihedron = + HYDROGUI_AISTrihedron::createTrihedron( aResMgr->doubleValue( "3DViewer", "trihedron_size", viewer()->trihedronSize() ) ); + return aTrihedron; } - -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