v1.0.7. Updating to latest Window-CalcEngine and fix for examples.

LBNL-ETA · Aug 23, 2019 · a6787d6 · a6787d6
1 parent 98b2457
commit a6787d6
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists-WinCalc.txt.in b/CMakeLists-WinCalc.txt.in
@@ -4,7 +4,7 @@ include(ExternalProject)
 
 ExternalProject_Add(wincalc
     GIT_REPOSITORY https://github.com/LBNL-ETA/WinCalc.git
-    GIT_TAG "v1.1.2"
+    GIT_TAG "v1.1.4"
 
     UPDATE_COMMAND ""
     PATCH_COMMAND ""

diff --git a/example/example.py b/example/example.py
@@ -27,7 +27,7 @@
 
 thermal_ir_optical_results_single_layer = glazing_system_single_layer.all_method_values(pywincalc.Method_Type.SOLAR)
 print("Finished single layer tir calc")
-print("Single Layer Thermal IR optical transmittance front direct-direct: {r}".format(r=thermal_ir_optical_results_single_layer.tf_direct_direct))
+print("Single Layer Thermal IR optical transmittance front direct-direct: {r}".format(r=thermal_ir_optical_results_single_layer.direct_direct.tf))
 
 color_results_single_layer = glazing_system_single_layer.color()
 print("Single Layer color results: {r}".format(r=thermal_ir_optical_results_single_layer))
@@ -55,7 +55,8 @@
 print("Triple Layer SHGC solar absorptances per layer: {a}".format(a=shgc_results.layer_solar_absorptances))
 
 photopic_optical_results_tripple_layer = glazing_system_tripple_layer.all_method_values(pywincalc.Method_Type.PHOTOPIC)
-print("Tripple Layer Photopic optical results: {r}".format(r=photopic_optical_results_tripple_layer))
+print("Tripple Layer Photopic optical results transmittance front direct-direct: {r}".format(r=photopic_optical_results_tripple_layer.direct_direct.tf))
 
 color_results_tripple_layer = glazing_system_tripple_layer.color()
-print("Tripple Layer color results: {r}".format(r=thermal_ir_optical_results_tripple_layer))
+tf_rgb_results_tripple_layer = color_results_tripple_layer.direct_direct.tf.rgb
+print("Tripple Layer color results transmittance front direct-direct RGB: ({r}, {g}, {b})".format(r=tf_rgb_results_tripple_layer.R, g=tf_rgb_results_tripple_layer.G, b=tf_rgb_results_tripple_layer.B))
diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@ def build_extension(self, ext):
 
 setup(
     name='pywincalc',
-    version='1.0.6',
+    version='1.0.7',
     ext_modules=[CMakeExtension('pywincalc')],
     cmdclass=dict(build_ext=CMakeBuild),
     zip_safe=False,

diff --git a/wheels/pywincalc-1.0.6-cp27-cp27m-win32.whl b/wheels/pywincalc-1.0.6-cp27-cp27m-win32.whl
diff --git a/wheels/pywincalc-1.0.6-cp27-cp27m-win_amd64.whl b/wheels/pywincalc-1.0.6-cp27-cp27m-win_amd64.whl
diff --git a/wheels/pywincalc-1.0.6-cp37-cp37m-win32.whl b/wheels/pywincalc-1.0.6-cp37-cp37m-win32.whl
diff --git a/wheels/pywincalc-1.0.6-cp37-cp37m-win_amd64.whl b/wheels/pywincalc-1.0.6-cp37-cp37m-win_amd64.whl
diff --git a/wheels/pywincalc-1.0.7-cp27-cp27m-win32.whl b/wheels/pywincalc-1.0.7-cp27-cp27m-win32.whl
diff --git a/wheels/pywincalc-1.0.7-cp27-cp27m-win_amd64.whl b/wheels/pywincalc-1.0.7-cp27-cp27m-win_amd64.whl
diff --git a/wheels/pywincalc-1.0.7-cp37-cp37m-win32.whl b/wheels/pywincalc-1.0.7-cp37-cp37m-win32.whl
diff --git a/wheels/pywincalc-1.0.7-cp37-cp37m-win_amd64.whl b/wheels/pywincalc-1.0.7-cp37-cp37m-win_amd64.whl