Copyright update 2022

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

diff --git a/src/HOMARDGUI/MonCreateBoundaryAn.h b/src/HOMARDGUI/MonCreateBoundaryAn.h
index b1bb77a0c0bba1d5796bfe84be544e592d365dfc..4b52c663f91badbd196192ab2e127204705d50c5 100644 (file)
--- a/src/HOMARDGUI/MonCreateBoundaryAn.h
+++ b/src/HOMARDGUI/MonCreateBoundaryAn.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2011-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2022  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_CREATEBOUNDARYAN_H
 #define MON_CREATEBOUNDARYAN_H
 
+#include "HOMARDGUI_Exports.hxx"
 
 #include <SALOMEconfig.h>
 #include <SalomeApp_Module.h>
@@ -28,11 +29,11 @@
 #include CORBA_CLIENT_HEADER(HOMARD_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Boundary)
 
-#include <CreateBoundaryAn.h>
+#include "ui_CreateBoundaryAn.h"
 #include <QDialog>
 
 class MonCreateCase;
-class MonCreateBoundaryAn : public QDialog, public Ui_CreateBoundaryAn
+class HOMARD_EXPORT MonCreateBoundaryAn : public QDialog, public Ui_CreateBoundaryAn
 {
     Q_OBJECT
 
@@ -49,19 +50,22 @@ protected :
 
     MonCreateCase * _parent;
 
-    QString _aName;
+    QString _Name;
     QString _aCaseName;
 
-    double _Xmin, _Xmax, _Xincr, _Ymin, _Ymax, _Yincr, _Zmin, _Zmax, _Zincr, _DMax ;
     int _Type;
     double _BoundaryAnXcentre, _BoundaryAnYcentre, _BoundaryAnZcentre, _BoundaryAnRayon;
     double _BoundaryAnXaxis, _BoundaryAnYaxis, _BoundaryAnZaxis;
     double _Xcentre, _Ycentre, _Zcentre, _Rayon ;
+    double _Xmin, _Xmax, _Xincr, _Ymin, _Ymax, _Yincr, _Zmin, _Zmax, _Zincr, _DMax ;
     double _BoundaryAnXcone1, _BoundaryAnYcone1, _BoundaryAnZcone1, _BoundaryAnRayon1;
     double _BoundaryAnXcone2, _BoundaryAnYcone2, _BoundaryAnZcone2, _BoundaryAnRayon2;
     double _BoundaryAnXaxisCone, _BoundaryAnYaxisCone, _BoundaryAnZaxisCone;
     double _BoundaryAnXorigCone, _BoundaryAnYorigCone, _BoundaryAnZorigCone;
     double _BoundaryAngle;
+    double _BoundaryAnToreXcentre, _BoundaryAnToreYcentre, _BoundaryAnToreZcentre;
+    double _BoundaryAnToreXaxe, _BoundaryAnToreYaxe, _BoundaryAnToreZaxe;
+    double _BoundaryAnToreRRev, _BoundaryAnToreRPri;
 
 
     bool Chgt;
@@ -73,8 +77,8 @@ protected :
     virtual void InitValBoundaryAn();
     virtual void InitMinMax();
     virtual void SetNewName();
-    virtual void convertRayonAngle(int option);
     virtual bool CreateOrUpdateBoundaryAn();
+    virtual void convertRayonAngle(int option);
 
 public slots:
     virtual void SetCylinder();
@@ -82,6 +86,7 @@ public slots:
     virtual void SetCone();
     virtual void SetConeR();
     virtual void SetConeA();
+    virtual void SetTore();
     virtual void PushOnOK();
     virtual bool PushOnApply();
     virtual void PushOnHelp();