ParaCrystal2DItem now adjusts displayName of PDF1 and PDF2.

GUI/coregui/Models/InterferenceFunctionItems.cpp

@@ -111,11 +111,13 @@ InterferenceFunction2DParaCrystalItem::InterferenceFunction2DParaCrystalItem()
             InterferenceFunction2DLatticeItem::P_LATTICE_TYPE) {
             update_rotation_availability();
         }
-//        if (item->modelType() == Constants::GroupItemType && property == GroupItem::T_ITEMS && isTag(P_PDF1) && isTag(P_PDF2)) {
-//            qDebug() << item->modelType() << property;
-//            update_distribution_displaynames();
-//        }
+        if (item->modelType() == Constants::GroupItemType && property == GroupItem::T_ITEMS && isTag(P_PDF1) && isTag(P_PDF2)) {
+            qDebug() << item->modelType() << property;
+            update_distribution_displaynames();
+        }
     });
+
+    update_distribution_displaynames();
 }
 
 std::unique_ptr<IInterferenceFunction>
@@ -152,28 +154,28 @@ void InterferenceFunction2DParaCrystalItem::update_rotation_availability()
     angleItem->setEnabled(!getItemValue(P_XI_INTEGRATION).toBool());
 }
 
-//void InterferenceFunction2DParaCrystalItem::update_distribution_displaynames()
-//{
-//    GroupItem *group1 = dynamic_cast<GroupItem*>(getItem(P_PDF1));
-//    GroupItem *group2 = dynamic_cast<GroupItem*>(getItem(P_PDF2));
-
-//    if(!group1 || !group2)
-//        return;
-
-//    SessionItem *pdf1 = group1->currentItem();
-//    SessionItem *pdf2 = group2->currentItem();
-
-//    if(pdf1 && pdf2) {
-//        qDebug() << pdf1->displayName() << pdf2->displayName();
-//        if(pdf1->modelType() == pdf2->modelType()) {
-//            pdf1->setDisplayName(pdf1->modelType()+QString::number(0));
-//            pdf2->setDisplayName(pdf2->modelType()+QString::number(1));
-//        } else {
-//            pdf1->setDisplayName(pdf1->modelType());
-//            pdf2->setDisplayName(pdf2->modelType());
-//        }
-//    }
-//}
+void InterferenceFunction2DParaCrystalItem::update_distribution_displaynames()
+{
+    GroupItem *group1 = dynamic_cast<GroupItem*>(getItem(P_PDF1));
+    GroupItem *group2 = dynamic_cast<GroupItem*>(getItem(P_PDF2));
+
+    if(!group1 || !group2)
+        return;
+
+    SessionItem *pdf1 = group1->currentItem();
+    SessionItem *pdf2 = group2->currentItem();
+
+    if(pdf1 && pdf2) {
+        qDebug() << pdf1->displayName() << pdf2->displayName();
+        if(pdf1->modelType() == pdf2->modelType()) {
+            pdf1->setDisplayName(pdf1->modelType()+QString::number(0));
+            pdf2->setDisplayName(pdf2->modelType()+QString::number(1));
+        } else {
+            pdf1->setDisplayName(pdf1->modelType());
+            pdf2->setDisplayName(pdf2->modelType());
+        }
+    }
+}
 
 // --------------------------------------------------------------------------------------------- //
 

GUI/coregui/Models/InterferenceFunctionItems.h

@@ -55,7 +55,7 @@ public:
     std::unique_ptr<IInterferenceFunction> createInterferenceFunction() const;
 private:
     void update_rotation_availability();
-//    void update_distribution_displaynames();
+    void update_distribution_displaynames();
 };
 
 class BA_CORE_API_ InterferenceFunction1DLatticeItem : public InterferenceFunctionItem