From: eap <eap@opencascade.com>
Date: Fri, 23 Sep 2011 12:56:21 +0000 (+0000)
Subject: 0021364: EDF NETGENPLUGIN: Dump of netgen parameters has duplicate lines
X-Git-Tag: V6_4_0a1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0e4677714ec23964d6358920c2cc4bd1a8d128e7;p=plugins%2Fnetgenplugin.git

0021364: EDF NETGENPLUGIN: Dump of netgen parameters has duplicate lines
  in checkParams(), do not restore old params if check is OK
---

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
index fbc6f82..b1a0c5c 100644
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
@@ -24,7 +24,6 @@
 //  File   : NETGENPluginGUI_HypothesisCreator.cxx
 //  Author : Michael Zorin
 //  Module : NETGENPlugin
-//  $Header: 
 //
 #include "NETGENPluginGUI_HypothesisCreator.h"
 
@@ -54,15 +53,15 @@
 #include <QHeaderView>
 #include <QPushButton>
 
- enum Fineness
-   {
-     VeryCoarse,
-     Coarse,
-     Moderate,
-     Fine,
-     VeryFine,
-     UserDefined
-   };
+enum Fineness
+  {
+    VeryCoarse,
+    Coarse,
+    Moderate,
+    Fine,
+    VeryFine,
+    UserDefined
+  };
 
 enum {
   STD_TAB = 0,
@@ -88,7 +87,7 @@ enum {
 };
 
 NETGENPluginGUI_HypothesisCreator::NETGENPluginGUI_HypothesisCreator( const QString& theHypType )
-: SMESHGUI_GenericHypothesisCreator( theHypType )
+  : SMESHGUI_GenericHypothesisCreator( theHypType )
 {
   myGeomSelectionTools = NULL;
   myLocalSizeMap.clear();
@@ -107,7 +106,7 @@ bool NETGENPluginGUI_HypothesisCreator::checkParams(QString& msg) const
   readParamsFromHypo( data_old );
   readParamsFromWidgets( 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 = myMinSize->isValid(msg,true) && res;
@@ -116,6 +115,10 @@ bool NETGENPluginGUI_HypothesisCreator::checkParams(QString& msg) const
     res = myNbSegPerEdge->isValid(msg,true) && res;
   if ( myNbSegPerRadius )
     res = myNbSegPerRadius->isValid(msg,true) && res;
+
+  if ( !res ) //  -- issue 0021364: Dump of netgen parameters has duplicate lines
+    storeParamsToHypo( data_old );
+
   return res;
 }