X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMULTIPRGUI%2FMULTIPR_GUI.h;h=91aa2d282bbdbaed7a748a67ffa344f09450283f;hb=b843e11a7c1378fa4c1f104f4fbb5674781aee27;hp=3e2e7d8914689eb02bc3a88494e3a23ec3dab9d4;hpb=50689122a40844cd82e7d7b9b38d96bb8b4bdbd0;p=modules%2Fmultipr.git

diff --git a/src/MULTIPRGUI/MULTIPR_GUI.h b/src/MULTIPRGUI/MULTIPR_GUI.h
index 3e2e7d8..91aa2d2 100644
--- a/src/MULTIPRGUI/MULTIPR_GUI.h
+++ b/src/MULTIPRGUI/MULTIPR_GUI.h
@@ -21,17 +21,12 @@
 
 #include <SalomeApp_Module.h>
 #include <LightApp_DataObject.h>
-#include <LightApp_DataModel.h>
-#include <LightApp_RootObject.h>
+//#include <LightApp_DataModel.h>
+#include <SalomeApp_DataModel.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(MULTIPR)
 
-#include <qdialog.h>
-#include <qprogressdialog.h>
-#include <qstring.h>
-#include <qvariant.h>
-
 #include "MULTIPR_ProgressCallback.hxx"
 
 
@@ -42,6 +37,8 @@
 class SalomeApp_Application;
 class CAM_Module;
 
+class SUIT_Desktop;
+
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
@@ -53,6 +50,9 @@ class QLineEdit;
 class QSpinBox;
 class QPushButton;
 
+class QTimer;
+//class MULTIPR_GUI_ProgressCallbackDlg;
+class QProgressDialog;
 
 //*****************************************************************************
 // Class MULTIPR_GUI
@@ -61,77 +61,100 @@ class QPushButton;
 
 class MULTIPR_GUI: public SalomeApp_Module
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	MULTIPR_GUI();
-	
-	void    initialize(CAM_Application*);
-	QString engineIOR() const;
-	void    windows(QMap<int, int>&) const;
-	
-	MULTIPR_ORB::MULTIPR_Obj_ptr getMULTIPRObj();
-	SalomeApp_Application* getAppli() const;
-	void selected(QStringList&, const bool);
-	
-	static MULTIPR_ORB::MULTIPR_Gen_ptr InitMULTIPRGen(SalomeApp_Application*);
-	
-	const QStringList& getSelectedParts() const { return mSelectedParts; }
+
+    MULTIPR_GUI();
+    
+    virtual ~MULTIPR_GUI();
+    
+    void initialize(CAM_Application*);
+    
+    QString engineIOR() const;
+    
+    void windows(QMap<int, int>&) const;
+    
+    MULTIPR_ORB::MULTIPR_Obj_ptr getMULTIPRObj();
+    void setMULTIPRObj (MULTIPR_ORB::MULTIPR_Obj_ptr theObj);
+    
+    SalomeApp_Application* getAppli() const;
+    
+    void selected(QStringList&, const bool);
+    
+    const QStringList& getSelectedParts() const { return mSelectedParts; }
+
+    static SUIT_Desktop* desktop();
 
 public slots:
-	bool deactivateModule(SUIT_Study*);
-	bool activateModule(SUIT_Study*);
+
+    bool deactivateModule(SUIT_Study*);
+    bool activateModule(SUIT_Study*);
 
 protected slots:
-	void OnImportFromMEDFile();
-	void OnPartition1();
-	void OnPartition2();
-	void OnDecimate();
-	void OnRemove();
-	void OnSave();
-	
-	void retrieveSelectedParts();
-	bool isPartExist(const char* partName);
-	
+
+    void OnImportFromMEDFile();
+    void OnPartition1();
+    void OnPartition2();
+    void OnDecimate();
+    void OnRemove();
+    void OnSave();
+
+    void timerDone(); // update saving progress dialog
+
 protected:
-	virtual CAM_DataModel* createDataModel();
-	
+
+    virtual CAM_DataModel* createDataModel();
+
+    void retrieveSelectedParts();
+    bool isPartExist(const char* partName);
+    bool removeLowerResolution();
+    
 protected:
 
-	enum 
-	{ 
-		ACTION_IMPORT_MED = 190,
-		ACTION_SAVE,
-		ACTION_REMOVE,
-		ACTION_SPLIT,
-		ACTION_DECIMATE
-	};
-	
+    enum 
+    { 
+        ACTION_IMPORT_MED = 190,
+        ACTION_SAVE,
+        ACTION_REMOVE,
+        ACTION_SPLIT,
+        ACTION_DECIMATE
+    };
+    
 private:
-	QString                      mMEDFileName;
-	QStringList                  mSelectedParts;
-	MULTIPR_ORB::MULTIPR_Obj_ptr mMULTIPRObj;
-  
+
+    QString                      mMEDFileName;
+    QStringList                  mSelectedParts;
+    //MULTIPR_ORB::MULTIPR_Obj_ptr mMULTIPRObj;
+    MULTIPR_ORB::MULTIPR_Obj_var mMULTIPRObj;
+
+    QProgressDialog*             mProgress;
+    //MULTIPR_GUI_ProgressCallbackDlg* mProgress;
+    QTimer*                      mTimer;
+
 }; // class MULTIPR_GUI
 
 
 //*****************************************************************************
 // Class MULTIPR_GUI_DataObject
+// To use Object Browser
 //*****************************************************************************
 
 class MULTIPR_GUI_DataObject : public LightApp_DataObject
 {
 public:
-	MULTIPR_GUI_DataObject(SUIT_DataObject* parent, const char* name);
-	virtual ~MULTIPR_GUI_DataObject();
-	
-	virtual QString entry()   const;
-	virtual QString name()    const;
-	virtual QPixmap icon()    const;
-	virtual QString toolTip() const;
+
+    MULTIPR_GUI_DataObject(SUIT_DataObject* parent, const char* name);
+    virtual ~MULTIPR_GUI_DataObject();
+    
+    virtual QString entry()   const;
+    virtual QString name()    const;
+    virtual QPixmap icon()    const;
+    virtual QString toolTip() const;
 
 protected:
-	QString mName;
+
+    QString mName;
 };
 
 
@@ -139,20 +162,25 @@ protected:
 // Class MULTIPR_GUI_DataObject_Module
 //*****************************************************************************
 
-class MULTIPR_GUI_DataObject_Module : public MULTIPR_GUI_DataObject, public LightApp_ModuleObject
+
+class MULTIPR_GUI_DataObject_Module : public MULTIPR_GUI_DataObject
 {
 public:
-	MULTIPR_GUI_DataObject_Module(CAM_DataModel* dm, SUIT_DataObject* parent, const char* name);
-	virtual ~MULTIPR_GUI_DataObject_Module();
-	
-	virtual QString entry()   const;
-	virtual QString name()    const;
-	virtual QPixmap icon()    const;
-	virtual QString toolTip() const;
+
+    MULTIPR_GUI_DataObject_Module(CAM_DataModel* dm, SUIT_DataObject* parent, const char* name);
+    virtual ~MULTIPR_GUI_DataObject_Module();
+    
+    virtual QString entry()   const;
+    virtual QString name()    const;
+    virtual QPixmap icon()    const;
+    virtual QString toolTip() const;
 
 private:
-};
 
+    CAM_DataModel* mDm;
+    SUIT_DataObject* mParent;
+
+};
 
 //*****************************************************************************
 // Class MULTIPR_GUI_DataObject_Mesh
@@ -161,14 +189,13 @@ private:
 class MULTIPR_GUI_DataObject_Mesh : public MULTIPR_GUI_DataObject
 {
 public:
-	MULTIPR_GUI_DataObject_Mesh(SUIT_DataObject* parent, const char* name);
-	virtual ~MULTIPR_GUI_DataObject_Mesh();
-	
-	virtual QString entry()   const;
-	virtual QPixmap icon()    const;
-	virtual QString toolTip() const;
 
-private:
+    MULTIPR_GUI_DataObject_Mesh(SUIT_DataObject* parent, const char* name);
+    virtual ~MULTIPR_GUI_DataObject_Mesh();
+    
+    virtual QString entry()   const;
+    virtual QPixmap icon()    const;
+    virtual QString toolTip() const;
 };
 
 
@@ -179,19 +206,21 @@ private:
 class MULTIPR_GUI_DataObject_Part : public MULTIPR_GUI_DataObject
 {
 public:
-	MULTIPR_GUI_DataObject_Part(SUIT_DataObject* parent, const char* name, const char* info);
-	virtual ~MULTIPR_GUI_DataObject_Part();
-	
-	virtual QString entry()   const;
-	virtual QPixmap icon()    const;
-	virtual QString toolTip() const;
+
+    MULTIPR_GUI_DataObject_Part(SUIT_DataObject* parent, const char* name, const char* info);
+    virtual ~MULTIPR_GUI_DataObject_Part();
+    
+    virtual QString entry()   const;
+    virtual QPixmap icon()    const;
+    virtual QString toolTip() const;
 
 protected:
-	QString mMeshName;
-	int     mId;
-	QString mPath;
-	QString mMEDFileName;
-	QString mTooltip;
+
+    QString mMeshName;
+    int     mId;
+    QString mPath;
+    QString mMEDFileName;
+    QString mTooltip;
 };
 
 
@@ -202,14 +231,13 @@ protected:
 class MULTIPR_GUI_DataObject_Resolution : public MULTIPR_GUI_DataObject_Part
 {
 public:
-	MULTIPR_GUI_DataObject_Resolution(SUIT_DataObject* parent, const char* name, const char* info);
-	virtual ~MULTIPR_GUI_DataObject_Resolution();
-	
-	virtual QString entry()   const;
-	virtual QPixmap icon()    const;
-	virtual QString toolTip() const;
 
-private:
+    MULTIPR_GUI_DataObject_Resolution(SUIT_DataObject* parent, const char* name, const char* info);
+    virtual ~MULTIPR_GUI_DataObject_Resolution();
+    
+    virtual QString entry()   const;
+    virtual QPixmap icon()    const;
+    virtual QString toolTip() const;
 };
 
 
@@ -217,17 +245,25 @@ private:
 // Class MULTIPR_GUI_DataModel
 //*****************************************************************************
 
-class MULTIPR_GUI_DataModel : public LightApp_DataModel
+//class MULTIPR_GUI_DataModel : public LightApp_DataModel
+class MULTIPR_GUI_DataModel : public SalomeApp_DataModel
 {
+
 public:
-	MULTIPR_GUI_DataModel(CAM_Module*);
-	virtual ~MULTIPR_GUI_DataModel();
+
+    MULTIPR_GUI_DataModel(CAM_Module*);
+    virtual ~MULTIPR_GUI_DataModel();
+
+    virtual void update (LightApp_DataObject* = 0, LightApp_Study* = 0);
 
 protected:
-	virtual void build();
-	
+
+    virtual void build();
+    void buildAll (LightApp_Study* = 0);
+
 private:
-	MULTIPR_GUI* mMULTIPR_GUI;
+
+    MULTIPR_GUI* mMULTIPR_GUI;
 };
 
 
@@ -235,4 +271,3 @@ private:
 
 
 // EOF
-