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 from V6_main 11/02/2013
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Hypotheses.h
diff --git
a/src/SMESHGUI/SMESHGUI_Hypotheses.h
b/src/SMESHGUI/SMESHGUI_Hypotheses.h
index c15484b84b3accbdf1891af22217c485ddf49273..22fc991f2e012238bc71bda3f119b61ee145fa43 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Hypotheses.h
+++ b/
src/SMESHGUI/SMESHGUI_Hypotheses.h
@@
-78,14
+78,17
@@
signals:
protected:
struct StdParam
{
protected:
struct StdParam
{
- QString myName;
- QVariant myValue;
- bool isVariable;
- QString myText;
- StdParam(){
+ QString myName;
+ QVariant myValue;
+ bool isVariable;
+ QString myText;
+ QByteArray myTextAsBytes;
+ StdParam() {
isVariable = false;
}
isVariable = false;
}
- const char* text() const { return myText.toLatin1().constData(); }
+ const char* text() const {
+ ((QByteArray&) myTextAsBytes) = myText.toLatin1(); return myTextAsBytes.constData();
+ }
};
typedef QList<StdParam> ListOfStdParams;
};
typedef QList<StdParam> ListOfStdParams;
@@
-127,6
+130,7
@@
private:
private:
SMESH::SMESH_Hypothesis_var myHypo, myInitParamsHypo;
private:
SMESH::SMESH_Hypothesis_var myHypo, myInitParamsHypo;
+ bool myToDeleteInitParamsHypo;
QString myHypName;
QString myHypType;
ListOfWidgets myParamWidgets;
QString myHypName;
QString myHypType;
ListOfWidgets myParamWidgets;