Add preference for 3d view copper color

Author: frmdstryr

src/canvas3d/canvas3d_base.cpp

@@ -38,7 +38,7 @@ Color Canvas3DBase::get_layer_color(int layer) const
         if (use_layer_colors && appearance.layer_colors.count(layer)) {
             return appearance.layer_colors.at(layer);
         }
-        return {1, .8, 0};
+        return copper_color;
     }
 
     if (layer == BoardLayers::TOP_MASK || layer == BoardLayers::BOTTOM_MASK)

src/canvas3d/canvas3d_base.hpp

@@ -56,6 +56,7 @@ class Canvas3DBase {
     GET_SET_PICK(show_copper, bool)
     GET_SET_PICK(show_points, bool)
     GET_SET(use_layer_colors, bool)
+    GET_SET(copper_color, Color)
     GET_SET(solder_mask_color, Color)
     GET_SET(silkscreen_color, Color)
     GET_SET(substrate_color, Color)
@@ -127,6 +128,7 @@ class Canvas3DBase {
     bool show_copper = true;
     bool show_points = false;
     Color solder_mask_color = {0, .5, 0};
+    Color copper_color = {1, .8, 0};
     Color silkscreen_color = {1, 1, 1};
     Color substrate_color = {.2, .15, 0};
     float explode = 0;

src/imp/3d/3d_view.cpp

@@ -633,6 +633,7 @@ void View3DWindow::apply_preferences(const Preferences &prefs)
     canvas->set_background_top_color(prefs.view_3d.bg_top_color);
     set_color_button_color(background_bottom_color_button, prefs.view_3d.bg_bottom_color);
     canvas->set_background_bottom_color(prefs.view_3d.bg_bottom_color);
+    canvas->set_copper_color(prefs.view_3d.copper_color);
 
     spnav_buttons = prefs.spacenav.buttons;
     const auto av = ActionCatalogItem::AVAILABLE_IN_3D;

src/pool-prj-mgr/preferences/preferences_window_misc.cpp

@@ -106,6 +106,11 @@ MiscPreferencesEditor::MiscPreferencesEditor(Preferences &prefs) : preferences(p
                                                                preferences, preferences.view_3d.silkscreen_color));
             gr->add_row(*r);
         }
+        {
+            auto r = Gtk::manage(new PreferencesRowColorButton("Copper color", "Default copper color", preferences,
+                                                               preferences.view_3d.copper_color));
+            gr->add_row(*r);
+        }
         {
             auto r = Gtk::manage(new PreferencesRowColorButton("Substrate color", "Default substrate color",
                                                                preferences, preferences.view_3d.substrate_color));

src/preferences/preferences.cpp

@@ -220,6 +220,7 @@ json View3DPreferences::serialize() const
     json j;
     j["use_ortho_projection"] = use_ortho_projection;
     j["solder_mask_color"] = color_to_json(solder_mask_color);
+    j["copper_color"] = color_to_json(copper_color);
     j["silkscreen_color"] = color_to_json(silkscreen_color);
     j["substrate_color"] = color_to_json(substrate_color);
     j["bg_top_color"] = color_to_json(bg_top_color);
@@ -232,6 +233,8 @@ void View3DPreferences::load_from_json(const json &j)
     use_ortho_projection = j.value("use_ortho_projection", false);
     if (j.count("solder_mask_color"))
         solder_mask_color = color_from_json(j.at("solder_mask_color"));
+    if (j.count("copper_color"))
+        copper_color = color_from_json(j.at("copper_color"));
     if (j.count("silkscreen_color"))
         silkscreen_color = color_from_json(j.at("silkscreen_color"));
     if (j.count("substrate_color"))

src/preferences/preferences.hpp

@@ -48,11 +48,12 @@ class BoardPreferences {
 class View3DPreferences {
 public:
     bool use_ortho_projection = false;
-    Color solder_mask_color = Color(0, .5, 0);
-    Color silkscreen_color = Color(1, 1, 1);
-    Color substrate_color = Color(.2, .15, 0);
-    Color bg_top_color = Color(.2, .2, .4);
-    Color bg_bottom_color = Color(.59, .59, .66);
+    Color solder_mask_color = {0, .5, 0};
+    Color copper_color = {1, .8, 0};
+    Color silkscreen_color = {1, 1, 1};
+    Color substrate_color = {.2, .15, 0};
+    Color bg_top_color = {.2, .2, .4};
+    Color bg_bottom_color = {.59, .59, .66};
 
     void load_from_json(const json &j);
     json serialize() const;