0021364: EDF NETGENPLUGIN: Dump of netgen parameters has duplicate lines
in checkParams(), do not restore old params if check is OK
This commit is contained in:
parent
acd8b67399
commit
0e4677714e
@ -24,7 +24,6 @@
|
|||||||
// File : NETGENPluginGUI_HypothesisCreator.cxx
|
// File : NETGENPluginGUI_HypothesisCreator.cxx
|
||||||
// Author : Michael Zorin
|
// Author : Michael Zorin
|
||||||
// Module : NETGENPlugin
|
// Module : NETGENPlugin
|
||||||
// $Header:
|
|
||||||
//
|
//
|
||||||
#include "NETGENPluginGUI_HypothesisCreator.h"
|
#include "NETGENPluginGUI_HypothesisCreator.h"
|
||||||
|
|
||||||
@ -54,15 +53,15 @@
|
|||||||
#include <QHeaderView>
|
#include <QHeaderView>
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
||||||
enum Fineness
|
enum Fineness
|
||||||
{
|
{
|
||||||
VeryCoarse,
|
VeryCoarse,
|
||||||
Coarse,
|
Coarse,
|
||||||
Moderate,
|
Moderate,
|
||||||
Fine,
|
Fine,
|
||||||
VeryFine,
|
VeryFine,
|
||||||
UserDefined
|
UserDefined
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
STD_TAB = 0,
|
STD_TAB = 0,
|
||||||
@ -88,7 +87,7 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
NETGENPluginGUI_HypothesisCreator::NETGENPluginGUI_HypothesisCreator( const QString& theHypType )
|
NETGENPluginGUI_HypothesisCreator::NETGENPluginGUI_HypothesisCreator( const QString& theHypType )
|
||||||
: SMESHGUI_GenericHypothesisCreator( theHypType )
|
: SMESHGUI_GenericHypothesisCreator( theHypType )
|
||||||
{
|
{
|
||||||
myGeomSelectionTools = NULL;
|
myGeomSelectionTools = NULL;
|
||||||
myLocalSizeMap.clear();
|
myLocalSizeMap.clear();
|
||||||
@ -107,7 +106,7 @@ bool NETGENPluginGUI_HypothesisCreator::checkParams(QString& msg) const
|
|||||||
readParamsFromHypo( data_old );
|
readParamsFromHypo( data_old );
|
||||||
readParamsFromWidgets( data_new );
|
readParamsFromWidgets( data_new );
|
||||||
bool res = storeParamsToHypo( data_new );
|
bool res = storeParamsToHypo( data_new );
|
||||||
storeParamsToHypo( data_old );
|
//storeParamsToHypo( data_old ); -- issue 0021364: Dump of netgen parameters has duplicate lines
|
||||||
|
|
||||||
res = myMaxSize->isValid(msg,true) && res;
|
res = myMaxSize->isValid(msg,true) && res;
|
||||||
res = myMinSize->isValid(msg,true) && res;
|
res = myMinSize->isValid(msg,true) && res;
|
||||||
@ -116,6 +115,10 @@ bool NETGENPluginGUI_HypothesisCreator::checkParams(QString& msg) const
|
|||||||
res = myNbSegPerEdge->isValid(msg,true) && res;
|
res = myNbSegPerEdge->isValid(msg,true) && res;
|
||||||
if ( myNbSegPerRadius )
|
if ( myNbSegPerRadius )
|
||||||
res = myNbSegPerRadius->isValid(msg,true) && res;
|
res = myNbSegPerRadius->isValid(msg,true) && res;
|
||||||
|
|
||||||
|
if ( !res ) // -- issue 0021364: Dump of netgen parameters has duplicate lines
|
||||||
|
storeParamsToHypo( data_old );
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user