X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGUI%2FNETGENPluginGUI_HypothesisCreator.h;h=b629b07a2f3f352f40e32541834175d58b6b8f40;hb=2a56740e9b9c18f0e826830439f85d2e7a648d1a;hp=8ca5992f24875c5d9fca69d54a089bfe95d08705;hpb=34f646e4657878e684b461fe8b3144e282c63945;p=plugins%2Fnetgenplugin.git

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
index 8ca5992..b629b07 100644
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -35,20 +35,21 @@
 
 #include <TopAbs_ShapeEnum.hxx>
 
-class SMESHGUI_SpinBox;
 class GeomSelectionTools;
-class QComboBox;
 class QCheckBox;
+class QComboBox;
 class QLineEdit;
 class QTableWidget;
+class SMESHGUI_SpinBox;
+class SalomeApp_IntSpinBox;
 
 typedef struct
 {
-  double  myMaxSize, myMinSize, myGrowthRate, myNbSegPerEdge, myNbSegPerRadius, myRidgeAngle, myChordalError;
-  int     myFineness;
-  bool    mySecondOrder, myAllowQuadrangles, myOptimize, mySurfaceCurvature, myFuseEdges, myChordalErrorEnabled;
+  double  myMaxSize, myMinSize, myGrowthRate, myNbSegPerEdge, myNbSegPerRadius, myRidgeAngle, myChordalError, myElemSizeWeight, myEdgeCornerAngle, myChartAngle, myOuterChartAngle, myRestHChartDistFactor, myRestHLineLengthFactor, myRestHCloseEdgeFactor, myRestHSurfCurvFactor, myRestHEdgeAngleFactor, myRestHSurfMeshCurvFactor;
+  int     myFineness, myNbSurfOptSteps, myNbVolOptSteps, myWorstElemMeasure;
+  bool    mySecondOrder, myAllowQuadrangles, myOptimize, mySurfaceCurvature, myFuseEdges, myChordalErrorEnabled, myUseDelauney, myCheckOverlapping, myCheckChartBoundary, myRestHChartDistEnable, myRestHLineLengthEnable, myRestHCloseEdgeEnable, myRestHSurfCurvEnable, myRestHEdgeAngleEnable, myRestHSurfMeshCurvEnable, myKeepExistingEdges, myMakeGroupsOfSurfaces;
   QString myName, myMeshSizeFile;
-  QString myMaxSizeVar, myMinSizeVar, myGrowthRateVar, myNbSegPerEdgeVar, myNbSegPerRadiusVar, myRidgeAngleVar, myChordalErrorVar;
+  QString myMaxSizeVar, myMinSizeVar, myGrowthRateVar, myNbSegPerEdgeVar, myNbSegPerRadiusVar, myRidgeAngleVar, myChordalErrorVar, myNbSurfOptStepsVar, myNbVolOptStepsVar, myElemSizeWeightVar, myWorstElemMeasureVar, myEdgeCornerAngleVar, myChartAngleVar, myOuterChartAngleVar, myRestHChartDistFactorVar, myRestHLineLengthFactorVar, myRestHCloseEdgeFactorVar, myRestHSurfCurvFactorVar, myRestHEdgeAngleFactorVar, myRestHSurfMeshCurvFactorVar;
 } NetgenHypothesisData;
 
 /*!
@@ -85,6 +86,7 @@ protected slots:
   virtual void     onRemoveLocalSizeOnShape();
   virtual void     onSetLocalSize(int,int);
   virtual void     onSetSizeFile();
+  virtual void     onSTLEnable();
 
 private:
   bool readParamsFromHypo( NetgenHypothesisData& ) const;
@@ -94,21 +96,50 @@ private:
   void addLocalSizeOnShape(TopAbs_ShapeEnum);
 
 private:
- QLineEdit*        myName;
- SMESHGUI_SpinBox* myMaxSize;
- SMESHGUI_SpinBox* myMinSize;
- QCheckBox*        mySecondOrder;
- QCheckBox*        myOptimize;
- QComboBox*        myFineness;
- SMESHGUI_SpinBox* myGrowthRate;
- SMESHGUI_SpinBox* myNbSegPerEdge;
- SMESHGUI_SpinBox* myNbSegPerRadius;
- SMESHGUI_SpinBox* myRidgeAngle;
- QCheckBox*        myChordalErrorEnabled;
- SMESHGUI_SpinBox* myChordalError;
- QCheckBox*        myAllowQuadrangles;
- QCheckBox*        mySurfaceCurvature;
- QCheckBox*        myFuseEdges;
+ QLineEdit*            myName;
+ SMESHGUI_SpinBox*     myMaxSize;
+ SMESHGUI_SpinBox*     myMinSize;
+ QCheckBox*            mySecondOrder;
+ QCheckBox*            myOptimize;
+ QComboBox*            myFineness;
+ SMESHGUI_SpinBox*     myGrowthRate;
+ SMESHGUI_SpinBox*     myNbSegPerEdge;
+ SMESHGUI_SpinBox*     myNbSegPerRadius;
+ QCheckBox*            myChordalErrorEnabled;
+ SMESHGUI_SpinBox*     myChordalError;
+ QCheckBox*            myAllowQuadrangles;
+ QCheckBox*            mySurfaceCurvature;
+ // optimizer
+ SMESHGUI_SpinBox*     myElemSizeWeight;
+ SalomeApp_IntSpinBox* myNbSurfOptSteps;
+ SalomeApp_IntSpinBox* myNbVolOptSteps;
+ // insider
+ QCheckBox*            myFuseEdges;
+ SalomeApp_IntSpinBox* myWorstElemMeasure;
+ QCheckBox*            myUseDelauney;
+ QCheckBox*            myCheckOverlapping;
+ QCheckBox*            myCheckChartBoundary;
+ // stl options
+ QCheckBox*            myKeepExistingEdges;
+ QCheckBox*            myMakeGroupsOfSurfaces;
+ // stl charts
+ SMESHGUI_SpinBox*     myRidgeAngle;
+ SMESHGUI_SpinBox*     myEdgeCornerAngle;
+ SMESHGUI_SpinBox*     myChartAngle;
+ SMESHGUI_SpinBox*     myOuterChartAngle;
+ // stl size
+ SMESHGUI_SpinBox*     myRestHChartDistFactor;
+ SMESHGUI_SpinBox*     myRestHLineLengthFactor;
+ SMESHGUI_SpinBox*     myRestHCloseEdgeFactor;
+ SMESHGUI_SpinBox*     myRestHSurfCurvFactor;
+ SMESHGUI_SpinBox*     myRestHEdgeAngleFactor;
+ SMESHGUI_SpinBox*     myRestHSurfMeshCurvFactor;
+ QCheckBox*            myRestHChartDistEnable;
+ QCheckBox*            myRestHLineLengthEnable;
+ QCheckBox*            myRestHCloseEdgeEnable;
+ QCheckBox*            myRestHSurfCurvEnable;
+ QCheckBox*            myRestHEdgeAngleEnable;
+ QCheckBox*            myRestHSurfMeshCurvEnable;
 
  bool myIs2D;   // 2D or 3D
  bool myIsONLY; // one dim or several