diff --git a/CMakeLists-WinCalc.txt.in b/CMakeLists-WinCalc.txt.in index e7ef139..1277a62 100644 --- 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 index 38d66c9..22d852b 100644 --- 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)) \ No newline at end of file +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)) \ No newline at end of file diff --git a/setup.py b/setup.py index e36c191..90aed23 100644 --- 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 deleted file mode 100644 index 06ba1c1..0000000 Binary files a/wheels/pywincalc-1.0.6-cp27-cp27m-win32.whl and /dev/null differ diff --git a/wheels/pywincalc-1.0.6-cp27-cp27m-win_amd64.whl b/wheels/pywincalc-1.0.6-cp27-cp27m-win_amd64.whl deleted file mode 100644 index 6ad4b24..0000000 Binary files a/wheels/pywincalc-1.0.6-cp27-cp27m-win_amd64.whl and /dev/null differ diff --git a/wheels/pywincalc-1.0.6-cp37-cp37m-win32.whl b/wheels/pywincalc-1.0.6-cp37-cp37m-win32.whl deleted file mode 100644 index 2cb0774..0000000 Binary files a/wheels/pywincalc-1.0.6-cp37-cp37m-win32.whl and /dev/null differ diff --git a/wheels/pywincalc-1.0.6-cp37-cp37m-win_amd64.whl b/wheels/pywincalc-1.0.6-cp37-cp37m-win_amd64.whl deleted file mode 100644 index f6fc404..0000000 Binary files a/wheels/pywincalc-1.0.6-cp37-cp37m-win_amd64.whl and /dev/null differ diff --git a/wheels/pywincalc-1.0.7-cp27-cp27m-win32.whl b/wheels/pywincalc-1.0.7-cp27-cp27m-win32.whl new file mode 100644 index 0000000..cae1d53 Binary files /dev/null and b/wheels/pywincalc-1.0.7-cp27-cp27m-win32.whl differ diff --git a/wheels/pywincalc-1.0.7-cp27-cp27m-win_amd64.whl b/wheels/pywincalc-1.0.7-cp27-cp27m-win_amd64.whl new file mode 100644 index 0000000..c7c0f9a Binary files /dev/null and b/wheels/pywincalc-1.0.7-cp27-cp27m-win_amd64.whl differ diff --git a/wheels/pywincalc-1.0.7-cp37-cp37m-win32.whl b/wheels/pywincalc-1.0.7-cp37-cp37m-win32.whl new file mode 100644 index 0000000..7eb9b4e Binary files /dev/null and b/wheels/pywincalc-1.0.7-cp37-cp37m-win32.whl differ diff --git a/wheels/pywincalc-1.0.7-cp37-cp37m-win_amd64.whl b/wheels/pywincalc-1.0.7-cp37-cp37m-win_amd64.whl new file mode 100644 index 0000000..6e38ce0 Binary files /dev/null and b/wheels/pywincalc-1.0.7-cp37-cp37m-win_amd64.whl differ