Ménage avant intégration

[modules/smesh.git] / src / SMESHGUI / MG_ADAPTGUI.hxx

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