Merge pull request #70 from jinyan1214/jsonTransportAssetFile

clear res widget before run again

UIWidgets/ResultsWidget.cpp

@@ -293,6 +293,9 @@ int ResultsWidget::processResults(QString resultsDirectory)
             }
             // type is Bridge/Tunnel/Road
             QString type = assetProperties["type"].toString();
+            if (type.compare("")==0){
+                type = "Building";
+            }
             if (!assetDictionary.contains(type))
             {
                 assetDictionary[type] = QList<QJsonObject>({value});
@@ -579,6 +582,22 @@ void ResultsWidget::clear(void)
     }
     resTabWidget->clear();
 
+    auto resultLyr = theVisualizationWidget->getLayerGroup("Results");
+    if (resultLyr){
+        theVisualizationWidget->removeLayerGroup("Results");
+    }
+    auto DMGLyr = theVisualizationWidget->getLayerGroup("Most Likely Critical Damage State");
+    if (DMGLyr){
+        theVisualizationWidget->removeLayerGroup("Most Likely Damage State");
+    }
+    QgsProject *project = QgsProject::instance();
+    for (QgsMapLayer *layer : project->mapLayers().values()) {
+        //        QString
+        if ((layer->name() == "Results")||(layer->name() == "Most Likely Critical Damage State")) {
+            theVisualizationWidget->removeLayer(layer);
+        }
+    }
+
     resultsShow(false);
 }
 

WorkflowAppR2D.cpp

@@ -686,7 +686,7 @@ void WorkflowAppR2D::setUpForApplicationRun(QString &workingDir, QString &subDir
     else
         destinationDirectory.mkpath(tmpDirectory);
 
-
+    theResultsWidget->clear();
     //qDebug() << "WorkflowAppR2D is changinging subDir to input_data";
     subDir = "input_data";