Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IMP 22264: EDF 2648 GEOM: Propagate edges automatic orientation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Hypotheses.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index 77d8ec1b22e5ce2fe69a559b03a9b611596d987f..36b29d8453ba4d8d12e9c697d0bcb1051690ce75 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
-// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-35,10
+35,11
@@
#include <utilities.h>
// SALOME GUI includes
#include <utilities.h>
// SALOME GUI includes
-#include <
SUIT_Sess
ion.h>
+#include <
LightApp_Applicat
ion.h>
#include <SUIT_MessageBox.h>
#include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_ResourceMgr.h>
-#include <
LightApp_Applicat
ion.h>
+#include <
SUIT_Sess
ion.h>
#include <SalomeApp_IntSpinBox.h>
// Qt includes
#include <SalomeApp_IntSpinBox.h>
// Qt includes
@@
-150,7
+151,7
@@
void SMESHGUI_GenericHypothesisCreator::editHypothesis( SMESH::SMESH_Hypothesis_
}
else {
emit finished( QDialog::Accepted );
}
else {
emit finished( QDialog::Accepted );
-
delete myDlg;
+ delete myDlg;
}
}
}
}
@@
-246,6
+247,12
@@
QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame()
changeWidgets().append( w );
}
}
changeWidgets().append( w );
}
}
+ if ( QWidget* w = getHelperWidget() )
+ {
+ w->setParent( fr );
+ w->move( QPoint( 0, 0 ) );
+ lay->addWidget( w );
+ }
return fr;
}
return fr;
}
@@
-264,6
+271,7
@@
void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result )
bool res = result==QDialog::Accepted;
if( res )
{
bool res = result==QDialog::Accepted;
if( res )
{
+ SUIT_OverrideCursor wc;
/*QString paramValues = */storeParams();
// No longer needed since NoteBook appears and "Value" OB field shows names of variable
// if ( !paramValues.isEmpty() ) {
/*QString paramValues = */storeParams();
// No longer needed since NoteBook appears and "Value" OB field shows names of variable
// if ( !paramValues.isEmpty() ) {
@@
-512,6
+520,17
@@
QWidget* SMESHGUI_GenericHypothesisCreator::getCustomWidget( const StdParam & /*
{
return 0;
}
{
return 0;
}
+//================================================================================
+/*!
+ * \brief Returns a widget representing not a hypothesis parameter but some helper widget
+ */
+//================================================================================
+
+QWidget* SMESHGUI_GenericHypothesisCreator::getHelperWidget() const
+{
+ return 0;
+}
+
bool SMESHGUI_GenericHypothesisCreator::getParamFromCustomWidget( StdParam&, QWidget* ) const
{
return false;
bool SMESHGUI_GenericHypothesisCreator::getParamFromCustomWidget( StdParam&, QWidget* ) const
{
return false;
@@
-551,6
+570,8
@@
QString SMESHGUI_GenericHypothesisCreator::helpPage() const
aHelpFileName = "a1d_meshing_hypo_page.html#max_length_anchor";
else if ( aHypType == "Arithmetic1D")
aHelpFileName = "a1d_meshing_hypo_page.html#arithmetic_1d_anchor";
aHelpFileName = "a1d_meshing_hypo_page.html#max_length_anchor";
else if ( aHypType == "Arithmetic1D")
aHelpFileName = "a1d_meshing_hypo_page.html#arithmetic_1d_anchor";
+ else if ( aHypType == "GeometricProgression")
+ aHelpFileName = "a1d_meshing_hypo_page.html#geometric_1d_anchor";
else if ( aHypType == "FixedPoints1D")
aHelpFileName = "a1d_meshing_hypo_page.html#fixed_points_1d_anchor";
else if ( aHypType == "MaxElementArea")
else if ( aHypType == "FixedPoints1D")
aHelpFileName = "a1d_meshing_hypo_page.html#fixed_points_1d_anchor";
else if ( aHypType == "MaxElementArea")
@@
-561,6
+582,8
@@
QString SMESHGUI_GenericHypothesisCreator::helpPage() const
aHelpFileName = "a1d_meshing_hypo_page.html#start_and_end_length_anchor";
else if ( aHypType == "Deflection1D")
aHelpFileName = "a1d_meshing_hypo_page.html#deflection_1d_anchor";
aHelpFileName = "a1d_meshing_hypo_page.html#start_and_end_length_anchor";
else if ( aHypType == "Deflection1D")
aHelpFileName = "a1d_meshing_hypo_page.html#deflection_1d_anchor";
+ else if ( aHypType == "Adaptive1D")
+ aHelpFileName = "a1d_meshing_hypo_page.html#adaptive_1d_anchor";
else if ( aHypType == "AutomaticLength")
aHelpFileName = "a1d_meshing_hypo_page.html#automatic_length_anchor";
else if ( aHypType == "NumberOfSegments")
else if ( aHypType == "AutomaticLength")
aHelpFileName = "a1d_meshing_hypo_page.html#automatic_length_anchor";
else if ( aHypType == "NumberOfSegments")
@@
-666,7
+689,7
@@
void SMESHGUI_HypothesisDlg::onHelp()
if (app) {
QString name = "SMESH";
if(myCreator) {
if (app) {
QString name = "SMESH";
if(myCreator) {
- QVariant pluginName = myCreator->property(
PLUGIN_NAME
);
+ QVariant pluginName = myCreator->property(
SMESH::Plugin_Name()
);
if( pluginName.isValid() ) {
QString rootDir = pluginName.toString() + "PLUGIN_ROOT_DIR";
QString varValue = QString( getenv(rootDir.toLatin1().constData()));
if( pluginName.isValid() ) {
QString rootDir = pluginName.toString() + "PLUGIN_ROOT_DIR";
QString varValue = QString( getenv(rootDir.toLatin1().constData()));
@@
-707,9
+730,10
@@
HypothesisData::HypothesisData( const QString& theTypeName,
const QString& theClientLibName,
const QString& theLabel,
const QString& theIconId,
const QString& theClientLibName,
const QString& theLabel,
const QString& theIconId,
+ const QString& theContext,
const QList<int>& theDim,
const QList<int>& theDim,
- const bool theIsAux,
- const QStringList& the
Needed
Hypos,
+ const bool theIsAux
OrNeedHyp
,
+ const QStringList& the
Basic
Hypos,
const QStringList& theOptionalHypos,
const QStringList& theInputTypes,
const QStringList& theOutputTypes,
const QStringList& theOptionalHypos,
const QStringList& theInputTypes,
const QStringList& theOutputTypes,
@@
-721,9
+745,10
@@
HypothesisData::HypothesisData( const QString& theTypeName,
ClientLibName( theClientLibName ),
Label( theLabel ),
IconId( theIconId ),
ClientLibName( theClientLibName ),
Label( theLabel ),
IconId( theIconId ),
+ Context( theContext ),
Dim( theDim ),
Dim( theDim ),
- IsAux
( theIsAux
),
-
NeededHypos( theNeeded
Hypos ),
+ IsAux
OrNeedHyp( theIsAuxOrNeedHyp
),
+
BasicHypos( theBasic
Hypos ),
OptionalHypos( theOptionalHypos ),
InputTypes( theInputTypes ),
OutputTypes( theOutputTypes ),
OptionalHypos( theOptionalHypos ),
InputTypes( theInputTypes ),
OutputTypes( theOutputTypes ),