diff --git a/LossModel/LossModelSelection.cpp b/LossModel/LossModelSelection.cpp index 80fe955..ad0ca1c 100644 --- a/LossModel/LossModelSelection.cpp +++ b/LossModel/LossModelSelection.cpp @@ -44,10 +44,10 @@ UPDATES, ENHANCEMENTS, OR MODIFICATIONS. LossModelSelection::LossModelSelection( QWidget *parent) - : SimCenterAppSelection(QString("Loss Model"), QString("LossModel"),parent) + : SimCenterAppSelection(QString("Loss Model"), QString("DL"),parent) { thePelicunWidget = new PelicunLossModel(); - this->addComponent(QString("Pelicun"), QString("Pelicun"), thePelicunWidget); + this->addComponent(QString("Pelicun3"), QString("Pelicun3"), thePelicunWidget, QString("Pelicun")); } LossModelSelection::~LossModelSelection() diff --git a/WorkflowAppPBE.cpp b/WorkflowAppPBE.cpp index 5bcfdb9..3283b64 100644 --- a/WorkflowAppPBE.cpp +++ b/WorkflowAppPBE.cpp @@ -457,6 +457,9 @@ WorkflowAppPBE::inputFromJSON(QJsonObject &jsonObject) if (thePrfMethodSelection->inputAppDataFromJSON(theApplicationObject) == false) this->errorMessage("PBE: failed to read PRF application"); + if (theDLModelSelection->inputAppDataFromJSON(theApplicationObject) == false) + this->errorMessage("PBE: failed to read DL application"); + } else return false; @@ -479,7 +482,10 @@ WorkflowAppPBE::inputFromJSON(QJsonObject &jsonObject) if (thePrfMethodSelection->inputFromJSON(jsonObject) == false) this->errorMessage("PBE: failed to read PRF Method data"); - + + if (theDLModelSelection->inputFromJSON(jsonObject) == false) + this->errorMessage("PBE: failed to read PRF Method data"); + /* if (jsonObject.contains("DL")) { QJsonObject jsonObjLossModel = jsonObject["DL"].toObject(); if (theDLModelSelection->inputFromJSON(jsonObjLossModel) == false) @@ -488,6 +494,7 @@ WorkflowAppPBE::inputFromJSON(QJsonObject &jsonObject) this->errorMessage("WARNING: failed to find Damage and Loss Model"); return false; } + */ this->runComplete();