Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quick optimization patch (bytearray for images)
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ProfileDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
index ea9bfd8a00c8f91149fe38c99c5edeee0949f317..81cb8239a789499bef51160ccd7a48a1ea4c7fa0 100644
(file)
--- 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
// 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,18
+40,24
@@
#include <QLabel>
#include <QLineEdit>
#include <QMouseEvent>
#include <QLabel>
#include <QLineEdit>
#include <QMouseEvent>
+#include <QSplitter>
+#include <QSettings>
+
+const QString splitter_key = "HYDROGUI_ProfileDlg::splitter";
HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle )
HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle )
-: HYDROGUI_ViewerDlg( theModule, theTitle ),
+: HYDROGUI_ViewerDlg( theModule, theTitle
, true
),
myName( NULL )
{
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);
QLabel* aNameLabel = new QLabel(tr("PROFILE_NAME_TLT"), this);
-
aNameL
ayout->addWidget(aNameLabel);
+
name_l
ayout->addWidget(aNameLabel);
myName = new QLineEdit(this);
myName = new QLineEdit(this);
-
aNameL
ayout->addWidget(myName);
+
name_l
ayout->addWidget(myName);
-
addLayout(aNameLayout
);
+
insertWidget( name_frame, 0, 0
);
int anActionFlags =
CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode |
int anActionFlags =
CurveCreator_Widget::DisableNewSection | CurveCreator_Widget::DisableDetectionMode |
@@
-63,10
+65,10
@@
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 );
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 );
myAddElementBox = new QGroupBox( tr( "ADD_ELEMENT" ), this );
-
addWidget( myAddElementBox, 2
);
+
insertWidget( myAddElementBox, 2, 1
);
QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox );
anAddElementLayout->setMargin( 0 );
QBoxLayout* anAddElementLayout = new QVBoxLayout( myAddElementBox );
anAddElementLayout->setMargin( 0 );
@@
-79,16
+81,34
@@
HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr
connect( myEditorWidget, SIGNAL( subOperationFinished(QWidget*) ), this, SLOT( processFinishedSubOperation(QWidget*) ) );
myAddElementBox->hide();
connect( myEditorWidget, SIGNAL( subOperationFinished(QWidget*) ), this, SLOT( processFinishedSubOperation(QWidget*) ) );
myAddElementBox->hide();
+
+ QList<int> 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()
{
}
HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg()
{
+#ifndef TEST_MODE
+ QSettings settings;
+ settings.setValue( splitter_key, splitter()->saveState() );
+#endif
}
void HYDROGUI_ProfileDlg::reset()
{
myEditorWidget->reset();
myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode );
}
void HYDROGUI_ProfileDlg::reset()
{
myEditorWidget->reset();
myEditorWidget->setActionMode( CurveCreator_Widget::AdditionMode );
+ viewer()->setTrihedronShown( false ); // Issue #548
}
void HYDROGUI_ProfileDlg::setProfileName( const QString& theName )
}
void HYDROGUI_ProfileDlg::setProfileName( const QString& theName )
@@
-154,3
+174,11
@@
void HYDROGUI_ProfileDlg::processFinishedSubOperation( QWidget* theWidget )
theWidget->hide();
myAddElementBox->hide();
}
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;
+}