X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileDlg.cxx;h=81cb8239a789499bef51160ccd7a48a1ea4c7fa0;hb=fce3f1240b6161d7cb837344078e5943b90eca65;hp=d732b05e25e959dee59fd2fb80f3cfb533a2d185;hpb=32fa2c8f9f80e7d33fdb7efeff53a1a12f54083f;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx index d732b05e..81cb8239 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 @@ -23,12 +19,18 @@ #include "HYDROGUI_ProfileDlg.h" #include "HYDROGUI_Module.h" +#include "HYDROGUI_Tool.h" +#include "HYDROGUI_AISTrihedron.h" + #include #include +#include -#include #include #include +#include +#include +#include #include #include @@ -37,77 +39,76 @@ #include #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 ); - myEditorWidget = new CurveCreator_Widget( this, NULL ); - addWidget( myEditorWidget, 3 ); + int 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 ); + insertWidget( myEditorWidget, 1, 1 ); - 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 ); + insertWidget( myAddElementBox, 2, 1 ); - //myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this ); - //addWidget( myAddElementBox, 2 ); + QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox ); + anAddElementLayout->setMargin( 0 ); + anAddElementLayout->setSpacing( 5 ); - //QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox ); - //anAddElementLayout->setMargin( 0 ); - //anAddElementLayout->setSpacing( 5 ); + myEditorWidget->setOCCViewer( viewer() ); 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(); -} - -HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg() -{ -} - -void HYDROGUI_ProfileDlg::setOCCViewer( OCCViewer_Viewer* theViewer ) -{ - myEditorWidget->setOCCViewer( theViewer ); -} - -void HYDROGUI_ProfileDlg::processStartedSubOperation( QWidget* theWidget ) -{ - //myEditorWidget->setEnabled( false ); + myAddElementBox->hide(); - //QBoxLayout* anAddElementLayout = dynamic_cast( myAddElementBox->layout() ); - //anAddElementLayout->addWidget( theWidget ); + QList sizes; + sizes.append( 25 ); + sizes.append( 100 ); + sizes.append( 100 ); + sizes.append( 200 ); + sizes.append( 25 ); + splitter()->setSizes( sizes ); - //theWidget->show(); - //myAddElementBox->show(); +#ifndef TEST_MODE + QSettings settings; + splitter()->restoreState( settings.value( splitter_key ).toByteArray() ); +#endif } -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();*/ +#ifndef TEST_MODE + QSettings settings; + settings.setValue( splitter_key, splitter()->saveState() ); +#endif } void HYDROGUI_ProfileDlg::reset() { + myEditorWidget->reset(); + myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode ); + viewer()->setTrihedronShown( false ); // Issue #548 } void HYDROGUI_ProfileDlg::setProfileName( const QString& theName ) @@ -120,9 +121,14 @@ QString HYDROGUI_ProfileDlg::getProfileName() const return myName->text(); } -void HYDROGUI_ProfileDlg::setCurve( CurveCreator_ICurve* theCurve ) +void HYDROGUI_ProfileDlg::setProfile( CurveCreator_ICurve* theProfile ) { - myEditorWidget->setCurve( theCurve ); + myEditorWidget->setCurve( theProfile ); + + // select the single section by default + QList aSections; + aSections << 0; + myEditorWidget->setSelectedSections( aSections ); } QList HYDROGUI_ProfileDlg::getSelectedSections() @@ -130,11 +136,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 */ @@ -150,3 +151,34 @@ 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(); +} + +Handle(AIS_Trihedron) HYDROGUI_ProfileDlg::trihedron() +{ + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + Handle(AIS_Trihedron) aTrihedron = + HYDROGUI_AISTrihedron::createTrihedron( aResMgr->doubleValue( "3DViewer", "trihedron_size", viewer()->trihedronSize() ) ); + return aTrihedron; +}