Merge pull request #65 from yisangriB/master

To allow surrogates in PBE
NHERI-SimCenter · Oct 1, 2024 · 75ca538 · 75ca538
2 parents 0c60c50 + 216ecc6
commit 75ca538
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/PBE.pro b/PBE.pro
@@ -129,4 +129,4 @@ HEADERS  += \
 RESOURCES += \
     images.qrc
 
-#OTHER_FILES += conanfile.py
+#OTHER_FILES += conanfile.py
diff --git a/ResultsPelicun.h b/ResultsPelicun.h
@@ -50,7 +50,7 @@ class QTextEdit;
 class QVBoxLayout;
 class QTabWidget;
 class MyTableWidget;
-
+using namespace QtCharts;
 class ResultsPelicun : public SimCenterWidget
 {
     Q_OBJECT

diff --git a/WorkflowAppPBE.cpp b/WorkflowAppPBE.cpp
@@ -182,6 +182,10 @@ WorkflowAppPBE::WorkflowAppPBE(RemoteService *theService, QWidget *parent)
 
     connect(remoteApp,SIGNAL(successfullJobStart()), theRunWidget, SLOT(hide()));
 
+    // SY connect queryEVT and the reply
+    connect(theUQ_Selection, SIGNAL(queryEVT()), theEventSelection, SLOT(replyEventType()));
+    connect(theEventSelection, SIGNAL(typeEVT(QString)), theUQ_Selection, SLOT(setEventType(QString)));
+
     //
     // create layout, create component selction & add to layout & then add components to cmponentselection
     //
@@ -262,9 +266,15 @@ WorkflowAppPBE::outputToJSON(QJsonObject &jsonObjectTop) {
     if (result == false)
         return result;    
 
+
+    // sy - temporary solution..
     // built in EDP
     QJsonObject appsEDP;
-    appsEDP["Application"] = "StandardEarthquakeEDP";
+    if (theSIM_Selection->getCurrentSIM()=="SurrogateGPBuildingModel") {
+        appsEDP["Application"] = "SurrogateEDP";
+    } else {
+        appsEDP["Application"] = "StandardEarthquakeEDP";
+    }
     QJsonObject dataObj;
     appsEDP["ApplicationData"] = dataObj;
     apps["EDP"] = appsEDP;

diff --git a/conanfile.py b/conanfile.py
@@ -11,7 +11,7 @@ class PBE(ConanFile):
     generators = "qmake"
     requires = ["jansson/2.13.1",
                "libcurl/7.72.0",
-               "zlib/1.2.13",
+               "zlib/1.2.11",
                #'quazip/1.4',
                #"hdf5/1.12.0"
                ]