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
Merge remote branch 'origin/V8_5_asterstudy'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Hypotheses.h
diff --git
a/src/SMESHGUI/SMESHGUI_Hypotheses.h
b/src/SMESHGUI/SMESHGUI_Hypotheses.h
index 0852bc60ea228e15d28ae09e10fe9574069bac73..933e5a67b825f09ae1db4432c2e4257874cc87b8 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Hypotheses.h
+++ b/
src/SMESHGUI/SMESHGUI_Hypotheses.h
@@
-72,6
+72,9
@@
public:
QString getMainShapeEntry() const { return myMainShapeEntry; }
void setMainShapeEntry( const QString& theEntry ) { myMainShapeEntry = theEntry; }
QString getMainShapeEntry() const { return myMainShapeEntry; }
void setMainShapeEntry( const QString& theEntry ) { myMainShapeEntry = theEntry; }
+ void setNoGeomMesh( const bool noGeom ) { myNoGeomMesh = noGeom; }
+ bool getNoGeomMesh() const { return myNoGeomMesh; }
+
signals:
void finished( int );
signals:
void finished( int );
@@
-87,7
+90,7
@@
protected:
isVariable = false;
}
const char* text() const {
isVariable = false;
}
const char* text() const {
- ((QByteArray&) myTextAsBytes) = myText.to
Latin1
(); return myTextAsBytes.constData();
+ ((QByteArray&) myTextAsBytes) = myText.to
Utf8
(); return myTextAsBytes.constData();
}
};
}
};
@@
-138,6
+141,7
@@
private:
ListOfWidgets myParamWidgets;
ListOfWidgets myParamLabels;
bool myIsCreate;
ListOfWidgets myParamWidgets;
ListOfWidgets myParamLabels;
bool myIsCreate;
+ bool myNoGeomMesh; //!< true for a mesh not based on geometry
QtxDialog* myDlg;
QString myShapeEntry;
QString myMainShapeEntry;
QtxDialog* myDlg;
QString myShapeEntry;
QString myMainShapeEntry;
@@
-177,7
+181,7
@@
struct HypothesisData
const QList<int>&, const bool,
const QStringList&, const QStringList&,
const QStringList&, const QStringList&,
const QList<int>&, const bool,
const QStringList&, const QStringList&,
const QStringList&, const QStringList&,
- const
bool=true, const bool supportSub=false
);
+ const
int, const bool supportSub
);
QString TypeName; //!< hypothesis type name
QString PluginName; //!< plugin name
QString TypeName; //!< hypothesis type name
QString PluginName; //!< plugin name
@@
-191,7
+195,9
@@
struct HypothesisData
QList<int> Dim; //!< list of supported dimensions (see SMESH::Dimension enumeration)
bool IsAuxOrNeedHyp; //!< TRUE if given HYPOTHESIS is auxiliary one, FALSE otherwise
//!< TRUE if given ALGORITHM can't work w/o hypotheses
QList<int> Dim; //!< list of supported dimensions (see SMESH::Dimension enumeration)
bool IsAuxOrNeedHyp; //!< TRUE if given HYPOTHESIS is auxiliary one, FALSE otherwise
//!< TRUE if given ALGORITHM can't work w/o hypotheses
- bool IsNeedGeometry; //!< TRUE if the algorithm works with shapes only, FALSE otherwise
+ int IsNeedGeometry; //!< 1 if the algorithm works with shapes only,
+ //!< -1 if the algorithm works without shapes only,
+ //!< 0 if the algorithm works in both cases
bool IsSupportSubmeshes; //!< TRUE if the algorithm building all-dim elems supports sub-meshes
// for algorithm only: dependencies algo <-> algo and algo -> hypos
bool IsSupportSubmeshes; //!< TRUE if the algorithm building all-dim elems supports sub-meshes
// for algorithm only: dependencies algo <-> algo and algo -> hypos