Merge branch 'GUIFixes3' into develop

GUI/coregui/Models/GroupItem.cpp

@@ -15,10 +15,11 @@
 
 #include "GroupItem.h"
 
+const QString GroupItem::T_ITEMS = "Item tag";
+
 GroupItem::GroupItem()
     :SessionItem(Constants::GroupItemType)
 {
-    const QString T_ITEMS = "Item tag";
     registerTag(T_ITEMS);
     setDefaultTag(T_ITEMS);
 }
@@ -33,3 +34,8 @@ GroupProperty_t GroupItem::group() const
 {
     return value().value<GroupProperty_t>();
 }
+
+SessionItem *GroupItem::getCurrentItem()
+{
+    return group()->getCurrentItem();
+}

GUI/coregui/Models/GroupItem.h

@@ -23,9 +23,11 @@ class BA_CORE_API_ GroupItem : public SessionItem
 {
     
 public:
+    static const QString T_ITEMS;
     GroupItem();
     void setGroup(GroupProperty_t group);
     GroupProperty_t group() const;
+    SessionItem *getCurrentItem();
 };
 
 #endif

GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp

@@ -22,6 +22,7 @@
 #include "qcustomplot.h"
 #include "DistributionDialog.h"
 #include "GroupInfoBox.h"
+#include "GroupItem.h"
 #include <QVBoxLayout>
 #include <QDebug>
 
@@ -63,7 +64,7 @@ void DistributionEditor::setItem(SessionItem *item)
     if (m_item == item)
         return;
 
-    m_item = item;
+    m_item = dynamic_cast<GroupItem *>(item);
 
     if (!m_item)
         return;
@@ -78,16 +79,17 @@ void DistributionEditor::setItem(SessionItem *item)
 
 
     DistributionItem *distrItem = dynamic_cast<DistributionItem *>(
-        m_item->getGroupItem(BeamWavelengthItem::P_DISTRIBUTION));
+        m_item->getCurrentItem());
+
     Q_ASSERT(distrItem);
     m_plotwidget->setItem(distrItem);
 }
 
 void DistributionEditor::onPropertyChanged(const QString &property_name)
 {
-    if (property_name == BeamDistributionItem::P_DISTRIBUTION) {
-        DistributionItem *distrItem
-            = dynamic_cast<DistributionItem *>(m_item->getGroupItem(property_name));
+    if (property_name == GroupItem::T_ITEMS) {
+        DistributionItem *distrItem = dynamic_cast<DistributionItem *>(
+            m_item->getCurrentItem());
         Q_ASSERT(distrItem);
         m_plotwidget->setItem(distrItem);
     }

GUI/coregui/Views/InfoWidgets/DistributionEditor.h

@@ -21,7 +21,7 @@
 
 class QGroupBox;
 class DistributionWidget;
-class SessionItem;
+class GroupItem;
 class ComponentBoxEditor;
 
 //! The DistributionEditor class, being a child of DistributionDialog, contains a widget
@@ -41,7 +41,7 @@ private slots:
 
 private:
     ComponentBoxEditor *m_propertyEditor;
-    SessionItem *m_item;
+    GroupItem *m_item;
     DistributionWidget *m_plotwidget;
     QString m_nameOfEditor;
     QGroupBox *m_box;