Revert "Synchronize adm files"

[modules/homard.git] / src / HOMARDGUI / MonEditCase.cxx

diff --git a/src/HOMARDGUI/MonEditCase.cxx b/src/HOMARDGUI/MonEditCase.cxx
index 20f55c41a7f97390a49500c4ea547c766a28a5ad..3d2c4c2181107c472b0d6e50b0d1a87999f1d339 100644 (file)
--- a/src/HOMARDGUI/MonEditCase.cxx
+++ b/src/HOMARDGUI/MonEditCase.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2011-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2014  CEA/DEN, EDF R&D
 //
 // 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
@@ -17,8 +17,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-using namespace std;
-
 #include "MonEditCase.h"
 
 #include "SalomeApp_Tools.h"
@@ -26,21 +24,22 @@ using namespace std;
 #include "HomardQtCommun.h"
 #include <utilities.h>
 
+using namespace std;
 
 // -------------------------------------------------------------
 /* Constructs a MonEditCase
     herite de MonCreateCase
 */
 // -------------------------------------------------------------
-MonEditCase::MonEditCase ( QWidget* parent, bool modal,
+MonEditCase::MonEditCase ( bool modal,
                            HOMARD::HOMARD_Gen_var myHomardGen,
                            QString CaseName ):
-   MonCreateCase(parent, modal, myHomardGen)
+   MonCreateCase(modal, myHomardGen)
 {
     MESSAGE("Debut de MonEditCase" << CaseName.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_CASE_EDIT_WINDOW_TITLE"));
     _aCaseName = CaseName;
-    aCase = _myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+    aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
     InitValEdit();
 }
 // ------------------------------
@@ -53,8 +52,8 @@ void MonEditCase::InitValEdit()
 // ------------------------------
 {
   MESSAGE("InitValEdit");
-  LECaseName->setText(_aCaseName);
-  LECaseName->setReadOnly(true);
+  LEName->setText(_aCaseName);
+  LEName->setReadOnly(true);
 
   QString aDirName = aCase->GetDirName();
   LEDirName->setText(aDirName);
@@ -62,7 +61,7 @@ void MonEditCase::InitValEdit()
   PushDir->setVisible(0);
 
   QString _aitername=aCase->GetIter0Name();
-  HOMARD::HOMARD_Iteration_var aIter = _myHomardGen->GetIteration(_aitername.toStdString().c_str());
+  HOMARD::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(_aitername.toStdString().c_str());
   QString aFileName = aIter->GetMeshFile();
   LEFileName->setText(aFileName);
   LEFileName->setReadOnly(true);
@@ -71,24 +70,23 @@ void MonEditCase::InitValEdit()
   int ConfType=aCase->GetConfType();
   if(ConfType==1)
   {
-      GBTypeNoConf->setVisible(0);
-      RBConforme->setChecked(true);
+    RBConforme->setChecked(true);
+    GBTypeNoConf->setVisible(0);
   }
   else
   {
     RBNonConforme->setChecked(true);
     GBTypeNoConf->setVisible(1);
+    if (ConfType==2) { RB1NpM->setChecked(true);};
+    if (ConfType==3) { RB1NpA->setChecked(true);};
+    if (ConfType==4) { RBQuelconque->setChecked(true);};
     RB1NpM->setEnabled(false);
     RB1NpA->setEnabled(false);
     RBQuelconque->setEnabled(false);
   };
 
-  if (_ConfType==2) { RB1NpM->setChecked(true);};
-  if (_ConfType==3) { RB1NpA->setChecked(true);};
-  if (_ConfType==4) { RBQuelconque->setChecked(true);};
-
-  RBNonConforme->setEnabled(false);
   RBConforme->setEnabled(false);
+  RBNonConforme->setEnabled(false);
 
 //    Non affichage du mode de suivi de frontiere
   CBBoundaryA->setVisible(0);
@@ -110,7 +108,7 @@ void MonEditCase::InitValEdit()
       NomFron = mesBoundarys[i++];
       MESSAGE("NomFron "<<NomFron.toStdString().c_str());
 //        L'objet associe pour en deduire le type
-      HOMARD::HOMARD_Boundary_var myBoundary = _myHomardGen->GetBoundary(NomFron.toStdString().c_str());
+      HOMARD::HOMARD_Boundary_var myBoundary = myHomardGen->GetBoundary(NomFron.toStdString().c_str());
       int type_obj = myBoundary->GetType() ;
 //        C'est une frontiere discrete
 //        Rermarque : on ne gere pas les groupes