imp board: add display keepouts in outline mode by default

add option for filled display

closes #622

Author: carrotIndustries

Diff for: Makefile

@@ -188,6 +188,7 @@ SRC_CANVAS = \
 	src/canvas/bitmap_font_util.cpp\
 	src/canvas/picture_renderer.cpp\
 	src/util/warp_cursor.cpp\
+	src/canvas/layer_display.cpp\
 
 SRC_IMP = \
 	src/imp/imp_main.cpp \

Diff for: src/canvas/layer_display.cpp

@@ -0,0 +1,14 @@
+#include "layer_display.hpp"
+#include "triangle.hpp"
+
+namespace horizon {
+static const uint32_t types_visible_default = ~(1 << static_cast<uint32_t>(TriangleInfo::Type::KEEPOUT_FILL));
+
+LayerDisplay::LayerDisplay() : types_visible(types_visible_default)
+{
+}
+
+LayerDisplay::LayerDisplay(bool vi, Mode mo) : visible(vi), mode(mo), types_visible(types_visible_default)
+{
+}
+} // namespace horizon

Diff for: src/canvas/layer_display.hpp

@@ -6,12 +6,8 @@ class LayerDisplay {
 public:
     // also used in shaders
     enum class Mode { OUTLINE = 0, HATCH = 1, FILL = 2, FILL_ONLY = 3, DOTTED = 4, N_MODES };
-    LayerDisplay(bool vi, Mode mo) : visible(vi), mode(mo)
-    {
-    }
-    LayerDisplay()
-    {
-    }
+    LayerDisplay(bool vi, Mode mo);
+    LayerDisplay();
 
     bool visible = true;
     Mode mode = Mode::FILL;

Diff for: src/canvas/render.cpp

@@ -836,8 +836,9 @@ void Canvas::render(const Polygon &ipoly, bool interactive, ColorP co)
         object_ref_pop();
     }
     else { // normal polygon
+        const bool is_keepout = dynamic_cast<Keepout *>(poly.usage.ptr);
         begin_group(poly.layer);
-        if (poly_is_rect(poly)) {
+        if (poly_is_rect(poly) && !is_keepout) {
             const Coordf p0 = (poly.get_vertex(0).position + poly.get_vertex(1).position) / 2;
             const Coordf p1 = (poly.get_vertex(2).position + poly.get_vertex(3).position) / 2;
             const float width = (poly.get_vertex(0).position - poly.get_vertex(1).position).magd();
@@ -860,13 +861,20 @@ void Canvas::render(const Polygon &ipoly, bool interactive, ColorP co)
             TPPLPartition part;
             po.SetOrientation(TPPL_ORIENTATION_CCW);
             part.Triangulate_EC(&po, &outpolys);
+            if (is_keepout) {
+                assert(triangle_type_current == TriangleInfo::Type::NONE);
+                triangle_type_current = TriangleInfo::Type::KEEPOUT_FILL;
+            }
             for (auto &tri : outpolys) {
                 assert(tri.GetNumPoints() == 3);
                 Coordf p0 = transform.transform(coordf_from_pt(tri[0]));
                 Coordf p1 = transform.transform(coordf_from_pt(tri[1]));
                 Coordf p2 = transform.transform(coordf_from_pt(tri[2]));
                 add_triangle(poly.layer, p0, p1, p2, co);
             }
+            if (is_keepout) {
+                triangle_type_current = TriangleInfo::Type::NONE;
+            }
             for (size_t i = 0; i < poly.vertices.size(); i++) {
                 draw_line(poly.vertices[i].position, poly.vertices[(i + 1) % poly.vertices.size()].position, co,
                           poly.layer);

Diff for: src/canvas/triangle.hpp

@@ -26,7 +26,7 @@ class Triangle {
 
 class TriangleInfo {
 public:
-    enum class Type : uint8_t { NONE, TEXT, GRAPHICS, PLANE_FILL, PAD };
+    enum class Type : uint8_t { NONE, TEXT, GRAPHICS, PLANE_FILL, KEEPOUT_FILL, PAD };
 
     TriangleInfo(Type ty, uint8_t flg) : type(ty), flags(flg)
     {

Diff for: src/widgets/board_display_options.cpp

@@ -103,29 +103,38 @@ class LayerOptionsCopper : public LayerOptionsExp {
     {
         cb_planes_outline = add_checkbutton("Don't fill planes");
         cb_planes_outline->signal_toggled().connect(sigc::mem_fun(*this, &LayerOptionsCopper::emit));
+
+        cb_keepouts_outline = add_checkbutton("Don't fill keepouts");
+        cb_keepouts_outline->set_active(true);
+        cb_keepouts_outline->signal_toggled().connect(sigc::mem_fun(*this, &LayerOptionsCopper::emit));
     }
 
     json serialize() override
     {
         json j;
         j["planes_outline"] = cb_planes_outline->get_active();
+        j["keepouts_outline"] = cb_keepouts_outline->get_active();
         return j;
     }
 
     virtual void load_from_json(const json &j) override
     {
-        if (j.count("planes_outline"))
-            cb_planes_outline->set_active(j.at("planes_outline").get<bool>());
+        cb_planes_outline->set_active(j.value("planes_outline", false));
+        cb_keepouts_outline->set_active(j.value("keepouts_outline", true));
     }
 
 private:
     Gtk::CheckButton *cb_planes_outline = nullptr;
+    Gtk::CheckButton *cb_keepouts_outline = nullptr;
     void emit()
     {
         LayerDisplay ld;
         if (cb_planes_outline->get_active()) {
             ld.types_visible &= ~(1 << static_cast<int>(TriangleInfo::Type::PLANE_FILL));
         }
+        if (!cb_keepouts_outline->get_active()) {
+            ld.types_visible |= (1 << static_cast<int>(TriangleInfo::Type::KEEPOUT_FILL));
+        }
         emit_layer_display(ld);
     }
 };