Merge branch 'master' of github.com:SCS-B3C/MAF

Author: Daniele Giunchi

src/mafApplicationLogic/mafLogic.cpp

@@ -82,7 +82,7 @@ bool mafLogic::initialize() {
 
     // Initialize data hierarchy
     QGenericReturnArgument ret_val = mafEventReturnArgument(mafCore::mafHierarchyPointer, m_Hierarchy);
-    mafEventBus::mafEventBusManager::instance()->notifyEvent("maf.local.resources.hierarchy.create", mafEventTypeLocal, NULL, &ret_val);
+    mafEventBus::mafEventBusManager::instance()->notifyEvent("maf.local.resources.hierarchy.request", mafEventTypeLocal, NULL, &ret_val);
 
     // Perform design by contract check.
     ENSURE(handler);

src/mafCore/mafHierarchy.cpp

@@ -150,6 +150,15 @@ void mafHierarchy::clear() {
     m_TreeIterator.null();
 }
 
+void mafHierarchy::setIterator(mafTree<QObject *>::iterator iterator) {
+    m_TreeIterator = iterator;
+}
+
+mafTree<QObject *>::iterator mafHierarchy::iterator() {
+    return m_TreeIterator;
+
+}
+
 void mafHierarchy::printInformation(QString &string) {
     for (mafTree<QObject *>::prefix_iterator i = m_Tree->prefix_begin(); i != m_Tree->prefix_end(); ++i) {
         mafTreeNode<QObject *> *n = i.simplify().node();

src/mafCore/mafHierarchy.h

@@ -74,6 +74,12 @@ class MAFCORESHARED_EXPORT mafHierarchy : public mafObject {
     /// Remove all the nodes and delete them.
     void clear();
 
+    /// set current iterator.
+    void setIterator(mafTree<QObject *>::iterator iterator);
+
+    /// Return current iterator.
+    mafTree<QObject *>::iterator iterator();
+
 signals:
     /// Signal emitted when a new item is attached to the hierarchy.
     void itemAttached(QObject *item, QObject *parent);

src/mafGUI/mafDragDropModel.cpp

@@ -54,10 +54,16 @@ Qt::ItemFlags mafDragDropModel::flags(const QModelIndex &index) const
     Qt::ItemFlags defaultFlags = QStandardItemModel::flags(index);
     if (index.isValid()) {
         mafTreeItem *item = (mafTreeItem *)this->itemFromIndex(index);
-        if (item->data()->objectName().compare("root") == 0) {
-            // Not allow Drag of the Root
-            return Qt::ItemIsDropEnabled | defaultFlags;
+        if(item->parent() == 0) {
+          //Not allow Drag of the Root
+          return Qt::ItemIsDropEnabled | defaultFlags;
         }
+//         if (item->->data()) != NULL) {
+//             if (item->data()->objectName().compare("root") == 0) {
+//                 // Not allow Drag of the Root
+//                 return Qt::ItemIsDropEnabled | defaultFlags;
+//             }
+//         }
         return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
     } else
         return Qt::ItemIsDropEnabled | defaultFlags;

src/mafGUI/mafGUIManager.cpp

@@ -18,6 +18,7 @@
 #include "mafTextHighlighter.h"
 #include "mafGUIApplicationSettingsDialog.h"
 #include "mafTreeItemDelegate.h"
+#include "mafTreeItemSceneNodeDelegate.h"
 
 #include <mafOperationWidget.h>
 
@@ -29,7 +30,8 @@ mafGUIManager::mafGUIManager(QMainWindow *main_win, const QString code_location)
     , m_NewAct(NULL), m_CollaborateAct(NULL)
     , m_OpenAct(NULL), m_SaveAct(NULL), m_SaveAsAct(NULL), m_RecentFilesSeparatorAct(NULL), m_ExitAct(NULL)
     , m_CutAct(NULL), m_CopyAct(NULL), m_PasteAct(NULL), m_AboutAct(NULL)
-    , m_MaxRecentFiles(5), m_ActionsCreated(false), m_MainWindow(main_win) {
+    , m_MaxRecentFiles(5), m_ActionsCreated(false), m_MainWindow(main_win)
+    , m_Model(NULL), m_TreeWidget(NULL) {
 
     m_SettingsDialog = new mafGUIApplicationSettingsDialog();
     m_OperationWidget = new mafOperationWidget();
@@ -261,8 +263,9 @@ void mafGUIManager::registerEvents() {
     // OperationManager's callback
     mafRegisterLocalCallback("maf.local.resources.operation.started", this, "operationDidStart(mafCore::mafObjectBase *)");
 
-    // ViewManager's callbacks.
+    // ViewManager's callback.
     mafRegisterLocalCallback("maf.local.resources.view.selected", this, "viewSelected(mafCore::mafObjectBase *)");
+    mafRegisterLocalCallback("maf.local.resources.view.noneViews", this, "viewDestroyed()");
 }
 
 void mafGUIManager::createMenus() {
@@ -378,26 +381,26 @@ void mafGUIManager::removeOperationGUI() {
 
 mafTreeWidget *mafGUIManager::createTreeWidget(mafTreeModel *model, QWidget *parent) {
 //    QSettings settings;
-    mafTreeWidget *w = new mafTreeWidget();
+    m_Model = model;
+    m_TreeWidget = new mafTreeWidget();
     mafTreeItemDelegate *itemDelegate = new mafTreeItemDelegate(this);
-    w->setAnimated(true);
-    w->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    w->setMinimumSize(200, 0);
-    w->setMaximumSize(16777215, 16777215);
-    connect(w, SIGNAL(clicked(QModelIndex)), this, SLOT(selectVME(QModelIndex)));
-    connect(model, SIGNAL(itemAdded(QModelIndex)), w, SLOT(expand(QModelIndex)));
+    m_TreeWidget->setAnimated(true);
+    m_TreeWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    m_TreeWidget->setMinimumSize(200, 0);
+    m_TreeWidget->setMaximumSize(16777215, 16777215);
+    connect(m_TreeWidget, SIGNAL(clicked(QModelIndex)), this, SLOT(selectVME(QModelIndex)));
+    connect(m_Model, SIGNAL(itemAdded(QModelIndex)), m_TreeWidget, SLOT(expand(QModelIndex)));
 
     if(parent) {
         if(parent->layout()) {
-            parent->layout()->addWidget(w);
+            parent->layout()->addWidget(m_TreeWidget);
         } else {
-            w->setParent(parent);
+            m_TreeWidget->setParent(parent);
         }
     }
-
-    w->setModel( model );
-    w->setItemDelegate(itemDelegate);
-    return w;
+    m_TreeWidget->setModel( m_Model );
+    m_TreeWidget->setItemDelegate(itemDelegate);
+    return m_TreeWidget;
 }
 
 mafTextEditWidget *mafGUIManager::createLogWidget(QWidget *parent) {
@@ -452,6 +455,20 @@ void mafGUIManager::createView() {
 
 void mafGUIManager::viewSelected(mafCore::mafObjectBase *view) {
     REQUIRE(view != NULL);
+    // Set current hierarchy
+    mafHierarchyPointer sceneGraph;
+    sceneGraph = view->property("hierarchy").value<mafCore::mafHierarchyPointer>();
+    if (m_Model) {
+        // Set hierarchy of selected view and set the current index
+        m_Model->clear();
+        m_Model->setHierarchy(sceneGraph);
+        QModelIndex index = m_Model->index(0, 0);
+        // TODO: select previous index
+        m_TreeWidget->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Select);
+        mafTreeItemSceneNodeDelegate *itemSceneNodeDelegate = new mafTreeItemSceneNodeDelegate(this);
+        m_TreeWidget->setItemDelegate(itemSceneNodeDelegate);
+
+    }
     // Get the selected view's UI file
     QString guiFilename = view->uiFilename();
     if(guiFilename.isEmpty()) {
@@ -463,13 +480,35 @@ void mafGUIManager::viewSelected(mafCore::mafObjectBase *view) {
     m_UILoader->uiLoad(guiFilename);
 }
 
+void mafGUIManager::viewDestroyed() {
+    // Get hierarchy from mafVMEManager
+    mafCore::mafHierarchyPointer hierarchy;
+    QGenericReturnArgument ret_val = mafEventReturnArgument(mafCore::mafHierarchyPointer, hierarchy);
+    mafEventBusManager::instance()->notifyEvent("maf.local.resources.hierarchy.request", mafEventTypeLocal, NULL, &ret_val);
+    if (m_Model) {
+        // Set hierarchy of selected view and set the current index
+        m_Model->clear();
+        m_Model->setHierarchy(hierarchy);
+        QModelIndex index = m_Model->index(0, 0);
+        // TODO: select previous index
+        m_TreeWidget->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Select);
+        mafTreeItemDelegate *itemDelegate = new mafTreeItemDelegate(this);
+        m_TreeWidget->setItemDelegate(itemDelegate);
+    }
+}
+
 void mafGUIManager::selectVME(QModelIndex index) {
     QTreeView *tree = (QTreeView *)QObject::sender();
-    mafTreeModel *model = (mafTreeModel *)tree->model();
-    mafTreeItem *item = (mafTreeItem *)model->itemFromIndex(index);
+    //m_Model = (mafTreeModel *)tree->model();
+    mafTreeItem *item = (mafTreeItem *)m_Model->itemFromIndex(index);
     QObject *obj = item->data();
     QVariant sel(true);
     obj->setProperty("selected", sel);
+
+    // Notify the item selection.
+    mafEventArgumentsList argList;
+    argList.append(mafEventArgument(mafCore::mafObjectBase*, qobject_cast<mafCore::mafObjectBase *>(obj)));
+    mafEventBusManager::instance()->notifyEvent("maf.local.resources.vme.select", mafEventTypeLocal, &argList);
 }
 
 void mafGUIManager::chooseFileDialog(const QString title, const QString start_dir, const QString wildcard) {

src/mafGUI/mafGUIManager.h

@@ -136,6 +136,9 @@ private slots:
     /// Update the GUI associated to the selected view.
     void viewSelected(mafCore::mafObjectBase *view);
 
+    /// Set mafVMEManager hierarchy to the tree model.
+    void viewDestroyed();
+
     /// Allow to send a vme selection request when an item has been clicked into the mafTreWidget.
     void selectVME(QModelIndex);
 
@@ -210,6 +213,8 @@ private slots:
     QMainWindow *m_MainWindow; ///< Main window associated to the application.
     mafUILoaderQt *m_UILoader; ///< Class in charge to load the GUI.
     mafGUILoadedType m_GUILoadedType; ///< Type of GUI loaded.
+    mafTreeModel *m_Model; ///< Tree model of VME.
+    mafTreeWidget *m_TreeWidget; ///< Visualize the tree model.
 };
 
 /////////////////////////////////////////////////////////////

src/mafGUI/mafTreeItem.cpp

@@ -18,13 +18,15 @@ mafTreeItem::mafTreeItem(QObject *obj, bool done) : QStandardItem(obj->objectNam
     setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled|
              Qt::ItemIsEditable);
     bool canVisualize = false;
-    if (obj->metaObject()->className() != "mafResources::mafSceneNode"){
+    QString nodeName(obj->metaObject()->className()); ;
+    if (nodeName == "mafResources::mafSceneNode"){
+        //set icon from VME
         canVisualize = obj->property("canVisualize").toBool();
-        if (!canVisualize) {
+        if (canVisualize) {
             setCheckState(done ? Qt::Checked : Qt::Unchecked);
             this->flags() |= Qt::ItemIsUserCheckable;
         }
     }
-    setCheckable(!canVisualize);
+    setCheckable(canVisualize);
     m_Data = obj;
 }

src/mafGUI/mafTreeItemDelegate.cpp

@@ -24,6 +24,7 @@
 
 using namespace mafCore;
 using namespace mafGUI;
+using namespace mafEventBus;
 
 mafTreeItemDelegate::mafTreeItemDelegate(QObject *parent) : QStyledItemDelegate(parent), m_isSceneNode(false ){
 }
@@ -58,6 +59,9 @@ void mafTreeItemDelegate::setModelData(QWidget * editor, QAbstractItemModel * mo
 }
 
 void mafTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
+   if(!index.isValid()) {
+     return;
+   }
     mafTreeItem *item = (mafTreeItem *)((QStandardItemModel *)index.model())->itemFromIndex(index);
     QStyleOptionViewItemV4 options = option;
     initStyleOption(&options, index);
@@ -114,13 +118,21 @@ bool mafTreeItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
     bool result = QStyledItemDelegate::editorEvent(event, model, option, index);
     QObject *sceneNode = objFromIndex(index);
     //If item is a SceneNode, set visibility property to item checked
-    if (sceneNode->metaObject()->className() == "mafResources::mafSceneNode") {
+    QString objName = "mafResources::mafSceneNode";
+    if (objName.compare(sceneNode->metaObject()->className())  == 0) {
         m_isSceneNode = true;
         QVariant value = index.data(Qt::CheckStateRole);
         if (!value.isValid())
             return result;
         bool state = (static_cast<Qt::CheckState>(value.toInt())) ? true : false;
-        sceneNode->setProperty("visibility", state);
+        bool visibility = sceneNode->property("visibility").toBool();
+        if (visibility != state) {
+            sceneNode->setProperty("visibility", state);
+            mafEventArgumentsList argList;
+            argList.append(mafEventArgument(mafCore::mafObjectBase*, (mafObjectBase*)sceneNode));
+            argList.append(mafEventArgument(bool, state));
+            mafEventBusManager::instance()->notifyEvent("maf.local.resources.view.sceneNodeShow", mafEventTypeLocal, &argList);
+        }
     } else {
         m_isSceneNode = false;
     }