X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FMG_ADAPTGUI.hxx;h=cd2bf2bbf312ef3f3a14d0c7e6827d961b744279;hb=55f658966bd743c8a7a5c9405f4d09e60657b97c;hp=4cc94cca99206465459636487abe187fa7d23351;hpb=86be227dee12b1a2d7dafc3308597f1566ef950f;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/MG_ADAPTGUI.hxx b/src/SMESHGUI/MG_ADAPTGUI.hxx
index 4cc94cca9..cd2bf2bbf 100644
--- a/src/SMESHGUI/MG_ADAPTGUI.hxx
+++ b/src/SMESHGUI/MG_ADAPTGUI.hxx
@@ -44,7 +44,9 @@
 // model
 
 
-#include "MG_ADAPT.hxx"
+//~#include "MG_ADAPT.hxx"
+
+#include CORBA_SERVER_HEADER(MG_ADAPT)
 
 class SUIT_ViewWindow;
 class SUIT_Desktop;
@@ -88,17 +90,23 @@ class SMESHGUI_MgAdaptArguments;
 class SMESHGUI_SpinBox;
 class MgAdaptAdvWidgetTreeWidget;
 class MgAdaptAdvWidget;
-class MgAdapt;
+//~class MgAdapt;
 class QHeaderView;
 class QFileDialog;
 
 
 std::map<QString, int> GetListeChamps(QString aFile, bool errorMessage = true);
-QString lireNomMaillage(QString aFile);
-QString lireNomMaillage2(med_idt medIdt,int meshId);
+QString lireNomMaillage(QString aFile, med_int& meshDim);
+QString lireNomMaillage2(med_idt medIdt,int meshId, med_int& meshDim);
 med_idt OuvrirFichier(QString aFile);
 std::string remove_extension(const std::string& filename);
 
+
+enum ADAPTATION_MODE{
+	SURFACE, // surface adaption when meshDim == 2
+	VOLUME, //
+	BOTH
+};
 //=================================================================================
 // class    : SMESHGUI_MgAdaptDlg
 // purpose  :
@@ -109,14 +117,14 @@ class  SMESHGUI_MgAdaptDlg : public QDialog
 public:
     //! Property type
     enum Mode { Arguments, AdvancedOptions};
-    SMESHGUI_MgAdaptDlg( SalomeApp_Module*, MgAdapt*, QWidget* parent= 0,bool isCreation = true );
+    SMESHGUI_MgAdaptDlg( SalomeApp_Module*, SMESH::MG_ADAPT_ptr, QWidget* parent= 0,bool isCreation = true );
     ~SMESHGUI_MgAdaptDlg();
 
     void  buildDlg();
     void reject();
     bool checkParams(QString& msg) ;
-    void setModel(MgAdapt*);
-    MgAdapt* getModel() const;
+    //~void setModel(MgAdapt*);
+    SMESH::MG_ADAPT_ptr getModel() const;
 
 public slots:
 
@@ -132,7 +140,7 @@ protected :
     MgAdaptAdvWidget* myAdvOpt;
     bool                readParamsFromHypo( ) const ;
     bool                readParamsFromWidgets( ) ;
-    bool                storeParamsToHypo( const MgAdaptHypothesisData& ) const;
+    bool                storeParamsToHypo( const SMESH::MgAdaptHypothesisData & ) const;
 
 private:
 
@@ -141,8 +149,8 @@ private:
     QTabWidget*           myTabWidget;
 
 
-    MgAdaptHypothesisData* myData;
-    MgAdapt* model;
+    SMESH::MgAdaptHypothesisData* myData;
+    SMESH::MG_ADAPT_ptr model;
 
 };
 
@@ -156,6 +164,7 @@ public:
     SMESHGUI_MgAdaptArguments( QWidget* parent);
     ~SMESHGUI_MgAdaptArguments();
     void setMode( const Mode, const SIZEMAP );
+    med_int getMeshDim() const;
 
     QString* myFileInDir;
     QString* myFileOutDir;
@@ -210,6 +219,7 @@ public:
 signals:
     void updateSelection();
     void toExportMED(const char *);
+    void meshDimSignal(ADAPTATION_MODE aMode);
 public slots:
 
 protected slots:
@@ -217,7 +227,7 @@ protected slots:
 private slots:
     void modeChanged( int);
     void sizeMapDefChanged(int);
-    void timeStepGroupChanged(int timeStepType, bool disableOther = false, int max = 0);
+    void timeStepGroupChanged(int timeStepType, bool disableOther = false, int vmax = 0);
     void onSelectMedFilebuttonClicked();
     void clear();
     void onMedFileCheckBox(int);
@@ -227,13 +237,14 @@ private slots:
     void onLocalSelected(QString);
     void onNoTimeStep(bool disableOther = false);
     void onLastTimeStep(bool disableOther = false);
-    void onChosenTimeStep(bool disableOther = false, int max = 0);
+    void onChosenTimeStep(bool disableOther = false, int vmax = 0);
+    void visibleTimeStepRankLabel(bool visible);
 
 private:
 
     QString getMedFileName(bool avertir);
     LightApp_SelectionMgr* selMgr ;
-
+	med_int meshDim;
     std::map<QString, int> myFieldList;
 
 
@@ -281,8 +292,14 @@ public slots:
 
     void                onAddOption();
     void itemChanged(QTreeWidgetItem * tblRow, int column);
+    void onMeshDimChanged(ADAPTATION_MODE aMode);
 private slots:
     void _onWorkingDirectoryPushButton();
+private:
+    void setOptionValue(QString& option, QString& value);
+    std::map<QString, QTreeWidgetItem *> optionTreeWidgetItem;
+
+    QTreeWidgetItem* getNewQTreeWidgetItem(QTreeWidget* table, const char* option, QString& name, bool isCustom);
 
 };