From 4edeb93fb44d03728d7e7a1777a73fd7941717cf Mon Sep 17 00:00:00 2001
From: Mario Voigt <mario.voigt@stadtfabrikanten.org>
Date: Wed, 17 Jan 2024 21:20:54 +0100
Subject: [PATCH] fix issue #48

---
 .../laser_check/laser_check.inx               |  2 +-
 .../fablabchemnitz/laser_check/laser_check.py | 37 +++++++++++++++----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/extensions/fablabchemnitz/laser_check/laser_check.inx b/extensions/fablabchemnitz/laser_check/laser_check.inx
index 3d0ec53..0ecc188 100644
--- a/extensions/fablabchemnitz/laser_check/laser_check.inx
+++ b/extensions/fablabchemnitz/laser_check/laser_check.inx
@@ -43,7 +43,7 @@
                     <param name="stroke_widths" type="bool" gui-text="Stroke widths">false</param>
                     <param name="stroke_widths_max" type="int" min="0" max="9999" gui-text="Max. allowed">1</param>
                     <separator/>
-                    <param name="stroke_opacities" type="bool" gui-text="Stroke opacities">false</param>
+                    <param name="opacities" type="bool" gui-text="Opacities" gui-description="Check for existence of attributes opacity, stroke-opacity and fill-opacity">false</param>
                     <param name="cosmestic_dashes" type="bool" gui-text="Cosmetic dash styles">false</param>
                     <param name="invisible_shapes" type="bool" gui-text="Invisible shapes">false</param>
                     <param name="non_path_shapes" type="bool" gui-text="Non-path shapes">false</param>
diff --git a/extensions/fablabchemnitz/laser_check/laser_check.py b/extensions/fablabchemnitz/laser_check/laser_check.py
index 45822a6..fc537c7 100644
--- a/extensions/fablabchemnitz/laser_check/laser_check.py
+++ b/extensions/fablabchemnitz/laser_check/laser_check.py
@@ -82,7 +82,7 @@ class LaserCheck(inkex.EffectExtension):
         pars.add_argument('--stroke_colors_max', type=int, default=3)
         pars.add_argument('--stroke_widths', type=inkex.Boolean, default=False)
         pars.add_argument('--stroke_widths_max', type=int, default=1)
-        pars.add_argument('--stroke_opacities', type=inkex.Boolean, default=False)
+        pars.add_argument('--opacities', type=inkex.Boolean, default=False)
         pars.add_argument('--cosmestic_dashes', type=inkex.Boolean, default=False)
         pars.add_argument('--invisible_shapes', type=inkex.Boolean, default=False)
         pars.add_argument('--pointy_paths', type=inkex.Boolean, default=False)
@@ -703,26 +703,47 @@ class LaserCheck(inkex.EffectExtension):
           
                 
         '''
-        Additionally, stroke opacities less than 1.0 cause problems in most laser softwares. Please
+        Additionally, opacities less than 1.0 cause problems in most laser softwares. Please
         adjust all strokes to use full opacity.
         '''
-        if so.checks == "check_all" or so.stroke_opacities is True:
-            inkex.utils.debug("\n---------- Objects with stroke transparencies < 1.0 - should be set to 1.0")
+        if so.checks == "check_all" or so.opacities is True:
+            inkex.utils.debug("\n---------- Objects with transparencies < 1.0 - should be set to 1.0")
             transparencies = []
             for element in shapes: 
                 strokeOpacityAttr = element.get('stroke-opacity') #same information could be in regular attribute instead nested in style attribute
                 if strokeOpacityAttr is not None and strokeOpacityAttr not in transparencies:
                     if float(strokeOpacityAttr) < 1.0:
-                            transparencies.append([element, strokeOpacityAttr])
+                            transparencies.append([element, strokeOpacityAttr, "stroke-opacity"])
                 stroke_opacity = element.style.get('stroke-opacity')
                 if stroke_opacity is not None and stroke_opacity not in transparencies:
                     if stroke_opacity != "none":
                         if float(stroke_opacity) < 1.0:
-                                transparencies.append([element, stroke_opacity])
+                                transparencies.append([element, stroke_opacity, "stroke-opacity"])
+                                
+                fillOpacityAttr = element.get('fill-opacity') #same information could be in regular attribute instead nested in style attribute
+                if fillOpacityAttr is not None and fillOpacityAttr not in transparencies:
+                    if float(fillOpacityAttr) < 1.0:
+                            transparencies.append([element, fillOpacityAttr, "fill-opacity"])
+                fill_opacity = element.style.get('fill-opacity')
+                if fill_opacity is not None and fill_opacity not in transparencies:
+                    if fill_opacity != "none":
+                        if float(fill_opacity) < 1.0:
+                                transparencies.append([element, fill_opacity, "fill-opacity"])
+                  
+                opacityAttr = element.get('opacity') #same information could be in regular attribute instead nested in style attribute
+                if opacityAttr is not None and opacityAttr not in transparencies:
+                    if float(opacityAttr) < 1.0:
+                            transparencies.append([element, opacityAttr, "opacity"])
+                opacity = element.style.get('opacity')
+                if opacity is not None and opacity not in transparencies:
+                    if opacity != "none":
+                        if float(opacity) < 1.0:
+                                transparencies.append([element, opacity, "opacity"])
+                                
             if so.show_issues_only is False:
-                inkex.utils.debug("{} objects with stroke transparencies < 1.0 in total".format(len(transparencies)))
+                inkex.utils.debug("{} objects with transparencies < 1.0 in total".format(len(transparencies)))
             for transparency in transparencies:
-                inkex.utils.debug("id={}, transparency={}".format(transparency[0].get('id'), transparency[1]))  
+                inkex.utils.debug("id={}, transparency={}, attribute={}".format(transparency[0].get('id'), transparency[1], transparency[2]))  
       
       
         '''