[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: pcb.git: branch: master updated (35b137c3e193471e07f0873dfb149cebd059dca2)



The branch, master has been updated
       via  35b137c3e193471e07f0873dfb149cebd059dca2 (commit)
       via  9ff7057cf73922fc82e0113ae2f7eb1409ca0dd5 (commit)
      from  f0943e66e88580e706aa7fdfa80a08d3f2b6f4d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/gerber/gerber.c |   12 +++++++-----
 src/print.c             |    4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)


=================
 Commit Messages
=================

commit 35b137c3e193471e07f0873dfb149cebd059dca2
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/gerber: Remove option for thickness of auto-generated outline layer
    
    We don't mess with the thickness of the user's hand-drawn outline, and
    this option implies that we do. I cannot think of a sensible way to
    present the option without confusing the user, so lets remove it.
    
    Whilst the previous default of 10 mil was fine, 8 mil matches the
    width used on the fab drawing, so I have changed to that value.

:100644 100644 2e6b954... b7e99bb... M	src/hid/gerber/gerber.c

commit 9ff7057cf73922fc82e0113ae2f7eb1409ca0dd5
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    src/print.c: Fix fab drawing width text annotation.
    
    The text hard-coded that the outline is 10mil, in fact it is not,
    the current #define sets it at 8 mil. Report the actual value used.

:100644 100644 b5fec1c... cd19d31... M	src/print.c

=========
 Changes
=========

commit 35b137c3e193471e07f0873dfb149cebd059dca2
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/gerber: Remove option for thickness of auto-generated outline layer
    
    We don't mess with the thickness of the user's hand-drawn outline, and
    this option implies that we do. I cannot think of a sensible way to
    present the option without confusing the user, so lets remove it.
    
    Whilst the previous default of 10 mil was fine, 8 mil matches the
    width used on the fab drawing, so I have changed to that value.

diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c
index 2e6b954..b7e99bb 100644
--- a/src/hid/gerber/gerber.c
+++ b/src/hid/gerber/gerber.c
@@ -144,6 +144,12 @@ PendingDrills *pending_drills = 0;
 int n_pending_drills = 0, max_pending_drills = 0;
 
 /*----------------------------------------------------------------------------*/
+/* Defined Constants                                                          */
+/*----------------------------------------------------------------------------*/
+#define AUTO_OUTLINE_WIDTH 800       /* Auto-geneated outline width of 8 mils */
+
+
+/*----------------------------------------------------------------------------*/
 /* Aperture Routines                                                          */
 /*----------------------------------------------------------------------------*/
 
@@ -377,9 +383,6 @@ static HID_Attribute gerber_options[] = {
   {"copy-outline", "Copy outline onto other layers",
    HID_Enum, 0, 0, {0, 0, 0}, copy_outline_names, 0},
 #define HA_copy_outline 3
-  {"outline-thickness", "size, in mils/mm, of the trace used to draw the outline",
-   HID_String, 0, 0, {0, "10mil", 0}, 0, 0},
-#define HA_copy_outline_size 4
 };
 
 #define NUM_OPTIONS (sizeof(gerber_options)/sizeof(gerber_options[0]))
@@ -463,7 +466,6 @@ gerber_do_export (HID_Attr_Val * options)
   all_layers = options[HA_all_layers].int_value;
 
   copy_outline_mode = options[HA_copy_outline].int_value;
-  outline_trace_size = GetValue (options[HA_copy_outline_size].str_value, NULL, &absolute);
 
   outline_layer = NULL;
 
@@ -776,7 +778,7 @@ gerber_set_layer (const char *name, int group, int empty)
       else if (!outline_layer)
 	{
 	  hidGC gc = gui->make_gc ();
-	  gui->set_line_width (gc, outline_trace_size);
+	  gui->set_line_width (gc, AUTO_OUTLINE_WIDTH);
 	  gui->draw_line (gc, 0, 0, PCB->MaxWidth, 0);
 	  gui->draw_line (gc, 0, 0, 0, PCB->MaxHeight);
 	  gui->draw_line (gc, PCB->MaxWidth, 0, PCB->MaxWidth, PCB->MaxHeight);

commit 9ff7057cf73922fc82e0113ae2f7eb1409ca0dd5
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    src/print.c: Fix fab drawing width text annotation.
    
    The text hard-coded that the outline is 10mil, in fact it is not,
    the current #define sets it at 8 mil. Report the actual value used.

diff --git a/src/print.c b/src/print.c
index b5fec1c..cd19d31 100644
--- a/src/print.c
+++ b/src/print.c
@@ -319,9 +319,9 @@ PrintFab (void)
 	       "Maximum Dimensions: %d mils wide, %d mils high",
 	       PCB->MaxWidth / 100, PCB->MaxHeight / 100);
       text_at (PCB->MaxWidth / 2, PCB->MaxHeight + 2000, 1,
-	       "Board outline is the centerline of this 10 mil"
+	       "Board outline is the centerline of this %d mil"
 	       " rectangle - 0,0 to %d,%d mils",
-	       PCB->MaxWidth / 100, PCB->MaxHeight / 100);
+	       FAB_LINE_W / 100, PCB->MaxWidth / 100, PCB->MaxHeight / 100);
     }
   else
     {




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs