Merge pull request #43 from sgavrilovic/master

Pull new additions into R2D
NHERI-SimCenter · Mar 31, 2022 · 47e39a2 · 47e39a2
2 parents 8afe6e8 + c0d3b45
commit 47e39a2
Show file tree

Hide file tree

Showing 5 changed files with 814 additions and 67 deletions.
diff --git a/UIWidgets/AssetsWidget.cpp b/UIWidgets/AssetsWidget.cpp
@@ -52,7 +52,7 @@ UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #include "QGISBuildingInputWidget.h"
 #include "QGISGasPipelineInputWidget.h"
 #include "GISBuildingInputWidget.h"
-//#include "HousingUnitAllocationWidget.h"
+#include "HousingUnitAllocationWidget.h"
 #endif
 
 // Qt headers
@@ -91,9 +91,8 @@ AssetsWidget::AssetsWidget(QWidget *parent, VisualizationWidget* visWidget)
     GISBuildingInputWidget *GISBuildingInventory = new GISBuildingInputWidget(this,visualizationWidget,"Buildings","GIS_to_BIM");
     buildingWidget->addComponent(QString("GIS File to BIM"), QString("GIS_to_BIM"), GISBuildingInventory);
 
-
-//    HousingUnitAllocationWidget *housingUnitAllocation = new HousingUnitAllocationWidget(this,visualizationWidget);
-//    buildingWidget->addComponent(QString("Housing Unit Allocation"), QString("CSV_to_BIM"), housingUnitAllocation);
+    HousingUnitAllocationWidget *housingUnitAllocation = new HousingUnitAllocationWidget(this,visualizationWidget);
+    buildingWidget->addComponent(QString("Housing Unit Allocation"), QString("CSV_to_BIM"), housingUnitAllocation);
 #endif
 
 #ifdef ARC_GIS