// 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
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{
+ SURFACE, // surface adaption when meshDim == 2\r
+ VOLUME, // \r
+ BOTH
+};\r
//=================================================================================\r
// class : SMESHGUI_MgAdaptDlg\r
// purpose :\r
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
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
QTabWidget* myTabWidget;\r
\r
\r
- MgAdaptHypothesisData* myData;\r
- MgAdapt* model;\r
+ SMESH::MgAdaptHypothesisData* myData;\r
+ SMESH::MG_ADAPT_ptr model;\r
\r
};\r
\r
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
signals:\r
void updateSelection();\r
void toExportMED(const char *);\r
+ void meshDimSignal(ADAPTATION_MODE aMode);\r
public slots:\r
\r
protected slots:\r
\r
QString getMedFileName(bool avertir);\r
LightApp_SelectionMgr* selMgr ;\r
-\r
+ med_int meshDim;\r
std::map<QString, int> myFieldList;\r
\r
\r
\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