Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue#1059: Consider operation state in selection validator
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_ObjectsBrowser.h
diff --git
a/src/XGUI/XGUI_ObjectsBrowser.h
b/src/XGUI/XGUI_ObjectsBrowser.h
index 2c36641bc1247bdc1d67100fe2a4ee42926a77d5..53e9a5fb5cfb9df7dd99bb78850a275a43131cb7 100644
(file)
--- a/
src/XGUI/XGUI_ObjectsBrowser.h
+++ b/
src/XGUI/XGUI_ObjectsBrowser.h
@@
-16,8
+16,6
@@
class ModuleBase_IDocumentDataModel;
class QLineEdit;
class XGUI_DataModel;
class QLineEdit;
class XGUI_DataModel;
-//#define ModuleDataModel
-
/**
* \ingroup GUI
* Implementation of Data Tree object for Object Browser
/**
* \ingroup GUI
* Implementation of Data Tree object for Object Browser
@@
-33,7
+31,7
@@
Q_OBJECT
virtual ~XGUI_DataTree();
/// Returns current data model
virtual ~XGUI_DataTree();
/// Returns current data model
-
ModuleBase_IDocument
DataModel* dataModel() const;
+
XGUI_
DataModel* dataModel() const;
signals:
//! Emited on context menu request
signals:
//! Emited on context menu request
@@
-47,6
+45,7
@@
public slots:
/// Commit modified data (used for renaming of objects)
virtual void commitData(QWidget* theEditor);
/// Commit modified data (used for renaming of objects)
virtual void commitData(QWidget* theEditor);
+ /// A slot which is called on mouse double click
void onDoubleClick(const QModelIndex&);
protected:
void onDoubleClick(const QModelIndex&);
protected:
@@
-72,17
+71,10
@@
Q_OBJECT
virtual ~XGUI_ObjectsBrowser();
//! Returns Model which provides access to data objects
virtual ~XGUI_ObjectsBrowser();
//! Returns Model which provides access to data objects
-#ifdef ModuleDataModel
- ModuleBase_IDocumentDataModel* dataModel() const
- {
- return myDocModel;
- }
-#else
XGUI_DataModel* dataModel() const
{
return myDocModel;
}
XGUI_DataModel* dataModel() const
{
return myDocModel;
}
-#endif
//! Returns list of currently selected objects
//! \param theIndexes - output list of corresponded indexes (can be NULL)
//! Returns list of currently selected objects
//! \param theIndexes - output list of corresponded indexes (can be NULL)
@@
-113,9
+105,6
@@
Q_OBJECT
/// Resets the object browser into initial state
void clearContent();
/// Resets the object browser into initial state
void clearContent();
- /// Set Data Model for the Object Browser
- void setDataModel(ModuleBase_IDocumentDataModel* theModel);
-
public slots:
//! Called on Edit command request
void onEditItem();
public slots:
//! Called on Edit command request
void onEditItem();
@@
-150,11
+139,7
@@
signals:
void closeDocNameEditing(bool toSave);
//! Internal model
void closeDocNameEditing(bool toSave);
//! Internal model
-#ifdef ModuleDataModel
- ModuleBase_IDocumentDataModel* myDocModel;
-#else
XGUI_DataModel* myDocModel;
XGUI_DataModel* myDocModel;
-#endif
QLineEdit* myActiveDocLbl;
XGUI_DataTree* myTreeView;
};
QLineEdit* myActiveDocLbl;
XGUI_DataTree* myTreeView;
};