X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGUI%2FHexoticPluginGUI_HypothesisCreator.h;h=3ca41230acce4ba43c66872fef73ab63414c5b62;hb=630658fb93f8a4e33fe530dd624b3f1d0b205e31;hp=1b07ea6562e2c8cdad2b16ae103cb9b998b58d89;hpb=9505068ceaa446f76e771824a29c6160e0f34578;p=plugins%2Fhexoticplugin.git

diff --git a/src/GUI/HexoticPluginGUI_HypothesisCreator.h b/src/GUI/HexoticPluginGUI_HypothesisCreator.h
index 1b07ea6..3ca4123 100644
--- a/src/GUI/HexoticPluginGUI_HypothesisCreator.h
+++ b/src/GUI/HexoticPluginGUI_HypothesisCreator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  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
@@ -26,27 +26,30 @@
 #define HexoticPLUGINGUI_HypothesisCreator_H
 
 #include "HexoticPluginGUI.h"
-
-#include <SMESHGUI_Hypotheses.h>
-#include "StdMeshersGUI_ObjectReferenceParamWdg.h"
 #include "HexoticPlugin_Hypothesis.hxx"
 
+#include <SMESHGUI_Hypotheses.h>
+#include <StdMeshersGUI_ObjectReferenceParamWdg.h>
 #include <QItemDelegate>
 
+#include CORBA_SERVER_HEADER(HexoticPlugin_Algorithm)
+
 class QtxIntSpinBox;
 class QCheckBox;
 class QLineEdit;
 class QTableWidgetItem;
 
 class HexoticPluginGUI_StdWidget;
+class HexoticPluginGUI_AdvWidget;
 class HexoticPluginGUI_SizeMapsWidget;
 class HexoticPluginGUI_ViscousLayersWidget;
+class SMESH_AdvOptionsWdg;
 
 typedef struct
 {
   QString  myName;
   int      myHexesMinLevel, myHexesMaxLevel;
-  double   myMinSize, myMaxSize;
+  double   myMinSize, myMaxSize, myApproxAngle;
   bool     myHexoticInvalidElements;
   bool     myHexoticIgnoreRidges;
   double   myHexoticSharpAngleThreshold;
@@ -56,6 +59,7 @@ typedef struct
   int      myHexoticMaxMemory;
   int      myHexoticSdMode;
   QString  myTextOptions;
+  bool     myKeepFiles,myLogInStandardOutput, myRemoveLogOnSuccess;
   HexoticPlugin_Hypothesis::THexoticSizeMaps mySizeMaps;
   int      myNbLayers;
   double   myFirstLayerSize;
@@ -101,12 +105,14 @@ private:
 
 private:
 
-//  QWidget* 		myStdGroup;
-  QLineEdit* 	myName;
-  HexoticPluginGUI_StdWidget*	         myStdWidget;
-  HexoticPluginGUI_SizeMapsWidget*       mySmpWidget;
-  HexoticPluginGUI_ViscousLayersWidget*  myVLWidget;
-  StdMeshersGUI_ObjectReferenceParamWdg* myGeomSelWdg;
+//  QWidget*            myStdGroup;
+  QLineEdit*                              myName;
+  HexoticPluginGUI_StdWidget*             myStdWidget;
+  HexoticPluginGUI_AdvWidget*             myAdvWidget;
+  mutable HexoticPlugin::string_array_var myOptions, myCustomOptions;
+  HexoticPluginGUI_SizeMapsWidget*        mySmpWidget;
+  HexoticPluginGUI_ViscousLayersWidget*   myVLWidget;
+  StdMeshersGUI_ObjectReferenceParamWdg*  myGeomSelWdg;
 
   bool                           myIs3D;
   std::vector< std::string >     mySizeMapsToRemove;
@@ -116,7 +122,8 @@ protected slots:
   void             onAddLocalSize();
   void             onRemoveLocalSize();
   void             onTabChanged(int);
-  
+  void             onAddOption();
+  void             onDirBtnClicked();
 };
 
 class SizeMapsTableWidgetDelegate : public QItemDelegate