v2.2.9 added constructors to shade factories for python bindings.

Author: StephenCzarnecki

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project( wincalc VERSION 2.2.8 LANGUAGES CXX )
+project( wincalc VERSION 2.2.9 LANGUAGES CXX )
 set(LIB_NAME ${PROJECT_NAME})
 
 if(NOT "${CMAKE_CXX_STANDARD}")

src/product_data.cpp

@@ -223,10 +223,10 @@ namespace wincalc
         front_openness_calcs[Perforated_Geometry::Type::SQUARE] = [=]() {
             return ThermalPermeability::Perforated::openness(
               ThermalPermeability::Perforated::Geometry::Square,
-				geometry.spacing_x,
-				geometry.spacing_y,
-				geometry.dimension_x,
-				geometry.dimension_x);
+              geometry.spacing_x,
+              geometry.spacing_y,
+              geometry.dimension_x,
+              geometry.dimension_x);
         };
 
         auto front_openness_calc = front_openness_calcs.find(geometry.perforation_type);
@@ -235,9 +235,8 @@ namespace wincalc
         {
             std::stringstream msg;
             msg << "Unsupported perforation type: "
-                << static_cast<
-                     std::underlying_type<Perforated_Geometry::Type>::type>(
-						 geometry.perforation_type);
+                << static_cast<std::underlying_type<Perforated_Geometry::Type>::type>(
+                     geometry.perforation_type);
             throw std::runtime_error(msg.str());
         }
 
@@ -332,4 +331,39 @@ namespace wincalc
         rf_visible(rf_visible),
         rb_visible(rb_visible)
     {}
+    Venetian_Geometry::Venetian_Geometry(double slat_tilt,
+                                         double slat_width,
+                                         double slat_spacing,
+                                         double slat_curvature,
+                                         bool is_horizontal,
+                                         SingleLayerOptics::DistributionMethod distribution_method,
+                                         int number_slat_segments) :
+        slat_tilt(slat_tilt),
+        slat_width(slat_width),
+        slat_spacing(slat_spacing),
+        slat_curvature(slat_curvature),
+        is_horizontal(is_horizontal),
+        distribution_method(distribution_method),
+        number_slat_segments(number_slat_segments)
+    {}
+
+    Woven_Geometry::Woven_Geometry(double thread_diameter,
+                                   double thread_spacing,
+                                   double shade_thickness) :
+        thread_diameter(thread_diameter),
+        thread_spacing(thread_spacing),
+        shade_thickness(shade_thickness)
+    {}
+
+    Perforated_Geometry::Perforated_Geometry(double spacing_x,
+                                             double spacing_y,
+                                             double dimension_x,
+                                             double dimension_y,
+                                             Perforated_Geometry::Type perforation_type) :
+        spacing_x(spacing_x),
+        spacing_y(spacing_y),
+        dimension_x(dimension_x),
+        dimension_y(dimension_y),
+        perforation_type(perforation_type)
+    {}
 }   // namespace wincalc

src/product_data.h

@@ -222,21 +222,30 @@ namespace wincalc
 
     struct Venetian_Geometry
     {
+        Venetian_Geometry(double slat_tilt,
+                          double slat_width,
+                          double slat_spacing,
+                          double slat_curvature,
+                          bool is_horizontal = true,
+                          SingleLayerOptics::DistributionMethod distribution_method =
+                            SingleLayerOptics::DistributionMethod::DirectionalDiffuse,
+                          int number_slat_segments = 5);
+
         double slat_tilt;
         double slat_width;
         double slat_spacing;
         double slat_curvature;
         bool is_horizontal = true;
-		SingleLayerOptics::DistributionMethod distribution_method =
-			SingleLayerOptics::DistributionMethod::DirectionalDiffuse;
-		int number_slat_segments = 5;
+        SingleLayerOptics::DistributionMethod distribution_method =
+          SingleLayerOptics::DistributionMethod::DirectionalDiffuse;
+        int number_slat_segments = 5;
     };
 
     struct Product_Data_Optical_Venetian : Product_Data_Optical_With_Material
     {
         Product_Data_Optical_Venetian(
           std::shared_ptr<Product_Data_Optical> const & material_optical_data,
-			Venetian_Geometry const& geometry);
+          Venetian_Geometry const & geometry);
 
         std::unique_ptr<EffectiveLayers::EffectiveLayer>
           effective_thermal_values(double width,
@@ -246,21 +255,23 @@ namespace wincalc
                                    double gap_width_left,
                                    double gap_width_right) const override;
 
-		Venetian_Geometry geometry;
+        Venetian_Geometry geometry;
     };
 
-	struct Woven_Geometry
-	{
+    struct Woven_Geometry
+    {
+        Woven_Geometry(double thread_diameter, double thread_spacing, double shade_thickness);
+        
 		double thread_diameter;
-		double thread_spacing;
-		double shade_thickness;
-	};
+        double thread_spacing;
+        double shade_thickness;
+    };
 
     struct Product_Data_Optical_Woven_Shade : Product_Data_Optical_With_Material
     {
         Product_Data_Optical_Woven_Shade(
           std::shared_ptr<Product_Data_Optical> const & material_optical_data,
-          Woven_Geometry const& geometry);
+          Woven_Geometry const & geometry);
 
         std::unique_ptr<EffectiveLayers::EffectiveLayer>
           effective_thermal_values(double width,
@@ -270,31 +281,36 @@ namespace wincalc
                                    double gap_width_left,
                                    double gap_width_right) const override;
 
-		Woven_Geometry geometry;
+        Woven_Geometry geometry;
     };
 
-	struct Perforated_Geometry
-	{
-		enum class Type
-		{
-			CIRCULAR,
-			RECTANGULAR,
-			SQUARE
-		};
-
-		double spacing_x;
-		double spacing_y;
-		double dimension_x;
-		double dimension_y;
-		Perforated_Geometry::Type perforation_type;
-	};
+    struct Perforated_Geometry
+    {
+        enum class Type
+        {
+            CIRCULAR,
+            RECTANGULAR,
+            SQUARE
+        };
+
+        Perforated_Geometry(double spacing_x,
+                            double spacing_y,
+                            double dimension_x,
+                            double dimension_y,
+                            Perforated_Geometry::Type perforation_type);
+
+        double spacing_x;
+        double spacing_y;
+        double dimension_x;
+        double dimension_y;
+        Perforated_Geometry::Type perforation_type;
+    };
 
     struct Product_Data_Optical_Perforated_Screen : Product_Data_Optical_With_Material
     {
-        
         Product_Data_Optical_Perforated_Screen(
           std::shared_ptr<Product_Data_Optical> const & material_optical_data,
-          Perforated_Geometry const& geometry);
+          Perforated_Geometry const & geometry);
 
         std::unique_ptr<EffectiveLayers::EffectiveLayer>
           effective_thermal_values(double width,