Appliquer et/ou fermer pour les zones et les frontières analytiques

[modules/homard.git] / src / HOMARDGUI / MonCreateZone.h

diff --git a/src/HOMARDGUI/MonCreateZone.h b/src/HOMARDGUI/MonCreateZone.h
index b9764af2a6efa6b2dbb7eb123b858dbbcd8047f5..a834769371d46447757d1e6a4730181b9c62f7e9 100644 (file)
--- a/src/HOMARDGUI/MonCreateZone.h
+++ b/src/HOMARDGUI/MonCreateZone.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2011-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2016  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
@@ -20,6 +20,7 @@
 #ifndef MON_CREATEZONE_H
 #define MON_CREATEZONE_H
 
+#include "HOMARDGUI_Exports.hxx"
 
 #include <SALOMEconfig.h>
 #include <SalomeApp_Module.h>
@@ -27,11 +28,11 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 #include CORBA_CLIENT_HEADER(HOMARD_Gen)
 
-#include <CreateZone.h>
+#include "ui_CreateZone.h"
 #include <QDialog>
 
 class MonCreateHypothesis;
-class MonCreateZone : public QDialog, public Ui_CreateZone
+class HOMARD_EXPORT MonCreateZone : public QDialog, public Ui_CreateZone
 {
     Q_OBJECT
 
@@ -48,29 +49,28 @@ protected :
 
     MonCreateHypothesis * _parent;
 
-    QString _aZoneName;
+    QString _Name;
     QString _aCaseName;
 
     int _Orient;
     int _Type;
     double _Xcentre, _Ycentre, _Zcentre, _Rayon ;
-    double _ZoneXcentre, _ZoneYcentre, _ZoneZcentre, _ZoneRayon ;
     double _Xmin, _Xmax, _Xincr, _Ymin, _Ymax, _Yincr, _Zmin, _Zmax, _Zincr ;
+    double _ZoneXcentre, _ZoneYcentre, _ZoneZcentre, _ZoneRayon ;
     double _ZoneXmin, _ZoneXmax,  _ZoneYmin, _ZoneYmax,  _ZoneZmin, _ZoneZmax ;
     double _Xaxis, _Yaxis, _Zaxis, _RayonInt, _Haut ;
     double _ZoneXaxis, _ZoneYaxis, _ZoneZaxis, _ZoneRayonInt, _ZoneHaut ;
     double _DMax ;
 
-
     bool Chgt;
 
     HOMARD::HOMARD_Zone_var aZone ;
-    HOMARD::HOMARD_Gen_var _myHomardGen;
+    HOMARD::HOMARD_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void InitValZone();
     virtual void InitMinMax();
-    virtual void SetNewZoneName();
+    virtual void SetNewName();
     virtual bool CreateOrUpdateZone();
 
 public slots: