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
Copyrights update 2015.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Hypotheses.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index fa9add8e0b6a73cffd1ccfe5c1feb9e8bccb49ec..ac8e4194ddd343c2179658da97b2d0c0bd4d0c4a 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
@@
-551,6
+551,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")
@@
-668,7
+670,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()));
@@
-709,9
+711,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,
@@
-723,9
+726,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 ),