GUI fit switched to new parameter translation.

GUI/coregui/Models/FitParameterItems.cpp

@@ -126,10 +126,15 @@ std::unique_ptr<FitParameter> FitParameterItem::createFitParameter() const
     Q_ASSERT(jobItem);
 
     foreach (SessionItem* linkItem, getItems(FitParameterItem::T_LINK)) {
-        QString link = linkItem->getItemValue(FitParameterLinkItem::P_LINK).toString();
-        std::string domainPath = "*" + ModelPath::translateParameterName(jobItem, link);
-        linkItem->setItemValue(FitParameterLinkItem::P_DOMAIN, QString::fromStdString(domainPath));
-        result->addPattern(domainPath);
+//        QString link = linkItem->getItemValue(FitParameterLinkItem::P_LINK).toString();
+//        std::string domainPath = "*" + ModelPath::translateParameterName(jobItem, link);
+//        linkItem->setItemValue(FitParameterLinkItem::P_DOMAIN, QString::fromStdString(domainPath));
+
+        ParameterItem *parItem = dynamic_cast<ParameterItem*>(linkItem);
+        QString translation = "*/" + ModelPath::itemPathTranslation(*parItem->linkedItem(), jobItem);
+        parItem->setItemValue(ParameterItem::P_DOMAIN, translation);
+
+        result->addPattern(translation.toStdString());
     }
 
     return result;

GUI/coregui/Models/ParameterTreeBuilder.cpp

@@ -168,10 +168,14 @@ void ParameterTreeBuilder::populateDomainLinks(JobItem *jobItem, const QString &
             }
         } else {
             if (ParameterItem *parItem = dynamic_cast<ParameterItem *>(current)) {
-                QString parItemPath = FitParameterHelper::getParameterItemPath(parItem);
-                std::string domainPath = ModelPath::translateParameterName(
-                    jobItem, parItemPath);
-                parItem->setItemValue(ParameterItem::P_DOMAIN, QString::fromStdString(domainPath));
+//                QString parItemPath = FitParameterHelper::getParameterItemPath(parItem);
+//                std::string domainPath = ModelPath::translateParameterName(
+//                    jobItem, parItemPath);
+//                parItem->setItemValue(ParameterItem::P_DOMAIN, QString::fromStdString(domainPath));
+
+                // new way of translating
+                QString translation = "*/" + ModelPath::itemPathTranslation(*parItem->linkedItem(), jobItem);
+                parItem->setItemValue(ParameterItem::P_DOMAIN, translation);
             }
         }
     }

Tests/Functional/GUI/GUITranslationTest/main.cpp

@@ -20,18 +20,18 @@
 bool run_tests() {
 
     std::vector<std::pair<std::string, std::string>> conditions = {
-//            {"BasicGISAS", "CylindersAndPrismsBuilder"}
-//            {"BasicGISAS", "RadialParaCrystalBuilder"},
-//            {"BasicGISAS", "HexParaCrystalBuilder"},
-//            {"BasicGISAS", "CoreShellParticleBuilder"},
-//            {"BasicGISAS", "MultiLayerWithRoughnessBuilder"},
-//            {"BasicGISAS", "SquareLatticeBuilder"},
-//            {"BasicGISAS", "RotatedPyramidsBuilder"},
-                {"BasicGISAS", "CylindersWithSizeDistributionBuilder"},
-//            {"BasicGISAS", "ParticleCompositionBuilder"},
-//        {"BasicGISAS", "Basic2DParaCrystalBuilder"},
-//            {"BasicGISAS", "Lattice1DBuilder"},
-//            {"BasicGISAS", "Basic2DLatticeBuilder"}
+        {"BasicGISAS", "CylindersAndPrismsBuilder"},
+        {"BasicGISAS", "RadialParaCrystalBuilder"},
+        {"BasicGISAS", "HexParaCrystalBuilder"},
+        {"BasicGISAS", "CoreShellParticleBuilder"},
+        {"BasicGISAS", "MultiLayerWithRoughnessBuilder"},
+        {"BasicGISAS", "SquareLatticeBuilder"},
+        {"BasicGISAS", "RotatedPyramidsBuilder"},
+        {"BasicGISAS", "CylindersWithSizeDistributionBuilder"},
+        {"BasicGISAS", "ParticleCompositionBuilder"},
+        {"BasicGISAS", "Basic2DParaCrystalBuilder"},
+        {"BasicGISAS", "Lattice1DBuilder"},
+        {"BasicGISAS", "Basic2DLatticeBuilder"}
     };
 
     bool success(true);