From 203a2f122fac01678ec95e93fd8fa0b0620ffb53 Mon Sep 17 00:00:00 2001
From: qewer33 <qewer33@proton.me>
Date: Fri, 22 Sep 2023 19:46:58 +0300
Subject: [PATCH] Assembly: Make JCS axis colors use parameters

---
 src/Mod/Assembly/JointObject.py   | 34 ++++++++++---------------------
 src/Mod/Assembly/UtilsAssembly.py |  8 ++++++++
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/Mod/Assembly/JointObject.py b/src/Mod/Assembly/JointObject.py
index 365911bd05..35a0d82871 100644
--- a/src/Mod/Assembly/JointObject.py
+++ b/src/Mod/Assembly/JointObject.py
@@ -240,31 +240,19 @@ class Joint:
 class ViewProviderJoint:
     def __init__(self, obj, app_obj):
         """Set this object to the proxy object of the actual view provider"""
-        obj.addProperty(
-            "App::PropertyColor", "color_X_axis", "JCS", "Joint coordinate system X axis color"
-        )
-        obj.addProperty(
-            "App::PropertyColor", "color_Y_axis", "JCS", "Joint coordinate system Y axis color"
-        )
-        obj.addProperty(
-            "App::PropertyColor", "color_Z_axis", "JCS", "Joint coordinate system Z axis color"
-        )
-        obj.addProperty(
-            "App::PropertyInteger",
-            "axis_thickness",
-            "JCS",
-            "Joint cordinate system X axis thickness",
-        )
-        obj.color_X_axis = (1.0, 0.0, 0.0)
-        obj.color_Y_axis = (0.0, 1.0, 0.0)
-        obj.color_Z_axis = (0.0, 0.0, 1.0)
-        obj.axis_thickness = 3
+        self.axis_thickness = 3
+
+        view_params = App.ParamGet("User parameter:BaseApp/Preferences/View")
+        param_x_axis_color = view_params.GetUnsigned("AxisXColor", 0xCC333300)
+        param_y_axis_color = view_params.GetUnsigned("AxisYColor", 0x33CC3300)
+        param_z_axis_color = view_params.GetUnsigned("AxisZColor", 0x3333CC00)
+
         self.x_axis_so_color = coin.SoBaseColor()
-        self.x_axis_so_color.rgb.setValue(1.0, 0.0, 0.0)
+        self.x_axis_so_color.rgb.setValue(UtilsAssembly.color_from_unsigned(param_x_axis_color))
         self.y_axis_so_color = coin.SoBaseColor()
-        self.y_axis_so_color.rgb.setValue(0.0, 1.0, 0.0)
+        self.y_axis_so_color.rgb.setValue(UtilsAssembly.color_from_unsigned(param_y_axis_color))
         self.z_axis_so_color = coin.SoBaseColor()
-        self.z_axis_so_color.rgb.setValue(0.0, 0.0, 1.0)
+        self.z_axis_so_color.rgb.setValue(UtilsAssembly.color_from_unsigned(param_z_axis_color))
 
         camera = Gui.ActiveDocument.ActiveView.getCameraNode()
         self.cameraSensor = coin.SoFieldSensor(self.camera_callback, camera)
@@ -285,7 +273,7 @@ class ViewProviderJoint:
 
         self.draw_style = coin.SoDrawStyle()
         self.draw_style.style = coin.SoDrawStyle.LINES
-        self.draw_style.lineWidth = obj.axis_thickness
+        self.draw_style.lineWidth = self.axis_thickness
 
         self.switch_JCS1 = self.JCS_sep(obj, self.transform1)
         self.switch_JCS2 = self.JCS_sep(obj, self.transform2)
diff --git a/src/Mod/Assembly/UtilsAssembly.py b/src/Mod/Assembly/UtilsAssembly.py
index 69f4392755..c8bc90359e 100644
--- a/src/Mod/Assembly/UtilsAssembly.py
+++ b/src/Mod/Assembly/UtilsAssembly.py
@@ -236,3 +236,11 @@ def findVertexNameInObject(vertex, obj):
         if vtx.Point == vertex.Point:
             return "Vertex" + str(i + 1)
     return ""
+
+
+def color_from_unsigned(c):
+    return [
+        float(int((c >> 24) & 0xFF) / 255),
+        float(int((c >> 16) & 0xFF) / 255),
+        float(int((c >> 8) & 0xFF) / 255),
+    ]