X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileDlg.cxx;h=81cb8239a789499bef51160ccd7a48a1ea4c7fa0;hb=fce3f1240b6161d7cb837344078e5943b90eca65;hp=d5460cc4140ec49a6e435d2f99662b6048fe636d;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx index d5460cc4..81cb8239 100644 --- a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx @@ -1,8 +1,4 @@ -// Copyright (C) 2007-2015 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 @@ -44,17 +40,24 @@ #include #include #include +#include +#include + +const QString splitter_key = "HYDROGUI_ProfileDlg::splitter"; HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle ) -: HYDROGUI_InputPanel( theModule, theTitle ), myName(NULL) +: HYDROGUI_ViewerDlg( theModule, theTitle, true ), + myName( NULL ) { - QHBoxLayout* aNameLayout = new QHBoxLayout(); + QFrame* name_frame = new QFrame( mainFrame() ); + QHBoxLayout* name_layout = new QHBoxLayout( name_frame ); + name_layout->setMargin( 0 ); QLabel* aNameLabel = new QLabel(tr("PROFILE_NAME_TLT"), this); - aNameLayout->addWidget(aNameLabel); + name_layout->addWidget(aNameLabel); myName = new QLineEdit(this); - aNameLayout->addWidget(myName); + name_layout->addWidget(myName); - addLayout(aNameLayout); + insertWidget( name_frame, 0, 0 ); int anActionFlags = CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode | @@ -62,49 +65,16 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr QStringList aCoordTitles; aCoordTitles << tr( "U_TITLE" ) << tr( "Z_TITLE" ); myEditorWidget = new CurveCreator_Widget( this, NULL, anActionFlags, aCoordTitles ); - addWidget( myEditorWidget, 3 ); + insertWidget( myEditorWidget, 1, 1 ); myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this ); - addWidget( myAddElementBox, 2 ); + insertWidget( myAddElementBox, 2, 1 ); QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox ); anAddElementLayout->setMargin( 0 ); anAddElementLayout->setSpacing( 5 ); - myViewManager = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 ); - OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( false /*erase trihedron*/); - - 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(); - 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( aViewer ); + myEditorWidget->setOCCViewer( viewer() ); connect( myEditorWidget, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) ); connect( myEditorWidget, SIGNAL( subOperationStarted(QWidget*, bool) ), this, SLOT( processStartedSubOperation(QWidget*, bool) ) ); @@ -112,39 +82,33 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr 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 ); + QList sizes; + sizes.append( 25 ); + sizes.append( 100 ); + sizes.append( 100 ); + sizes.append( 200 ); + sizes.append( 25 ); + splitter()->setSizes( sizes ); + +#ifndef TEST_MODE + QSettings settings; + splitter()->restoreState( settings.value( splitter_key ).toByteArray() ); +#endif } HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg() { - delete myViewManager; +#ifndef TEST_MODE + QSettings settings; + settings.setValue( splitter_key, splitter()->saveState() ); +#endif } void HYDROGUI_ProfileDlg::reset() { myEditorWidget->reset(); myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode ); -} - -Handle(AIS_InteractiveContext) HYDROGUI_ProfileDlg::getAISContext() -{ - OCCViewer_Viewer* aViewer = (OCCViewer_Viewer*)myViewManager->getViewModel(); - return aViewer ? aViewer->getAISContext() : 0; + viewer()->setTrihedronShown( false ); // Issue #548 } void HYDROGUI_ProfileDlg::setProfileName( const QString& theName ) @@ -211,30 +175,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 = 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 ); + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + Handle(AIS_Trihedron) aTrihedron = + HYDROGUI_AISTrihedron::createTrihedron( aResMgr->doubleValue( "3DViewer", "trihedron_size", viewer()->trihedronSize() ) ); + return aTrihedron; }