Merge pull request #88 from jinyan1214/jzGMToolUpdate

Grace requried to update this version number

Events/UI/GMSiteWidget.cpp

@@ -107,3 +107,7 @@ void GMSiteWidget::outputToJson(QJsonObject& obj)
 
 }
 
+void GMSiteWidget::clear(){
+    m_siteConfigWidget->clear();
+}
+

Events/UI/GMSiteWidget.h

@@ -60,6 +60,7 @@ class GMSiteWidget : public QWidget
     SiteConfigWidget *siteConfigWidget() const;
 
     void outputToJson(QJsonObject& obj);
+    void clear();
 
 private:
     SiteConfig* m_siteConfig = nullptr;

Events/UI/GMWidget.cpp

@@ -1002,6 +1002,10 @@ void GMWidget::handleProcessStarted(void)
     this->m_runButton->setEnabled(false);
 }
 
+void GMWidget::clear(){
+    siteWidget->clear();
+}
+
 
 int GMWidget::downloadRecords(void)
 {
@@ -1111,8 +1115,8 @@ int GMWidget::processDownloadedRecords(QString& errorMessage)
     QString pathToOutputDirectory = m_appConfig->getOutputDirectoryPath() + QDir::separator();
 
     // Account for the different directory structure if only want IMs
-    if(m_selectionconfig->getDatabase().size() == 0)
-        pathToOutputDirectory += "IMs" + QString(QDir::separator());
+//    if(m_selectionconfig->getDatabase().size() == 0)
+    pathToOutputDirectory += "IMs" + QString(QDir::separator());
 
     pathToOutputDirectory += "EventGrid.csv";
 

Events/UI/GMWidget.h

@@ -84,6 +84,7 @@ class GMWidget : public SimCenterAppWidget
     void resetAppSettings(void);
     bool copyFiles(QString &destDir);
     bool getSimulationStatus(void);
+    void clear();
 
 
     GmAppConfig *appConfig() const;

UIWidgets/ToolDialog.cpp

@@ -39,6 +39,11 @@ void ToolDialog::clear()
 
     if(theHurricaneSimWidget)
         theHurricaneSimWidget->clear();
+
+    if(theEQSSWidget != nullptr)
+    {
+        theEQSSWidget->clear();
+    }
 }
 
 

WorkflowAppR2D.cpp

@@ -472,10 +472,10 @@ void WorkflowAppR2D::clear(void)
     thePerformanceWidget->clear();
     ****************************** Performance ***************************** */    
     theResultsWidget->clear();
+    theToolDialog->clear();
     theVisualizationWidget->clear();
     // progressDialog->clear();
     theComponentSelection->displayComponent("VIZ");
-    theToolDialog->clear();
 }
 
 

resources/docs/textAboutR2D.html

@@ -13,7 +13,7 @@ <h1>
 This will ensure researchers are not limited to using the default applications we provide and will be enthused to provide
 their own applications for others to use.
 <p>
-This is Version 2.0.0.a of the tool and as such is limited in scope to understanding damage to the buildings in a region subjected to an earthquake event. The next release, scheduled for March 2021, wil;l allow users to study the effects of a Hurricane on the buildings in a region. Subsequent releases will incorporate the damage to lifelines and their interactions. Researchers are encouraged to comment on what additional features and applications they would like to see in this application. If you want it, chances are many of your colleagues also would benefit from it.
+This is Version 4.0.1 of the tool and as such is limited in scope to understanding damage to the buildings in a region subjected to an earthquake event. The next release, scheduled for March 2021, wil;l allow users to study the effects of a Hurricane on the buildings in a region. Subsequent releases will incorporate the damage to lifelines and their interactions. Researchers are encouraged to comment on what additional features and applications they would like to see in this application. If you want it, chances are many of your colleagues also would benefit from it.
 <p>
 <h2>Acknowledgment</h2>
 <p>