From a3486aaa6000699f3e28296fc60eae5b7807da1c Mon Sep 17 00:00:00 2001 From: Taoning Wang Date: Thu, 27 Apr 2023 11:41:42 -0700 Subject: [PATCH 1/4] exposed product subtype, coating name, coated side to ProductData object --- src/wincalcbindings.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/wincalcbindings.cpp b/src/wincalcbindings.cpp index 6854813..93246c9 100644 --- a/src/wincalcbindings.cpp +++ b/src/wincalcbindings.cpp @@ -341,9 +341,12 @@ PYBIND11_MODULE(wincalcbindings, m) { std::shared_ptr>(m, "ProductData") .def_readwrite("product_name", &OpticsParser::ProductData::productName) .def_readwrite("product_type", &OpticsParser::ProductData::productType) + .def_readwrite("product_subtype", &OpticsParser::ProductData::productSubtype) .def_readwrite("nfrc_id", &OpticsParser::ProductData::nfrcid) .def_readwrite("thickness", &OpticsParser::ProductData::thickness) .def_readwrite("conductivity", &OpticsParser::ProductData::conductivity) + .def_readwrite("coating_name", &OpticsParser::ProductData::coatingName) + .def_readwrite("coated_side", &OpticsParser::ProductData::coatedSide) .def_readwrite("ir_transmittance", &OpticsParser::ProductData::IRTransmittance) .def_readwrite("emissivity_front", From 44619fc6de91a3d431d46b98a884fa1a6bf3b6f9 Mon Sep 17 00:00:00 2001 From: StephenCzarnecki Date: Fri, 28 Apr 2023 14:30:39 -0400 Subject: [PATCH 2/4] Update CMakeLists-WinCalc.txt.in Changed targeted version to 2.3.0 --- CMakeLists-WinCalc.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists-WinCalc.txt.in b/CMakeLists-WinCalc.txt.in index 7fbbff3..49d60d4 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 "develop" + GIT_TAG "2.3.0" UPDATE_COMMAND "" PATCH_COMMAND "" From 7e98f6001d2f40461dad3037f68b327ff0d627da Mon Sep 17 00:00:00 2001 From: StephenCzarnecki Date: Fri, 28 Apr 2023 15:20:15 -0400 Subject: [PATCH 3/4] Update CMakeLists-WinCalc.txt.in Fixed typo --- CMakeLists-WinCalc.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists-WinCalc.txt.in b/CMakeLists-WinCalc.txt.in index 49d60d4..a136317 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 "2.3.0" + GIT_TAG "v2.3.0" UPDATE_COMMAND "" PATCH_COMMAND "" From c93c0501b802f1ab1f0352882970f4ee7ced14e6 Mon Sep 17 00:00:00 2001 From: StephenCzarnecki Date: Fri, 28 Apr 2023 15:43:44 -0400 Subject: [PATCH 4/4] Update setup.cfg Updating version to 3.1.0 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index bf34b6f..6b5eebf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = pywincalc -version = 3.0.0 +version = 3.1.0 description = A Python library for calculating thermal and optical properties of glazing systems long_description = file: README.md long_description_content_type = text/markdown; charset=UTF-8