diff --git a/js/renderer.js b/js/renderer.js
index 7588091b..1e85550e 100644
--- a/js/renderer.js
+++ b/js/renderer.js
@@ -1,10 +1,9 @@
const { dialog } = require('@electron/remote')
const { Console } = require('console')
-const { app, BrowserWindow, Notification } = require('electron')
+const { app, BrowserWindow, Notification, electron } = require('electron')
const { get } = require('http')
const path = require('path')
-
let {PythonShell} = require('python-shell')
function showNotification () { new Notification({ title: 'NOTIFICATION_TITLE', body: 'event_text' }).show()}
@@ -50,12 +49,10 @@ function plot_results() {
labels: dates,
datasets: [{
label: 'Heating (J)',
- //backgroundColor: 'rgb(255, 99, 132)',
borderColor: 'rgb(255, 99, 132)',
data: heating
},
{ label: 'Cooling (J)',
- //backgroundColor: 'rgb(132, 99, 255)',
borderColor: 'rgb(132, 99, 255)',
data: cooling
}]
diff --git a/main.html b/main.html
index 620cf91d..bad44b2b 100644
--- a/main.html
+++ b/main.html
@@ -2,9 +2,11 @@
+
+
Energy+ Workflow v1.0
diff --git a/main.js b/main.js
index 45d05ce7..f86fa340 100644
--- a/main.js
+++ b/main.js
@@ -10,7 +10,7 @@ function createWindow () {
nodeIntegration: true,
enableRemoteModule: true,
contextIsolation: false,
- devTools: false,
+ devTools: true,
preload: path.join(__dirname, 'init.js')
}
})
diff --git a/out/make/deb/x64/manga2ebook_1.0.0_amd64.deb b/out/make/deb/x64/manga2ebook_1.0.0_amd64.deb
deleted file mode 100644
index 9e52fc8b..00000000
Binary files a/out/make/deb/x64/manga2ebook_1.0.0_amd64.deb and /dev/null differ
diff --git a/out/make/rpm/x64/manga2ebook-1.0.0-1.x86_64.rpm b/out/make/rpm/x64/manga2ebook-1.0.0-1.x86_64.rpm
deleted file mode 100644
index 8d5e4d17..00000000
Binary files a/out/make/rpm/x64/manga2ebook-1.0.0-1.x86_64.rpm and /dev/null differ
diff --git a/scripts/ep_workflow.py b/scripts/ep_workflow.py
index 94b9ec22..47e5c470 100644
--- a/scripts/ep_workflow.py
+++ b/scripts/ep_workflow.py
@@ -1,16 +1,21 @@
import sys
from pathlib import Path
import csv
-sys.path.append('../hub')
-try:
- from imports.geometry_factory import GeometryFactory
- from imports.construction_factory import ConstructionFactory
- from imports.usage_factory import UsageFactory
- from exports.exports_factory import ExportsFactory
- from imports.customized_imports_factory import CustomizedImportsFactory
- from imports.customized_imports.stochastic_schedules_importer import StochasticSchedulesImporter as ssi
+sys.path.append('../hub')
+sys.path.append('./')
+
+from imports.customized_imports_factory import CustomizedImportsFactory
+from imports.customized_imports.stochastic_schedules_importer import StochasticSchedulesImporter as ssi
+from imports.geometry_factory import GeometryFactory
+from imports.construction_factory import ConstructionFactory
+from imports.usage_factory import UsageFactory
+from exports.exports_factory import ExportsFactory
+
+try:
+ gml = ''
for argument_tuple in sys.argv[1:]:
+ print(argument_tuple)
argument = argument_tuple.split(' ')
option = argument[0]
value = argument[1]
@@ -22,9 +27,15 @@ try:
print(f'city created from {gml}')
for building in city.buildings:
building.year_of_construction = 2006
+ if building.function is None:
+ building.function = 'large office'
ConstructionFactory('nrel', city).enrich()
print('enrich constructions... done')
UsageFactory('comnet', city).enrich()
+ for building in city.buildings:
+ for internal_zone in building.internal_zones:
+ for usage_zone in internal_zone.usage_zones:
+ print(usage_zone.occupancy.occupancy_schedules)
print('enrich usage... done')
in_path = (Path(__file__).parent.parent / 'data' / 'occupancyschedules_2019_point4.xlsx')
CustomizedImportsFactory(ssi, city, in_path).enrich()
@@ -59,7 +70,9 @@ try:
print(f'info: {idf_file}, {csv_file}, {eso_file}, {area}, {volume}, {obj_file}')
print('[simulation end]')
+
except Exception as ex:
+ print(ex)
print('error: ', ex)
print('[simulation abort]')
sys.stdout.flush()