Salome HOME
projects
/
modules
/
med.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MEDCalc] Presentation removal
[modules/med.git]
/
src
/
MEDCalc
/
gui
/
DatasourceController.hxx
diff --git
a/src/MEDCalc/gui/DatasourceController.hxx
b/src/MEDCalc/gui/DatasourceController.hxx
index 68ef76f75bd8a6d2a6207cf05b3da3b39a6fa853..7d9e5bef233059a94ad8ea8e71a71895c0eb39f3 100644
(file)
--- a/
src/MEDCalc/gui/DatasourceController.hxx
+++ b/
src/MEDCalc/gui/DatasourceController.hxx
@@
-31,8
+31,6
@@
#include <MEDPresentation.hxx>
#include "XmedDataModel.hxx"
#include <MEDPresentation.hxx>
#include "XmedDataModel.hxx"
-#include "DlgChangeUnderlyingMesh.hxx"
-#include "DlgInterpolateField.hxx"
#include "MEDCALCGUI.hxx"
//
// The DatasourceController defines data structures and classes to
#include "MEDCALCGUI.hxx"
//
// The DatasourceController defines data structures and classes to
@@
-54,14
+52,20
@@
typedef struct {
EVENT_IMPORT_OBJECT, // Simply import the object in the workspace
EVENT_USE_OBJECT, // Import in the workspace AND define a proxy
// variable in the tui console to use it
EVENT_IMPORT_OBJECT, // Simply import the object in the workspace
EVENT_USE_OBJECT, // Import in the workspace AND define a proxy
// variable in the tui console to use it
+ // presentations
+ EVENT_VIEW_OBJECT_CONTOUR,
+ EVENT_VIEW_OBJECT_DEFLECTION_SHAPE,
+ EVENT_VIEW_OBJECT_POINT_SPRITE,
EVENT_VIEW_OBJECT_SCALAR_MAP,
EVENT_VIEW_OBJECT_SCALAR_MAP,
+ EVENT_VIEW_OBJECT_SLICES,
+ EVENT_VIEW_OBJECT_VECTOR_FIELD,
// these ones forward actions to workspace (and then to python console)
EVENT_ADD_DATASOURCE,
EVENT_ADD_IMAGE_AS_DATASOURCE,
EVENT_ADD_PRESENTATION
};
int eventtype;
// these ones forward actions to workspace (and then to python console)
EVENT_ADD_DATASOURCE,
EVENT_ADD_IMAGE_AS_DATASOURCE,
EVENT_ADD_PRESENTATION
};
int eventtype;
- XmedDataObject
* objectdata;
+ XmedDataObject* objectdata;
QString objectalias;
} DatasourceEvent;
QString objectalias;
} DatasourceEvent;
@@
-76,42
+80,30
@@
class MEDCALCGUI_EXPORT DatasourceController: public QObject {
Q_OBJECT
public:
Q_OBJECT
public:
- DatasourceController(MEDModule
* salomeModule);
+ DatasourceController(MEDModule* salomeModule);
~DatasourceController();
void createActions();
public slots:
~DatasourceController();
void createActions();
public slots:
- // Callback connected to dialog box validation signals
- void OnChangeUnderlyingMeshInputValidated();
- void OnInterpolateFieldInputValidated();
- void processWorkspaceEvent(const MEDCALC::MedEvent * event);
+ void processWorkspaceEvent(const MEDCALC::MedEvent* event);
signals:
signals:
- void datasourceSignal(const DatasourceEvent
* event);
+ void datasourceSignal(const DatasourceEvent* event);
protected slots:
void OnAddDatasource();
void OnAddImagesource();
void OnExpandField();
protected slots:
void OnAddDatasource();
void OnAddImagesource();
void OnExpandField();
- void OnVisualizeScalarMap();
void OnUseInWorkspace();
void OnUseInWorkspace();
- void OnChangeUnderlyingMesh();
- void OnInterpolateField();
private:
private:
- void visualize(DatasourceEvent::EventType);
void addDatasource(const char* filename);
void updateTreeViewWithNewDatasource(const MEDCALC::DatasourceHandler*);
void addDatasource(const char* filename);
void updateTreeViewWithNewDatasource(const MEDCALC::DatasourceHandler*);
- void updateTreeViewWithNewPresentation(long fieldId, long presentationId);
private:
MEDModule* _salomeModule;
private:
MEDModule* _salomeModule;
- SALOME_AppStudyEditor * _studyEditor;
-
- DlgChangeUnderlyingMesh * _dlgChangeUnderlyingMesh;
- DlgInterpolateField * _dlgInterpolateField;
-
+ SALOME_AppStudyEditor* _studyEditor; // borrowed to MEDModule
};
#endif
};
#endif