| via_far | color | 0 | non-terminal padstack shape on non-current ('far side') layer
Index: trunk/src/conf_core.h
===================================================================
--- trunk/src/conf_core.h (revision 28337)
+++ trunk/src/conf_core.h (revision 28338)
@@ -158,7 +158,8 @@
CFT_BOOLEAN black_current_group; /* render all layers of the current group black, for maximum contrast */
struct { /* color */
- CFT_COLOR crosshair; /* different object colors */
+ CFT_COLOR crosshair; /* color of the on-screen crosshair */
+ CFT_COLOR drc; /* color of the on-screen drc clearance indication while routing */
CFT_COLOR selected; /* generic object selection color */
CFT_COLOR via; /* non-terminal padstack shape on current layer */
CFT_COLOR via_far; /* non-terminal padstack shape on non-current ('far side') layer */
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c (revision 28337)
+++ trunk/src/crosshair.c (revision 28338)
@@ -289,7 +289,7 @@
/* Draw the DRC outline if it is enabled */
if (conf_core.editor.show_drc) {
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
pcb_draw_wireframe_line(pcb_crosshair.GC,line.Point1.X, line.Point1.Y,
line.Point2.X, line.Point2.Y,
line.Thickness + 2 * (conf_core.design.bloat + 1), 0);
@@ -312,7 +312,7 @@
/* Draw the DRC outline if it is enabled */
if (conf_core.editor.show_drc) {
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
arc.Thickness += 2 * (conf_core.design.bloat + 1);
pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness);
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
@@ -355,7 +355,7 @@
/* Draw the DRC outline if it is enabled */
if (conf_core.editor.show_drc) {
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X,
point2.Y,line->Thickness + 2 * (conf_core.design.bloat + 1), 0);
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
@@ -410,7 +410,7 @@
/* Draw the DRC outline if it is enabled */
if (conf_core.editor.show_drc) {
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
arc.Thickness += 2 * (conf_core.design.bloat + 1);
pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness);
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
Index: trunk/src/pcb-conf.lht
===================================================================
--- trunk/src/pcb-conf.lht (revision 28337)
+++ trunk/src/pcb-conf.lht (revision 28338)
@@ -163,6 +163,7 @@
background = {#e5e5e5}
crosshair = {#ff0000}
cross = {#cdcd00}
+ drc = {#cdcd00}
selected = {#00ffff}
via = {#707070}
via_far = {#a0a0a0}
Index: trunk/src/route.c
===================================================================
--- trunk/src/route.c (revision 28337)
+++ trunk/src/route.c (revision 28338)
@@ -709,7 +709,7 @@
pcb_coord_t thickness = p_route->thickness + 2 * conf_core.design.bloat;
int i;
- pcb_render->set_color(GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(GC, &conf_core.appearance.color.drc);
for(i = 0; i < p_route->size; ++i) {
const pcb_route_object_t *p_obj = &p_route->objects[i];
Index: trunk/src/tool_arc.c
===================================================================
--- trunk/src/tool_arc.c (revision 28337)
+++ trunk/src/tool_arc.c (revision 28338)
@@ -145,7 +145,7 @@
if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
pcb_xordraw_attached_arc(conf_core.design.line_thickness);
if (conf_core.editor.show_drc) {
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
pcb_xordraw_attached_arc(conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1));
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
}
@@ -161,7 +161,7 @@
conf_core.design.line_thickness, 0);
if(conf_core.editor.show_drc) {
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
pcb_draw_wireframe_line(pcb_crosshair.GC,
pcb_crosshair.X, pcb_crosshair.Y,
pcb_crosshair.X, pcb_crosshair.Y,
Index: trunk/src/tool_line.c
===================================================================
--- trunk/src/tool_line.c (revision 28337)
+++ trunk/src/tool_line.c (revision 28338)
@@ -378,7 +378,7 @@
conf_core.design.line_thickness,0 );
if (conf_core.editor.show_drc) {
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
pcb_draw_wireframe_line(pcb_crosshair.GC,
pcb_crosshair.X, pcb_crosshair.Y,
pcb_crosshair.X, pcb_crosshair.Y,
Index: trunk/src/tool_via.c
===================================================================
--- trunk/src/tool_via.c (revision 28337)
+++ trunk/src/tool_via.c (revision 28338)
@@ -98,7 +98,7 @@
xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, 0);
if (conf_core.editor.show_drc) {
/* XXX: Naughty cheat - use the mask to draw DRC clearance! */
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
xor_draw_fake_via(pcb_crosshair.X, pcb_crosshair.Y, conf_core.design.via_thickness, conf_core.design.clearance);
pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.crosshair);
}
Index: trunk/src_plugins/millpath/toolpath.c
===================================================================
--- trunk/src_plugins/millpath/toolpath.c (revision 28337)
+++ trunk/src_plugins/millpath/toolpath.c (revision 28338)
@@ -432,7 +432,7 @@
trace_contour(pcb, result, 0, 1000);
- rem = fix_overcuts(pcb, result);
+/* rem = fix_overcuts(pcb, result);*/
if (rem != 0)
pcb_message(PCB_MSG_WARNING, "toolpath: had to remove %ld cuts, there might be short circuits;\ncheck your clearance vs. tool size!\n", rem);
Index: trunk/src_plugins/rubberband_orig/rubberband.c
===================================================================
--- trunk/src_plugins/rubberband_orig/rubberband.c (revision 28337)
+++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 28338)
@@ -1173,7 +1173,7 @@
pcb_draw_wireframe_line(pcb_crosshair.GC, x[0], y[0], x[1], y[1], ptr->Line->Thickness, 0);
/* Draw the DRC outline if it is enabled */
if (conf_core.editor.show_drc) {
- pcb_render->set_color(pcb_crosshair.GC, &pcbhl_conf.appearance.color.cross);
+ pcb_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
pcb_draw_wireframe_line(pcb_crosshair.GC, x[0], y[0], x[1], y[1], ptr->Line->Thickness + 2 * (conf_core.design.bloat + 1), 0);
}
}
|