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
Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_ObjectsBrowser.h
diff --git
a/src/XGUI/XGUI_ObjectsBrowser.h
b/src/XGUI/XGUI_ObjectsBrowser.h
index 0760242bd99033635f2fef12a25fb6aea9f8ee10..a52c844545999bd6e91a17fa4e8663517c937d01 100644
(file)
--- a/
src/XGUI/XGUI_ObjectsBrowser.h
+++ b/
src/XGUI/XGUI_ObjectsBrowser.h
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
#ifndef XGUI_ObjectsBrowser_H
#define XGUI_ObjectsBrowser_H
#ifndef XGUI_ObjectsBrowser_H
#define XGUI_ObjectsBrowser_H
@@
-21,7
+23,7
@@
Q_OBJECT
virtual ~XGUI_DataTree();
//! Returns list of currently selected objects
virtual ~XGUI_DataTree();
//! Returns list of currently selected objects
- Q
List<ObjectPtr>
selectedObjects() const
+ Q
ObjectPtrList
selectedObjects() const
{
return mySelectedData;
}
{
return mySelectedData;
}
@@
-36,6
+38,9
@@
signals:
//! Emited on context menu request
void contextMenuRequested(QContextMenuEvent* theEvent);
//! Emited on context menu request
void contextMenuRequested(QContextMenuEvent* theEvent);
+public slots:
+ virtual void clear();
+
protected slots:
virtual void commitData(QWidget* theEditor);
protected slots:
virtual void commitData(QWidget* theEditor);
@@
-49,7
+54,7
@@
signals:
private:
//! List of currently selected data
private:
//! List of currently selected data
- Q
List<ObjectPtr>
mySelectedData;
+ Q
ObjectPtrList
mySelectedData;
};
/**\class XGUI_ObjectsBrowser
};
/**\class XGUI_ObjectsBrowser
@@
-70,12
+75,12
@@
Q_OBJECT
}
//! Returns list of currently selected objects
}
//! Returns list of currently selected objects
- Q
List<ObjectPtr>
selectedObjects() const
+ Q
ObjectPtrList
selectedObjects() const
{
return myObjectsList;
}
{
return myObjectsList;
}
- void setObjectsSelected(const Q
List<ObjectPtr>
& theObjects);
+ void setObjectsSelected(const Q
ObjectPtrList
& theObjects);
//! Returns currently selected indexes
QModelIndexList selectedIndexes() const
//! Returns currently selected indexes
QModelIndexList selectedIndexes() const
@@
-94,7
+99,10
@@
Q_OBJECT
void rebuildDataTree();
void rebuildDataTree();
- void processEvent(const Events_Message* theMessage);
+ void processEvent(const std::shared_ptr<Events_Message>& theMessage);
+
+ // Resets the object browser into initial state
+ void clearContent();
signals:
//! Emited when selection is changed
signals:
//! Emited when selection is changed
@@
-128,7
+136,7
@@
signals:
QLineEdit* myActiveDocLbl;
XGUI_DataTree* myTreeView;
QLineEdit* myActiveDocLbl;
XGUI_DataTree* myTreeView;
- Q
List<ObjectPtr>
myObjectsList;
+ Q
ObjectPtrList
myObjectsList;
};
#endif
};
#endif