You can subscribe to this list here.
2003 |
Jan
|
Feb
(4) |
Mar
(5) |
Apr
|
May
(5) |
Jun
(30) |
Jul
(2) |
Aug
(18) |
Sep
(14) |
Oct
(7) |
Nov
(21) |
Dec
(44) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(63) |
Feb
(94) |
Mar
(54) |
Apr
(39) |
May
(34) |
Jun
(25) |
Jul
(10) |
Aug
(33) |
Sep
(16) |
Oct
(62) |
Nov
(12) |
Dec
(2) |
2005 |
Jan
(71) |
Feb
(8) |
Mar
(50) |
Apr
|
May
(2) |
Jun
(12) |
Jul
(19) |
Aug
(8) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(8) |
2006 |
Jan
(10) |
Feb
(1) |
Mar
(301) |
Apr
(232) |
May
(26) |
Jun
(20) |
Jul
(26) |
Aug
(79) |
Sep
(92) |
Oct
(174) |
Nov
(17) |
Dec
(93) |
2007 |
Jan
(27) |
Feb
(179) |
Mar
(37) |
Apr
(81) |
May
(20) |
Jun
(5) |
Jul
|
Aug
(40) |
Sep
(68) |
Oct
(8) |
Nov
(47) |
Dec
(34) |
2008 |
Jan
(154) |
Feb
(15) |
Mar
(5) |
Apr
(21) |
May
(4) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(8) |
Oct
(9) |
Nov
(35) |
Dec
(50) |
2009 |
Jan
(8) |
Feb
(10) |
Mar
(6) |
Apr
(9) |
May
(7) |
Jun
(40) |
Jul
(7) |
Aug
(5) |
Sep
(2) |
Oct
(16) |
Nov
(42) |
Dec
(5) |
2010 |
Jan
(3) |
Feb
(15) |
Mar
(32) |
Apr
(18) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(11) |
Sep
(16) |
Oct
|
Nov
(4) |
Dec
(35) |
2011 |
Jan
(24) |
Feb
(6) |
Mar
(27) |
Apr
(119) |
May
(72) |
Jun
(20) |
Jul
(31) |
Aug
(88) |
Sep
(86) |
Oct
(14) |
Nov
(11) |
Dec
(30) |
2012 |
Jan
(4) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <gi...@gp...> - 2011-12-20 21:01:01
|
The branch, master has been updated via df91527ba7530fdf5b6bf0d2d398ac799bb0e1ec (commit) from 3471f5bb3d4a4c8c644c4784e2462fd2a7c227ae (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/gtk/ghid-main-menu.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ================= Commit Messages ================= commit df91527ba7530fdf5b6bf0d2d398ac799bb0e1ec Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: Add "plus" and "minus" to allowable keyboard shortcuts Closes-bug: sf-3081102 :100644 100644 74aa144... 16b1b44... M src/hid/gtk/ghid-main-menu.c ========= Changes ========= commit df91527ba7530fdf5b6bf0d2d398ac799bb0e1ec Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: Add "plus" and "minus" to allowable keyboard shortcuts Closes-bug: sf-3081102 diff --git a/src/hid/gtk/ghid-main-menu.c b/src/hid/gtk/ghid-main-menu.c index 74aa144..16b1b44 100644 --- a/src/hid/gtk/ghid-main-menu.c +++ b/src/hid/gtk/ghid-main-menu.c @@ -85,6 +85,8 @@ translate_accelerator (const char *text) {"]", "bracketright"}, {".", "period"}, {"|", "bar"}, + {"+", "plus"}, + {"-", "minus"}, {NULL, NULL} }; |
From: <gi...@gp...> - 2011-12-20 20:43:04
|
The branch, master has been updated via 3471f5bb3d4a4c8c644c4784e2462fd2a7c227ae (commit) from 482ee796928af45b643a289670b9945c3b5c2743 (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/gtk/ghid-main-menu.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit 3471f5bb3d4a4c8c644c4784e2462fd2a7c227ae Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: check accelerator uniqueness in a case-insensitive way Closes-bug: lp-699496 :100644 100644 4ae8c9a... 74aa144... M src/hid/gtk/ghid-main-menu.c ========= Changes ========= commit 3471f5bb3d4a4c8c644c4784e2462fd2a7c227ae Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: check accelerator uniqueness in a case-insensitive way Closes-bug: lp-699496 diff --git a/src/hid/gtk/ghid-main-menu.c b/src/hid/gtk/ghid-main-menu.c index 4ae8c9a..74aa144 100644 --- a/src/hid/gtk/ghid-main-menu.c +++ b/src/hid/gtk/ghid-main-menu.c @@ -141,6 +141,12 @@ translate_accelerator (const char *text) return g_string_free (ret_val, FALSE); } +static gboolean +g_str_case_equal (gconstpointer v1, gconstpointer v2) +{ + return strcasecmp (v1, v2); +} + /*! \brief Check that translated accelerators are unique; warn otherwise. */ static const char * check_unique_accel (const char *accelerator) @@ -151,7 +157,7 @@ check_unique_accel (const char *accelerator) return accelerator; if (!accel_table) - accel_table = g_hash_table_new (g_str_hash, g_str_equal); + accel_table = g_hash_table_new (g_str_hash, g_str_case_equal); if (g_hash_table_lookup (accel_table, accelerator)) { |
From: <gi...@gp...> - 2011-12-20 20:26:18
|
The branch, master has been updated via 482ee796928af45b643a289670b9945c3b5c2743 (commit) from f290499bd7d5570727721326de1b7f59b6af2d07 (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/gtk/ghid-route-style-selector.c | 14 +++++++++++--- src/hid/gtk/gui-top-window.c | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) ================= Commit Messages ================= commit 482ee796928af45b643a289670b9945c3b5c2743 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: fix route style selector accelerators When the route-style list is changed, the menu items are not updated properly. (In fact, they come out of sync and point to invalid memory and lose their accelerators.) This commit fixes all that. :100644 100644 6c5e26f... 2da8160... M src/hid/gtk/ghid-route-style-selector.c :100644 100644 ee79f1a... e876220... M src/hid/gtk/gui-top-window.c ========= Changes ========= commit 482ee796928af45b643a289670b9945c3b5c2743 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: fix route style selector accelerators When the route-style list is changed, the menu items are not updated properly. (In fact, they come out of sync and point to invalid memory and lose their accelerators.) This commit fixes all that. diff --git a/src/hid/gtk/ghid-route-style-selector.c b/src/hid/gtk/ghid-route-style-selector.c index 6c5e26f..2da8160 100644 --- a/src/hid/gtk/ghid-route-style-selector.c +++ b/src/hid/gtk/ghid-route-style-selector.c @@ -52,6 +52,7 @@ struct _GHidRouteStyleSelector GtkActionGroup *action_group; GtkAccelGroup *accel_group; + gint shortcut_key_idx; GtkListStore *model; struct _route_style *active_style; @@ -391,6 +392,7 @@ ghid_route_style_selector_new () rss->accel_group = gtk_accel_group_new (); rss->action_group = gtk_action_group_new ("RouteStyleSelector"); + rss->shortcut_key_idx = 1; /* Create edit button */ rss->edit_button = gtk_button_new_with_label (_("Route Styles")); @@ -439,15 +441,16 @@ ghid_route_style_selector_real_add_route_style (GHidRouteStyleSelector *rss, gtk_tree_path_free (path); /* Setup accelerator */ - if (action_count < 12) + if (rss->shortcut_key_idx < 12) { - gchar *accel = g_strdup_printf ("<Ctrl>F%d", action_count + 1); + gchar *accel = g_strdup_printf ("<Ctrl>F%d", rss->shortcut_key_idx); gtk_action_set_accel_group (GTK_ACTION (new_style->action), rss->accel_group); gtk_action_group_add_action_with_accel (rss->action_group, GTK_ACTION (new_style->action), accel); g_free (accel); + ++rss->shortcut_key_idx; } /* Hookup and install radio button */ @@ -619,18 +622,23 @@ ghid_route_style_selector_empty (GHidRouteStyleSelector *rss) &iter, DATA_COL, &rsdata, -1); if (rsdata->action) { +#if 0 gtk_action_disconnect_accelerator (GTK_ACTION (rsdata->action)); +#endif gtk_action_group_remove_action (rss->action_group, GTK_ACTION (rsdata->action)); g_object_unref (G_OBJECT (rsdata->action)); } if (rsdata->button) - gtk_widget_destroy (GTK_WIDGET (rsdata->button));; + gtk_widget_destroy (GTK_WIDGET (rsdata->button)); + if (rsdata->menu_item) + gtk_widget_destroy (GTK_WIDGET (rsdata->menu_item)); gtk_tree_row_reference_free (rsdata->rref); free (rsdata); } while (gtk_list_store_remove (rss->model, &iter)); rss->action_radio_group = NULL; rss->button_radio_group = NULL; + rss->shortcut_key_idx = 1; } diff --git a/src/hid/gtk/gui-top-window.c b/src/hid/gtk/gui-top-window.c index ee79f1a..e876220 100644 --- a/src/hid/gtk/gui-top-window.c +++ b/src/hid/gtk/gui-top-window.c @@ -931,6 +931,9 @@ make_route_style_buttons (GHidRouteStyleSelector *rss) G_CALLBACK (route_style_changed_cb), NULL); g_signal_connect (G_OBJECT (rss), "style_edited", G_CALLBACK (route_styles_edited_cb), NULL); + ghid_main_menu_install_route_style_selector + (GHID_MAIN_MENU (ghidgui->menu_bar), + GHID_ROUTE_STYLE_SELECTOR (ghidgui->route_style_selector)); } /* |
From: <gi...@gp...> - 2011-12-20 18:30:44
|
The branch, master has been updated via f290499bd7d5570727721326de1b7f59b6af2d07 (commit) from e8c5111b4abc2b3d03d4574c0583aad6ecc708dd (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/gtk/gui-library-window.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) ================= Commit Messages ================= commit f290499bd7d5570727721326de1b7f59b6af2d07 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: library window: ignore element if LoadElementToBuffer fails In gtk/gui-library-window.c, the library window's selection-change callback calls LoadElementToBuffer() to read the selected element, so it can show a preview and select the element if necessary. The return value of this determines whether to set pcb's mode to PASTEBUFFER_MODE. However, the library window preview is attempted regardless. If LoadElementToBuffer failed, this causes a NULL reference and segfault. This patch skips the preview in the case that LoadElementToBuffer. Closes-bug: lp-853628 Closes-bug: lp-852600 :100644 100644 74b55e9... 96b5f1f... M src/hid/gtk/gui-library-window.c ========= Changes ========= commit f290499bd7d5570727721326de1b7f59b6af2d07 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> gtk: library window: ignore element if LoadElementToBuffer fails In gtk/gui-library-window.c, the library window's selection-change callback calls LoadElementToBuffer() to read the selected element, so it can show a preview and select the element if necessary. The return value of this determines whether to set pcb's mode to PASTEBUFFER_MODE. However, the library window preview is attempted regardless. If LoadElementToBuffer failed, this causes a NULL reference and segfault. This patch skips the preview in the case that LoadElementToBuffer. Closes-bug: lp-853628 Closes-bug: lp-852600 diff --git a/src/hid/gtk/gui-library-window.c b/src/hid/gtk/gui-library-window.c index 74b55e9..96b5f1f 100644 --- a/src/hid/gtk/gui-library-window.c +++ b/src/hid/gtk/gui-library-window.c @@ -387,8 +387,11 @@ library_window_callback_tree_selection_changed (GtkTreeSelection * selection, if (entry->Template == (char *) -1) { if (LoadElementToBuffer (PASTEBUFFER, entry->AllocatedMemory, true)) - SetMode (PASTEBUFFER_MODE); - goto out; + { + SetMode (PASTEBUFFER_MODE); + goto out; + } + return; } /* Otherwise, it's a m4 element and we need to create a string of @@ -399,8 +402,14 @@ library_window_callback_tree_selection_changed (GtkTreeSelection * selection, EMPTY (entry->Value), EMPTY (entry->Package)); if (LoadElementToBuffer (PASTEBUFFER, m4_args, false)) - SetMode (PASTEBUFFER_MODE); + { + SetMode (PASTEBUFFER_MODE); + g_free (m4_args); + goto out; + } + g_free (m4_args); + return; out: |
From: <gi...@gp...> - 2011-12-19 16:49:10
|
The branch, master has been updated via e8c5111b4abc2b3d03d4574c0583aad6ecc708dd (commit) via 93d1b34f9a0f3dae4f90f7fb4638626169d152d0 (commit) from a43267f2c2519f3aef2768d1e0be7125ee59095d (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 ========= doc/pcb.texi | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) ================= Commit Messages ================= commit 93d1b34f9a0f3dae4f90f7fb4638626169d152d0 Author: Dan McMahill <da...@mc...> Commit: Dan McMahill <da...@mc...> Document the annotation file which is generated by Renumber() :100644 100644 d543a2c... 850b748... M doc/pcb.texi ========= Changes ========= commit 93d1b34f9a0f3dae4f90f7fb4638626169d152d0 Author: Dan McMahill <da...@mc...> Commit: Dan McMahill <da...@mc...> Document the annotation file which is generated by Renumber() diff --git a/doc/pcb.texi b/doc/pcb.texi index d543a2c..850b748 100644 --- a/doc/pcb.texi +++ b/doc/pcb.texi @@ -85,6 +85,7 @@ board layout system. * Regular Expressions:: Searching for elements with regular expressions * Standard Drill Sizes:: Tables of standard drill sizes * Centroid File Format:: Details of the centroid (x-y) output file +* Annotation File Format:: Details of the back annotation output file * Action Reference:: Documentation for all available actions * Glossary:: Glossary * Index:: The Index. @@ -5769,6 +5770,73 @@ for the definitions of rotation. In other words, when pin #1 is at the centroid of the part and pin #2 is in the upper left quadrant, the rotation is declared to be zero degrees. +@c --------------------------- Appendix -- Annotation File Format ---------------------- +@node Annotation File Format +@appendix Annotation File Format +@cindex annotation file format +@cindex backannotation file format + +@section Overview + +@section File Format +The annotation output file an ASCII file that can be used to communicate +layout changes that affect the netlist back to a schematic tool. Currently +the only place this file is used is if when the Renumber() action is called +within Pcb. Renumber() will renumber all the reference designators (instance +names) in the layout. The result of the renumbering will be written out to +an annotation file which can be used to propagate the changes to the schematic +sources. See @ref{Renumber Action} for details on the Renumber() action. If you +are using gschem (part of gEDA/gaf) as your schematic entry tool then refer +to pcb_backannotate(1) for details on how to use the annotation file to make +the changes to the schematics. + +The annotation file format is fairly simple. Each line consists of a command followed +by arguments. Blank lines and lines consisting of only whitespace are ignored. +There are no line continuations. + +An example annotation file is shown below. +@example + +*COMMENT* PCB Annotation File +*FILEVERSION* 20061031 +*RENAME* "C17" "C1" +*RENAME* "U5" "U1" +*RENAME* "U6" "U2" +*RENAME* "C21" "C2" +*RENAME* "R14" "R1" +*RENAME* "C7" "C3" +*RENAME* "C8" "C4" +*RENAME* "C6" "C5" + +@end example + +@subsection *COMMENT* +Command for a comment. The text of a comment is ignored by tools which process +the annotation file. +@cartouche +@format +*COMMENT* text +@end format +@end cartouche + +@subsection *FILEVERSION* +Indicates what version of the annotation file is in use. The date code corresponds to the +date when the current version was added to the Pcb sources. +@cartouche +@format +*FILEVERSION* datecode +@end format +@end cartouche + +@subsection *RENAME* +Renames an element. The arguments are enclosed in double quotes and are the original name +and the new name. +@cartouche +@format +*RENAME* ``old'' ``new'' +@end format +@end cartouche + @c --------------------------- Appendix -- Actions ---------------------- @node Action Reference @appendix Action Reference |
From: <gi...@gp...> - 2011-12-19 13:53:15
|
The branch, master has been updated via a43267f2c2519f3aef2768d1e0be7125ee59095d (commit) from 9162345a625160c2f1f9b088e612129776ea25af (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 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit a43267f2c2519f3aef2768d1e0be7125ee59095d Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gerber: Fixup trailing zeros from commit b90fb6ae22ae83fdc0c802268dcbe74005bc705e (The trailing zero needs to be outside the format specifier) :100644 100644 97a7c29... 3973814... M src/hid/gerber/gerber.c ========= Changes ========= commit a43267f2c2519f3aef2768d1e0be7125ee59095d Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gerber: Fixup trailing zeros from commit b90fb6ae22ae83fdc0c802268dcbe74005bc705e (The trailing zero needs to be outside the format specifier) diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c index 97a7c29..3973814 100644 --- a/src/hid/gerber/gerber.c +++ b/src/hid/gerber/gerber.c @@ -672,7 +672,7 @@ gerber_set_layer (const char *name, int group, int empty) } /* Notice the last zeroes are literal zeroes here, a * * x10 scale factor. v v */ - pcb_fprintf (f, "X%06.00mlY%06.00ml\r\n", + pcb_fprintf (f, "X%06.0ml0Y%06.0ml0\r\n", gerberDrX (PCB, pending_drills[i].x), gerberDrY (PCB, pending_drills[i].y)); } |
From: <gi...@gp...> - 2011-12-19 01:25:58
|
The branch, master has been updated via 9162345a625160c2f1f9b088e612129776ea25af (commit) via c94531c2239d03e6312e5ec9bfb9193a47b8a188 (commit) via 65e19713f44b702f4a4a3d94898955c4a4351cb9 (commit) via 5a15cd1bf30c9b985971e6f7c670a625925bd113 (commit) via 0a29589df9e28a33e6594d6f1ade84a94e5fb93a (commit) via 24afcc1d0ca0a441d76e9fbe5f811c2a6414f156 (commit) via ecfc7cf8fa31f4384dbe6d8117a0d7b3bf678f32 (commit) via 2e56554091204c2f902ce8dc90525fee4635ce39 (commit) via b283c195c46d273ef0cebd1f614ef35378604d98 (commit) via 5b2e2886b4802d5ee964ca0fbf7efec67562c919 (commit) via 75c28777f1063e25419215138baab4e0e60f73d6 (commit) via 4953e452ed735868d4d47194fc2c2c2eec9b944a (commit) from af27c2d529a00eb26ec9dcd1e102d7f6c91d7683 (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/action.c | 18 ++++++++++-------- src/find.c | 21 ++++++++------------- src/heap.c | 1 - src/hid/gcode/gcode.c | 35 ----------------------------------- src/hid/gerber/gerber.c | 33 +++------------------------------ src/hid/gtk/gui-netlist-window.c | 21 +++++++++------------ src/hid/nelma/nelma.c | 30 ------------------------------ src/hid/png/png.c | 12 ------------ 8 files changed, 30 insertions(+), 141 deletions(-) ================= Commit Messages ================= commit 9162345a625160c2f1f9b088e612129776ea25af Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> action.c: Fix leak of schname in ActionImport() :100644 100644 1005b17... 69bf89d... M src/action.c commit c94531c2239d03e6312e5ec9bfb9193a47b8a188 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> heap.c: Don't set the v variable twice to the same value in __upheap. (Caught with clang) :100644 100644 9e0f35e... 57a8208... M src/heap.c commit 65e19713f44b702f4a4a3d94898955c4a4351cb9 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> find.c: Tidy up some ugly code in LookupLOConnectionsToLOList() Cleaned up whilst chasing some clang warnings. It appears there is no real problem here, as max_copper_layers is going to be >0 for any PCB. If not, there are potential uses of uninitialised data. :100644 100644 877deb4... cd2aff5... M src/find.c commit 5a15cd1bf30c9b985971e6f7c670a625925bd113 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> src/action.c: Abort the Import(setnewport,mask) action if the mask isn't set This avoids using an uninitialised variable. (Caught by clang) :100644 100644 c1325ba... 1005b17... M src/action.c commit 0a29589df9e28a33e6594d6f1ade84a94e5fb93a Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/png/png.c: Remove buggy code for swapping x1/x2 and y1/y2 Since the png hid works, and this code is ineffective due to a typo, we probably ought to remove it. (Caught by clang) :100644 100644 ff8931a... 892696b... M src/hid/png/png.c commit 24afcc1d0ca0a441d76e9fbe5f811c2a6414f156 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> gerber.c: Tidy up use_gc() routine to avoid a static anlysis warning Don't unconditionally access the aptr variable right after we just NULL tested it. (Caught by clang) :100644 100644 3930941... 97a7c29... M src/hid/gerber/gerber.c commit ecfc7cf8fa31f4384dbe6d8117a0d7b3bf678f32 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gerber: Fix a couple of typos in drill_sort routine Should fix sorting of drill holes by coordinate. (Caught by clang) :100644 100644 ce20e3b... 3930941... M src/hid/gerber/gerber.c commit 2e56554091204c2f902ce8dc90525fee4635ce39 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gerber: Remove dead colour selection code :100644 100644 be6a7c4... ce20e3b... M src/hid/gerber/gerber.c commit b283c195c46d273ef0cebd1f614ef35378604d98 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove dead colour selection code from nelma and gcode hids (Silences some unused code warnings from clang) :100644 100644 17bbae1... a3e1bfd... M src/hid/gcode/gcode.c :100644 100644 9659b66... 9e75927... M src/hid/nelma/nelma.c commit 5b2e2886b4802d5ee964ca0fbf7efec67562c919 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> action.c: Fixup some syntax so it appears as legal C before macro expansion "if TEST_FLAG (...) {" does not look like legal C until the TEST_FLAG macro is expanded. This works because the macro is wrapped with a () like all good function-like pre-processor macros. This bad style was upsetting cppcheck, which flagged up a syntax error for this line. (Obviously it was not expanding macros before checking). :100644 100644 2a0be9e... c1325ba... M src/action.c commit 75c28777f1063e25419215138baab4e0e60f73d6 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Remove some assigned, but unused variables in the netlist window (Caught with clang) :100644 100644 f87491d... a847e6d... M src/hid/gtk/gui-netlist-window.c commit 4953e452ed735868d4d47194fc2c2c2eec9b944a Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Fix broken pad-center finding code in the netlist window Looks like I made a copy+paste error in the code which shows the user the location of a particular netlist connection. (Caught with clang) :100644 100644 35b5427... f87491d... M src/hid/gtk/gui-netlist-window.c ========= Changes ========= commit 9162345a625160c2f1f9b088e612129776ea25af Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> action.c: Fix leak of schname in ActionImport() diff --git a/src/action.c b/src/action.c index 1005b17..69bf89d 100644 --- a/src/action.c +++ b/src/action.c @@ -7706,7 +7706,10 @@ ActionImport (int argc, char **argv, Coord x, Coord y) strcat (schname, ".sch"); if (access (schname, F_OK)) - return hid_action("ImportGUI"); + { + free (schname); + return hid_action("ImportGUI"); + } sources = (char **) malloc (2 * sizeof (char *)); sources[0] = schname; commit c94531c2239d03e6312e5ec9bfb9193a47b8a188 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> heap.c: Don't set the v variable twice to the same value in __upheap. (Caught with clang) diff --git a/src/heap.c b/src/heap.c index 9e0f35e..57a8208 100644 --- a/src/heap.c +++ b/src/heap.c @@ -159,7 +159,6 @@ __upheap (heap_t * heap, int k) assert (heap && heap->size < heap->max); assert (k <= heap->size); - v = heap->element[k]; heap->element[0].cost = MIN_COST; for (v = heap->element[k]; heap->element[k / 2].cost > v.cost; k = k / 2) heap->element[k] = heap->element[k / 2]; commit 65e19713f44b702f4a4a3d94898955c4a4351cb9 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> find.c: Tidy up some ugly code in LookupLOConnectionsToLOList() Cleaned up whilst chasing some clang warnings. It appears there is no real problem here, as max_copper_layers is going to be >0 for any PCB. If not, there are potential uses of uninitialised data. diff --git a/src/find.c b/src/find.c index 877deb4..cd2aff5 100644 --- a/src/find.c +++ b/src/find.c @@ -865,7 +865,7 @@ LookupLOConnectionsToLOList (bool AndRats) { lineposition[i] = LineList[i].Location; polyposition[i] = PolygonList[i].Location; - arcposition[i] = ArcList[i].Location; + arcposition[i] = ArcList[i].Location; } for (i = 0; i < 2; i++) padposition[i] = PadList[i].Location; @@ -951,18 +951,13 @@ LookupLOConnectionsToLOList (bool AndRats) * may have changed the prior lists */ done = !AndRats || ratposition >= RatList.Number; - for (layer = 0; layer < max_copper_layer + 2; layer++) - { - if (layer < max_copper_layer) - done = done && - lineposition[layer] >= LineList[layer].Number - && arcposition[layer] >= ArcList[layer].Number - && polyposition[layer] >= PolygonList[layer].Number; - else - done = done - && padposition[layer - max_copper_layer] >= - PadList[layer - max_copper_layer].Number; - } + done = done && padposition[0] >= PadList[0].Number && + padposition[1] >= PadList[1].Number; + for (layer = 0; layer < max_copper_layer; layer++) + done = done && + lineposition[layer] >= LineList[layer].Number && + arcposition[layer] >= ArcList[layer].Number && + polyposition[layer] >= PolygonList[layer].Number; } while (!done); return (false); commit 5a15cd1bf30c9b985971e6f7c670a625925bd113 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> src/action.c: Abort the Import(setnewport,mask) action if the mask isn't set This avoids using an uninitialised variable. (Caught by clang) diff --git a/src/action.c b/src/action.c index c1325ba..1005b17 100644 --- a/src/action.c +++ b/src/action.c @@ -7622,11 +7622,11 @@ ActionImport (int argc, char **argv, Coord x, Coord y) } else if (strcasecmp (xs, "mark") == 0) { - if (Marked.status) - { - x = Marked.X; - y = Marked.Y; - } + if (!Marked.status) + return 0; + + x = Marked.X; + y = Marked.Y; } else if (ys) { commit 0a29589df9e28a33e6594d6f1ade84a94e5fb93a Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/png/png.c: Remove buggy code for swapping x1/x2 and y1/y2 Since the png hid works, and this code is ineffective due to a typo, we probably ought to remove it. (Caught by clang) diff --git a/src/hid/png/png.c b/src/hid/png/png.c index ff8931a..892696b 100644 --- a/src/hid/png/png.c +++ b/src/hid/png/png.c @@ -1425,18 +1425,6 @@ png_fill_rect (hidGC gc, Coord x1, Coord y1, Coord x2, Coord y2) gdImageSetThickness (im, 0); linewidth = 0; - if (x1 > x2) - { - Coord t = x1; - x2 = x2; - x2 = t; - } - if (y1 > y2) - { - Coord t = y1; - y2 = y2; - y2 = t; - } y1 -= bloat; y2 += bloat; SWAP_IF_SOLDER (y1, y2); commit 24afcc1d0ca0a441d76e9fbe5f811c2a6414f156 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> gerber.c: Tidy up use_gc() routine to avoid a static anlysis warning Don't unconditionally access the aptr variable right after we just NULL tested it. (Caught by clang) diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c index 3930941..97a7c29 100644 --- a/src/hid/gerber/gerber.c +++ b/src/hid/gerber/gerber.c @@ -951,7 +951,7 @@ use_gc (hidGC gc, int radius) if (aptr == NULL) pcb_fprintf (stderr, "error: aperture for width %$mS type %s is null\n", linewidth, shape == ROUND ? "ROUND" : "SQUARE"); - if (f) + else if (f) fprintf (f, "G54D%d*", aptr->dCode); } } commit ecfc7cf8fa31f4384dbe6d8117a0d7b3bf678f32 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gerber: Fix a couple of typos in drill_sort routine Should fix sorting of drill holes by coordinate. (Caught by clang) diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c index ce20e3b..3930941 100644 --- a/src/hid/gerber/gerber.c +++ b/src/hid/gerber/gerber.c @@ -628,8 +628,8 @@ drill_sort (const void *va, const void *vb) if (a->diam != b->diam) return a->diam - b->diam; if (a->x != b->x) - return a->x - a->x; - return b->y - b->y; + return a->x - b->x; + return a->y - b->y; } static int commit 2e56554091204c2f902ce8dc90525fee4635ce39 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gerber: Remove dead colour selection code diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c index be6a7c4..ce20e3b 100644 --- a/src/hid/gerber/gerber.c +++ b/src/hid/gerber/gerber.c @@ -304,7 +304,6 @@ static int pagecount = 0; static int linewidth = -1; static int lastgroup = -1; static int lastcap = -1; -static int lastcolor = -1; static int print_group[MAX_LAYER]; static int print_layer[MAX_LAYER]; static int lastX, lastY; /* the last X and Y coordinate */ @@ -588,7 +587,6 @@ gerber_do_export (HID_Attr_Val * options) linewidth = -1; lastcap = -1; lastgroup = -1; - lastcolor = -1; region.X1 = 0; region.Y1 = 0; @@ -704,7 +702,6 @@ gerber_set_layer (const char *name, int group, int empty) lastgroup = group; lastX = -1; lastY = -1; - lastcolor = 0; linewidth = -1; lastcap = -1; @@ -957,30 +954,6 @@ use_gc (hidGC gc, int radius) if (f) fprintf (f, "G54D%d*", aptr->dCode); } -#if 0 - if (lastcolor != gc->color) - { - c = gc->color; - if (is_drill) - return; - if (is_mask) - c = (gc->erase ? 0 : 1); - lastcolor = gc->color; - if (f) - { - if (c) - { - fprintf (f, "%%LN%s_C%d*%%\r\n", layername, lncount++); - fprintf (f, "%%LPC*%%\r\n"); - } - else - { - fprintf (f, "%%LN%s_D%d*%%\r\n", layername, lncount++); - fprintf (f, "%%LPD*%%\r\n"); - } - } - } -#endif } static void commit b283c195c46d273ef0cebd1f614ef35378604d98 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Remove dead colour selection code from nelma and gcode hids (Silences some unused code warnings from clang) diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index 17bbae1..a3e1bfd 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -86,7 +86,6 @@ struct hid_gc_struct int width; unsigned char r, g, b; int erase; - int faded; struct color_struct *color; gdImagePtr brush; }; @@ -94,7 +93,6 @@ struct hid_gc_struct static struct color_struct *black = NULL, *white = NULL; static int linewidth = -1; static gdImagePtr lastbrush = (gdImagePtr)((void *) -1); -static int lastcolor = -1; /* gd image and file for PNG export */ static gdImagePtr gcode_im = NULL; @@ -421,7 +419,6 @@ gcode_start_png_export () linewidth = -1; lastbrush = (gdImagePtr)((void *) -1); - lastcolor = -1; hid_expose_callback (&gcode_hid, ®ion, 0); } @@ -839,7 +836,6 @@ gcode_set_draw_xor (hidGC gc, int xor_) static void gcode_set_draw_faded (hidGC gc, int faded) { - gc->faded = faded; } static void @@ -927,37 +923,6 @@ use_gc (hidGC gc) lastbrush = gc->brush; } -#define CBLEND(gc) (((gc->r)<<24)|((gc->g)<<16)|((gc->b)<<8)|(gc->faded)) - if (lastcolor != CBLEND (gc)) - { - if (is_drill || is_mask) - { -#ifdef FIXME - fprintf (f, "%d gray\n", gc->erase ? 0 : 1); -#endif - lastcolor = 0; - } - else - { - double r, g, b; - r = gc->r; - g = gc->g; - b = gc->b; - if (gc->faded) - { - r = 0.8 * 255 + 0.2 * r; - g = 0.8 * 255 + 0.2 * g; - b = 0.8 * 255 + 0.2 * b; - } -#ifdef FIXME - if (gc->r == gc->g && gc->g == gc->b) - fprintf (f, "%g gray\n", r / 255.0); - else - fprintf (f, "%g %g %g rgb\n", r / 255.0, g / 255.0, b / 255.0); -#endif - lastcolor = CBLEND (gc); - } - } } static void diff --git a/src/hid/nelma/nelma.c b/src/hid/nelma/nelma.c index 9659b66..9e75927 100644 --- a/src/hid/nelma/nelma.c +++ b/src/hid/nelma/nelma.c @@ -102,7 +102,6 @@ struct hid_gc_struct { Coord width; unsigned char r, g, b; int erase; - int faded; struct color_struct *color; gdImagePtr brush; }; @@ -112,7 +111,6 @@ static HID nelma_hid; static struct color_struct *black = NULL, *white = NULL; static Coord linewidth = -1; static gdImagePtr lastbrush = (gdImagePtr)((void *) -1); -static int lastcolor = -1; /* gd image and file for PNG export */ static gdImagePtr nelma_im = NULL; @@ -648,7 +646,6 @@ nelma_start_png_export() linewidth = -1; lastbrush = (gdImagePtr)((void *) -1); - lastcolor = -1; hid_expose_callback(&nelma_hid, ®ion, 0); } @@ -832,7 +829,6 @@ nelma_set_draw_xor(hidGC gc, int xor_) static void nelma_set_draw_faded(hidGC gc, int faded) { - gc->faded = faded; } static void @@ -911,32 +907,6 @@ use_gc(hidGC gc) lastbrush = gc->brush; } -#define CBLEND(gc) (((gc->r)<<24)|((gc->g)<<16)|((gc->b)<<8)|(gc->faded)) - if (lastcolor != CBLEND(gc)) { - if (is_drill || is_mask) { -#ifdef FIXME - fprintf(f, "%d gray\n", gc->erase ? 0 : 1); -#endif - lastcolor = 0; - } else { - double r, g, b; - r = gc->r; - g = gc->g; - b = gc->b; - if (gc->faded) { - r = 0.8 * 255 + 0.2 * r; - g = 0.8 * 255 + 0.2 * g; - b = 0.8 * 255 + 0.2 * b; - } -#ifdef FIXME - if (gc->r == gc->g && gc->g == gc->b) - fprintf(f, "%g gray\n", r / 255.0); - else - fprintf(f, "%g %g %g rgb\n", r / 255.0, g / 255.0, b / 255.0); -#endif - lastcolor = CBLEND(gc); - } - } } static void commit 5b2e2886b4802d5ee964ca0fbf7efec67562c919 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> action.c: Fixup some syntax so it appears as legal C before macro expansion "if TEST_FLAG (...) {" does not look like legal C until the TEST_FLAG macro is expanded. This works because the macro is wrapped with a () like all good function-like pre-processor macros. This bad style was upsetting cppcheck, which flagged up a syntax error for this line. (Obviously it was not expanding macros before checking). diff --git a/src/action.c b/src/action.c index 2a0be9e..c1325ba 100644 --- a/src/action.c +++ b/src/action.c @@ -2679,8 +2679,7 @@ ActionDisplay (int argc, char **argv, Coord childX, Coord childY) case F_CycleClip: notify_crosshair_change (false); - if TEST_FLAG - (ALLDIRECTIONFLAG, PCB) + if (TEST_FLAG (ALLDIRECTIONFLAG, PCB)) { TOGGLE_FLAG (ALLDIRECTIONFLAG, PCB); PCB->Clipping = 0; commit 75c28777f1063e25419215138baab4e0e60f73d6 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Remove some assigned, but unused variables in the netlist window (Caught with clang) diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c index f87491d..a847e6d 100644 --- a/src/hid/gtk/gui-netlist-window.c +++ b/src/hid/gtk/gui-netlist-window.c @@ -71,7 +71,6 @@ static GtkWidget *disable_all_button; static GtkTreeModel *node_model; static GtkTreeView *node_treeview; -static GtkTreeSelection *node_selection; static gboolean selection_holdoff; @@ -701,7 +700,6 @@ ghid_netlist_window_create (GHidPort * out) GtkWidget *vbox, *hbox, *button, *label, *sep; GtkTreeView *treeview; GtkTreeModel *model; - GtkTreeSelection *selection; GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -760,10 +758,10 @@ ghid_netlist_window_create (GHidPort * out) */ gtk_tree_view_expand_all (treeview); - selection = ghid_scrolled_selection (treeview, hbox, - GTK_SELECTION_SINGLE, - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, - net_selection_changed_cb, NULL); + ghid_scrolled_selection (treeview, hbox, + GTK_SELECTION_SINGLE, + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, + net_selection_changed_cb, NULL); /* Connect to the double click event. */ @@ -785,11 +783,10 @@ ghid_netlist_window_create (GHidPort * out) "text", NODE_NAME_COLUMN, NULL); - selection = ghid_scrolled_selection (treeview, hbox, - GTK_SELECTION_SINGLE, - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, - node_selection_changed_cb, NULL); - node_selection = selection; + ghid_scrolled_selection (treeview, hbox, + GTK_SELECTION_SINGLE, + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, + node_selection_changed_cb, NULL); hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); commit 4953e452ed735868d4d47194fc2c2c2eec9b944a Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Fix broken pad-center finding code in the netlist window Looks like I made a copy+paste error in the code which shows the user the location of a particular netlist connection. (Caught with clang) diff --git a/src/hid/gtk/gui-netlist-window.c b/src/hid/gtk/gui-netlist-window.c index 35b5427..f87491d 100644 --- a/src/hid/gtk/gui-netlist-window.c +++ b/src/hid/gtk/gui-netlist-window.c @@ -295,7 +295,7 @@ node_selection_changed_cb (GtkTreeSelection * selection, gpointer data) { PadTypePtr pad = (PadTypePtr) conn.ptr2; x = pad->Point1.X + (pad->Point2.X - pad->Point1.X) / 2; - y = pad->Point1.Y + (pad->Point2.Y - pad->Point2.Y) / 2; + y = pad->Point1.Y + (pad->Point2.Y - pad->Point1.Y) / 2; gui->set_crosshair (x, y, 0); ghid_lead_user_to_location (x, y); break; |
From: <gi...@gp...> - 2011-12-18 20:39:06
|
The branch, master has been updated via af27c2d529a00eb26ec9dcd1e102d7f6c91d7683 (commit) from 38ac0fe9b2b4f758cbc2e67488c041706a034559 (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 ========= tests/golden/hid_png3/gerber_oneline.png | Bin 845 -> 1881 bytes tests/tests.list | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit af27c2d529a00eb26ec9dcd1e102d7f6c91d7683 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Increase DPI of test hid_png3 Since the nanometers conversion, hid_png3 has failed due to rounding changes. I have changed the test's output DPI from 300 to 600, to decrease the chances of this happening in the future. Fixes-bug: lp-860037 :100644 100644 9c5e865... a0bf3ee... M tests/golden/hid_png3/gerber_oneline.png :100644 100644 e9812bf... 05fb841... M tests/tests.list ========= Changes ========= commit af27c2d529a00eb26ec9dcd1e102d7f6c91d7683 Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Increase DPI of test hid_png3 Since the nanometers conversion, hid_png3 has failed due to rounding changes. I have changed the test's output DPI from 300 to 600, to decrease the chances of this happening in the future. Fixes-bug: lp-860037 diff --git a/tests/golden/hid_png3/gerber_oneline.png b/tests/golden/hid_png3/gerber_oneline.png index 9c5e865..a0bf3ee 100644 Binary files a/tests/golden/hid_png3/gerber_oneline.png and b/tests/golden/hid_png3/gerber_oneline.png differ diff --git a/tests/tests.list b/tests/tests.list index e9812bf..05fb841 100644 --- a/tests/tests.list +++ b/tests/tests.list @@ -161,6 +161,6 @@ hid_gerber3 | gerber_arcs.pcb | gerber | --gerberfile arcs | | gbx:arcs.bottom.g # hid_png1 | gerber_oneline.pcb | png | | | png:gerber_oneline.png hid_png2 | gerber_oneline.pcb | png | --outfile myfile.png | | png:myfile.png -hid_png3 | gerber_oneline.pcb | png | --dpi 300 | | png:gerber_oneline.png +hid_png3 | gerber_oneline.pcb | png | --dpi 600 | | png:gerber_oneline.png # |
From: <gi...@gp...> - 2011-12-18 18:00:45
|
The branch, master has been updated via 38ac0fe9b2b4f758cbc2e67488c041706a034559 (commit) via afb76d4c4a55fa83f5661c8397470e58a35c6b33 (commit) via ad2c809a6476d1a9eda5e510be7930bcc310fbdc (commit) via 792f285d070e235489623c84727bb39eb1dd0c9b (commit) via ae80bb7bce8bb8368fac64c19dc971830624fb85 (commit) via 31c4de6fa2eec47d99ceb6d58381c98a837379d2 (commit) via 2550c8f20fc8f8e8652a793df2e4925989485f65 (commit) via a209f78ca5df0fe107e774537025a77ceb0c1701 (commit) via 7303e24d34417c9502d6c1730e59f25cd6a12c78 (commit) from 8d112eee91986eecffc882ff2116dd281e476e68 (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/file.c | 15 ++++++++------- src/hid/common/hidinit.c | 1 + src/hid/common/hidnogui.c | 4 ++-- src/hid/gcode/gcode.c | 4 +++- src/hid/gtk/ghid-layer-selector.c | 2 +- src/hid/gtk/gtkhid-main.c | 1 + src/hid/lpr/lpr.c | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) ================= Commit Messages ================= commit 38ac0fe9b2b4f758cbc2e67488c041706a034559 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk/ghid_layer_selector.c: Use g_malloc for the new_layer structure This eventually gets free'd with g_free(). We need match these allocations and de-allocations carefully, otherwise various corruption and crashes could occur. (Caught with cppcheck) :100644 100644 432e57e... 2b04063... M src/hid/gtk/ghid-layer-selector.c commit afb76d4c4a55fa83f5661c8397470e58a35c6b33 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/common/hidnogui.c: Plug leak in nogui_prompt_for and nogui_fileselect We forgot to free() the memory returned from read_stdin_line(). There is actually no need to strdup the answer anyway, so pass the returned value directly and let the caller free it. (Caught with cppcheck) :100644 100644 9d88086... b08d90d... M src/hid/common/hidnogui.c commit ad2c809a6476d1a9eda5e510be7930bcc310fbdc Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/common: Don't leak the dir resource in hid_load_dir() Add missing closedir() call. (Caught with cppcheck) :100644 100644 0bdd395... 3695f7d... M src/hid/common/hidinit.c commit 792f285d070e235489623c84727bb39eb1dd0c9b Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> file.c: Cleanup mixed pclose() / fclose() in ReadNetlist() In the "Empty netlist file!" error path, we called pclose() unconditionally where we should have tested "used_popen" first. (Caught with cppcheck) :100644 100644 29358d6... 92e719b... M src/file.c commit ae80bb7bce8bb8368fac64c19dc971830624fb85 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> file.c: Plug leak of libpaths variable in ParseLibraryTree() function (Caught with cppcheck) :100644 100644 501b735... 29358d6... M src/file.c commit 31c4de6fa2eec47d99ceb6d58381c98a837379d2 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Free share_dir variable after use (Caught with cppcheck) :100644 100644 544b6a2... cc474cd... M src/hid/gtk/gtkhid-main.c commit 2550c8f20fc8f8e8652a793df2e4925989485f65 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gcode: Fix memory leak in error path (Caught with cppcheck) :100644 100644 40a3b36... 17bbae1... M src/hid/gcode/gcode.c commit a209f78ca5df0fe107e774537025a77ceb0c1701 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gcode: Fix mismatched g_strdup_printf() and free() Allocations from the g_*() functions shuold be free'd with g_free(). (Caught with cppcheck) :100644 100644 f12f6b6... 40a3b36... M src/hid/gcode/gcode.c commit 7303e24d34417c9502d6c1730e59f25cd6a12c78 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/lpr: Don't mis-match popen and fclose (should be pclose) (Caught with cppcheck) :100644 100644 259812c... fc9403b... M src/hid/lpr/lpr.c ========= Changes ========= commit 38ac0fe9b2b4f758cbc2e67488c041706a034559 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk/ghid_layer_selector.c: Use g_malloc for the new_layer structure This eventually gets free'd with g_free(). We need match these allocations and de-allocations carefully, otherwise various corruption and crashes could occur. (Caught with cppcheck) diff --git a/src/hid/gtk/ghid-layer-selector.c b/src/hid/gtk/ghid-layer-selector.c index 432e57e..2b04063 100644 --- a/src/hid/gtk/ghid-layer-selector.c +++ b/src/hid/gtk/ghid-layer-selector.c @@ -643,7 +643,7 @@ ghid_layer_selector_add_layer (GHidLayerSelector *ls, free_ldata (ls, new_layer); } - new_layer = malloc (sizeof (*new_layer)); + new_layer = g_malloc (sizeof (*new_layer)); gtk_list_store_set (ls->list_store, &iter, commit afb76d4c4a55fa83f5661c8397470e58a35c6b33 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/common/hidnogui.c: Plug leak in nogui_prompt_for and nogui_fileselect We forgot to free() the memory returned from read_stdin_line(). There is actually no need to strdup the answer anyway, so pass the returned value directly and let the caller free it. (Caught with cppcheck) diff --git a/src/hid/common/hidnogui.c b/src/hid/common/hidnogui.c index 9d88086..b08d90d 100644 --- a/src/hid/common/hidnogui.c +++ b/src/hid/common/hidnogui.c @@ -381,7 +381,7 @@ nogui_prompt_for (const char *msg, const char *default_string) if (answer == NULL) return strdup ((default_string != NULL) ? default_string : ""); else - return strdup (answer); + return answer; } /* FIXME - this could use some enhancement to actually use the other @@ -402,7 +402,7 @@ nogui_fileselect (const char *title, const char *descr, if (answer == NULL) return (default_file != NULL) ? strdup (default_file) : NULL; else - return strdup (answer); + return answer; } static int commit ad2c809a6476d1a9eda5e510be7930bcc310fbdc Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/common: Don't leak the dir resource in hid_load_dir() Add missing closedir() call. (Caught with cppcheck) diff --git a/src/hid/common/hidinit.c b/src/hid/common/hidinit.c index 0bdd395..3695f7d 100644 --- a/src/hid/common/hidinit.c +++ b/src/hid/common/hidinit.c @@ -117,6 +117,7 @@ hid_load_dir (char *dirname) free (path); } free (dirname); + closedir (dir); } void commit 792f285d070e235489623c84727bb39eb1dd0c9b Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> file.c: Cleanup mixed pclose() / fclose() in ReadNetlist() In the "Empty netlist file!" error path, we called pclose() unconditionally where we should have tested "used_popen" first. (Caught with cppcheck) diff --git a/src/file.c b/src/file.c index 29358d6..92e719b 100644 --- a/src/file.c +++ b/src/file.c @@ -1536,10 +1536,11 @@ ReadNetlist (char *filename) LibraryEntryTypePtr entry; int i, j, lines, kind; bool continued; - int used_popen = 0; + bool used_popen = false; + int retval = 0; if (!filename) - return (1); /* nothing to do */ + return 1; /* nothing to do */ Message (_("Importing PCB netlist %s\n"), filename); @@ -1554,7 +1555,7 @@ ReadNetlist (char *filename) } else { - used_popen = 1; + used_popen = true; free (command); command = EvaluateFilename (Settings.RatCommand, Settings.RatPath, filename, NULL); @@ -1563,7 +1564,7 @@ ReadNetlist (char *filename) if (*command == '\0' || (fp = popen (command, "r")) == NULL) { PopenErrorMessage (command); - return (1); + return 1; } } lines = 0; @@ -1634,15 +1635,14 @@ ReadNetlist (char *filename) if (!lines) { Message (_("Empty netlist file!\n")); - pclose (fp); - return (1); + retval = 1; } if (used_popen) pclose (fp); else fclose (fp); sort_netlist (); - return (0); + return retval; } static int ReadEdifNetlist (char *filename); commit ae80bb7bce8bb8368fac64c19dc971830624fb85 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> file.c: Plug leak of libpaths variable in ParseLibraryTree() function (Caught with cppcheck) diff --git a/src/file.c b/src/file.c index 501b735..29358d6 100644 --- a/src/file.c +++ b/src/file.c @@ -1402,6 +1402,7 @@ ParseLibraryTree (void) printf("Leaving ParseLibraryTree, found %d footprints.\n", n_footprints); #endif + free (libpaths); return n_footprints; } commit 31c4de6fa2eec47d99ceb6d58381c98a837379d2 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gtk: Free share_dir variable after use (Caught with cppcheck) diff --git a/src/hid/gtk/gtkhid-main.c b/src/hid/gtk/gtkhid-main.c index 544b6a2..cc474cd 100644 --- a/src/hid/gtk/gtkhid-main.c +++ b/src/hid/gtk/gtkhid-main.c @@ -2117,6 +2117,7 @@ hid_gtk_init () free (tmps); #undef REST_OF_PATH printf ("\"Share\" installation path is \"%s\"\n", share_dir); + free (share_dir); #endif memset (&ghid_hid, 0, sizeof (HID)); commit 2550c8f20fc8f8e8652a793df2e4925989485f65 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gcode: Fix memory leak in error path (Caught with cppcheck) diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index 40a3b36..17bbae1 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -558,6 +558,8 @@ gcode_do_export (HID_Attr_Val * options) if (!gcode_f2) { perror (filename); + free (filename); + bm_free (bm); return; } fprintf (gcode_f2, "(Created by G-code exporter)\n"); commit a209f78ca5df0fe107e774537025a77ceb0c1701 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/gcode: Fix mismatched g_strdup_printf() and free() Allocations from the g_*() functions shuold be free'd with g_free(). (Caught with cppcheck) diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index f12f6b6..40a3b36 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -388,7 +388,7 @@ gcode_start_png (const char *layername) gcode_alloc_colors (); - free (buf); + g_free (buf); } static void commit 7303e24d34417c9502d6c1730e59f25cd6a12c78 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> hid/lpr: Don't mis-match popen and fclose (should be pclose) (Caught with cppcheck) diff --git a/src/hid/lpr/lpr.c b/src/hid/lpr/lpr.c index 259812c..fc9403b 100644 --- a/src/hid/lpr/lpr.c +++ b/src/hid/lpr/lpr.c @@ -106,7 +106,7 @@ lpr_do_export (HID_Attr_Val * options) ps_hid_export_to_file (f, options); - fclose (f); + pclose (f); } static void |
From: <gi...@gp...> - 2011-12-16 00:57:13
|
The branch, master has been updated via 8d112eee91986eecffc882ff2116dd281e476e68 (commit) via 0c849e2bdbbc592a3bf5c1d28571b82efec42a17 (commit) via d7dc68fddf0324f5601b2c54fa82df20ae4fa81a (commit) from b90fb6ae22ae83fdc0c802268dcbe74005bc705e (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/crosshair.c | 6 +++--- src/search.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 17 deletions(-) ================= Commit Messages ================= commit 8d112eee91986eecffc882ff2116dd281e476e68 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> search.c: Return the pad who's center is closest to the queried coordinate When snapping to pads we often find the case where the search radius is wider than the spacing between pads. SearchPadByLocation() previously returned the first pad it found whthin the search area, meaning you could have the crosshair right above a particular pad, yet snap to a different pad due to it being within the search radius of the crosshair, and happening to be tested first by the r-tree search code. This proof of concept change makes SearchPadByLocation() return the pad whos center coordinate is closest to the center of the search location. This fixes another annoying snapping behaviour for some parts such as "0805", when operating with a fairly course grid. (NB: Search radius for snapping is related to the size of the current grid). :100644 100644 5d02a53... 5417462... M src/search.c commit 0c849e2bdbbc592a3bf5c1d28571b82efec42a17 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> crosshair.c: Be paranoid about overflow when finding an pad-center coordinates Not aiming to fix any particular bug here, but I noticed the potential overflow here and thought I'd fix it. Longer term, we perhaps ought to write some convenience functions for performing operations like this correctly. :100644 100644 3c6c46e... a644cc7... M src/crosshair.c commit d7dc68fddf0324f5601b2c54fa82df20ae4fa81a Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> crosshair.c: Snap to later-tested objects equi-distant with the current snap. This inequality adjustment means that when an element mark is on-grid, and the first-snap is a grid location snap, the test against the element mark will now pass, and mark the snap as a non-grid snap. This fixes the rather irritating bug where certain footprints, such as SMT resistors became impossible to grab by their element mark when that mark landed exactly on a grid point. :100644 100644 b7bebec... 3c6c46e... M src/crosshair.c ========= Changes ========= commit 8d112eee91986eecffc882ff2116dd281e476e68 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> search.c: Return the pad who's center is closest to the queried coordinate When snapping to pads we often find the case where the search radius is wider than the spacing between pads. SearchPadByLocation() previously returned the first pad it found whthin the search area, meaning you could have the crosshair right above a particular pad, yet snap to a different pad due to it being within the search radius of the crosshair, and happening to be tested first by the r-tree search code. This proof of concept change makes SearchPadByLocation() return the pad whos center coordinate is closest to the center of the search location. This fixes another annoying snapping behaviour for some parts such as "0805", when operating with a fairly course grid. (NB: Search radius for snapping is related to the size of the current grid). diff --git a/src/search.c b/src/search.c index 5d02a53..5417462 100644 --- a/src/search.c +++ b/src/search.c @@ -106,6 +106,8 @@ struct ans_info double area; jmp_buf env; int locked; /* This will be zero or LOCKFLAG */ + bool found_anything; + double nearest_sq_dist; }; static int @@ -182,19 +184,28 @@ pad_callback (const BoxType * b, void *cl) PadTypePtr pad = (PadTypePtr) b; struct ans_info *i = (struct ans_info *) cl; AnyObjectType *ptr1 = pad->Element; + double sq_dist; - if (TEST_FLAG (i->locked, ptr1)) + /* Reject locked pads, backside pads (if !BackToo), and non-hit pads */ + if (TEST_FLAG (i->locked, ptr1) || + (!FRONT (pad) && !i->BackToo) || + !IsPointInPad (PosX, PosY, SearchRadius, pad)) return 0; - if (FRONT (pad) || i->BackToo) + /* Determine how close our test-position was to the center of the pad */ + sq_dist = (PosX - (pad->Point1.X + (pad->Point2.X - pad->Point1.X) / 2)) * + (PosX - (pad->Point1.X + (pad->Point2.X - pad->Point1.X) / 2)) + + (PosY - (pad->Point1.Y + (pad->Point2.Y - pad->Point1.Y) / 2)) * + (PosY - (pad->Point1.Y + (pad->Point2.Y - pad->Point1.Y) / 2)); + + /* If this was the closest hit so far, record it */ + if (!i->found_anything || sq_dist < i->nearest_sq_dist) { - if (IsPointInPad (PosX, PosY, SearchRadius, pad)) - { - *i->ptr1 = ptr1; - *i->ptr2 = *i->ptr3 = pad; - longjmp (i->env, 1); - } - } + *i->ptr1 = ptr1; + *i->ptr2 = *i->ptr3 = pad; + i->found_anything = true; + i->nearest_sq_dist = sq_dist; + } return 0; } @@ -216,11 +227,9 @@ SearchPadByLocation (int locked, ElementTypePtr * Element, PadTypePtr * Pad, info.ptr3 = (void **) Dummy; info.locked = (locked & LOCKED_TYPE) ? 0 : LOCKFLAG; info.BackToo = (BackToo && PCB->InvisibleObjectsOn); - if (setjmp (info.env) == 0) - r_search (PCB->Data->pad_tree, &SearchBox, NULL, pad_callback, &info); - else - return true; - return false; + info.found_anything = false; + r_search (PCB->Data->pad_tree, &SearchBox, NULL, pad_callback, &info); + return info.found_anything; } /* --------------------------------------------------------------------------- commit 0c849e2bdbbc592a3bf5c1d28571b82efec42a17 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> crosshair.c: Be paranoid about overflow when finding an pad-center coordinates Not aiming to fix any particular bug here, but I noticed the potential overflow here and thought I'd fix it. Longer term, we perhaps ought to write some convenience functions for performing operations like this correctly. diff --git a/src/crosshair.c b/src/crosshair.c index 3c6c46e..a644cc7 100644 --- a/src/crosshair.c +++ b/src/crosshair.c @@ -1026,8 +1026,8 @@ FitCrosshairIntoGrid (Coord X, Coord Y) if (ans != NO_TYPE) { PadType *pad = (PadType *)ptr2; - check_snap_object (&snap_data, (pad->Point1.X + pad->Point2.X) / 2, - (pad->Point1.Y + pad->Point2.Y) / 2, + check_snap_object (&snap_data, pad->Point1.X + (pad->Point2.X - pad->Point1.X) / 2, + pad->Point1.Y + (pad->Point2.Y - pad->Point1.Y) / 2, true); } commit d7dc68fddf0324f5601b2c54fa82df20ae4fa81a Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> crosshair.c: Snap to later-tested objects equi-distant with the current snap. This inequality adjustment means that when an element mark is on-grid, and the first-snap is a grid location snap, the test against the element mark will now pass, and mark the snap as a non-grid snap. This fixes the rather irritating bug where certain footprints, such as SMT resistors became impossible to grab by their element mark when that mark landed exactly on a grid point. diff --git a/src/crosshair.c b/src/crosshair.c index b7bebec..3c6c46e 100644 --- a/src/crosshair.c +++ b/src/crosshair.c @@ -819,7 +819,7 @@ check_snap_object (struct snap_data *snap_data, Coord x, Coord y, double sq_dist; sq_dist = crosshair_sq_dist (snap_data->crosshair, x, y); - if (sq_dist < snap_data->nearest_sq_dist || + if (sq_dist <= snap_data->nearest_sq_dist || (prefer_to_grid && snap_data->nearest_is_grid && !gui->shift_is_pressed())) { snap_data->x = x; |
From: <gi...@gp...> - 2011-12-15 19:52:40
|
The branch, master has been updated via b90fb6ae22ae83fdc0c802268dcbe74005bc705e (commit) from 8cbc19e5aa9572196f27d4e64db8337d80945803 (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 | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) ================= Commit Messages ================= commit b90fb6ae22ae83fdc0c802268dcbe74005bc705e Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Fix plated-drill overflow bug in gerber.c Plated drills are printed in 1/10 mils rather than mils (it's a funny format). This was previously achieved by multiplying coordinates by 10, then printing them as mils. However, this caused an overflow for medium-large boards on 32-bit systems. This fix just prints a trailing 0 onto the measures, rather than computing the value times ten. :100644 100644 9280af4... be6a7c4... M src/hid/gerber/gerber.c ========= Changes ========= commit b90fb6ae22ae83fdc0c802268dcbe74005bc705e Author: Andrew Poelstra <as...@sf...> Commit: Andrew Poelstra <as...@sf...> Fix plated-drill overflow bug in gerber.c Plated drills are printed in 1/10 mils rather than mils (it's a funny format). This was previously achieved by multiplying coordinates by 10, then printing them as mils. However, this caused an overflow for medium-large boards on 32-bit systems. This fix just prints a trailing 0 onto the measures, rather than computing the value times ten. diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c index 9280af4..be6a7c4 100644 --- a/src/hid/gerber/gerber.c +++ b/src/hid/gerber/gerber.c @@ -77,8 +77,8 @@ static void gerber_fill_polygon (hidGC gc, int n_coords, Coord *x, Coord *y); #define gerberYOffset(pcb, y) ((Coord) (-(y))) /* These are for drills (printed as mils but are really 1/10th mil) */ -#define gerberDrX(pcb, x) ((Coord) (x) * 10) -#define gerberDrY(pcb, y) ((Coord) ((pcb)->MaxHeight - (y)) * 10) +#define gerberDrX(pcb, x) ((Coord) (x)) +#define gerberDrY(pcb, y) ((Coord) ((pcb)->MaxHeight - (y))) /*----------------------------------------------------------------------------*/ /* Private data structures */ @@ -672,7 +672,9 @@ gerber_set_layer (const char *name, int group, int empty) Aperture *ap = findAperture (curr_aptr_list, pending_drills[i].diam, ROUND); fprintf (f, "T%02d\r\n", ap->dCode); } - pcb_fprintf (f, "X%06.0mlY%06.0ml\r\n", + /* Notice the last zeroes are literal zeroes here, a * + * x10 scale factor. v v */ + pcb_fprintf (f, "X%06.00mlY%06.00ml\r\n", gerberDrX (PCB, pending_drills[i].x), gerberDrY (PCB, pending_drills[i].y)); } |
From: <gi...@gp...> - 2011-12-09 04:41:09
|
The branch, master has been updated via 8cbc19e5aa9572196f27d4e64db8337d80945803 (commit) from 4101b611a84fbcd00cf984c8303502935cce38e9 (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/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ================= Commit Messages ================= commit 8cbc19e5aa9572196f27d4e64db8337d80945803 Author: Dan McMahill <da...@mc...> Commit: Dan McMahill <da...@mc...> Add (protected) include for locale.h. Needed for setlocale() prototype as well as LC_ALL on some systems. :100644 100644 d5a8487... 48e825c... M src/main.c ========= Changes ========= commit 8cbc19e5aa9572196f27d4e64db8337d80945803 Author: Dan McMahill <da...@mc...> Commit: Dan McMahill <da...@mc...> Add (protected) include for locale.h. Needed for setlocale() prototype as well as LC_ALL on some systems. diff --git a/src/main.c b/src/main.c index d5a8487..48e825c 100644 --- a/src/main.c +++ b/src/main.c @@ -33,6 +33,9 @@ #include "config.h" #endif +#ifdef HAVE_LOCALE_H +#include <locale.h> /* setlocale() and LC_ALL */ +#endif #include <stdlib.h> #ifdef HAVE_STRING_H #include <string.h> |
From: <gi...@gp...> - 2011-11-25 22:46:42
|
The branch, master has been updated via 4101b611a84fbcd00cf984c8303502935cce38e9 (commit) via b7434eec4dc642adcdd5fd468bad851cad6df4ee (commit) via 9cb66f740b56b3743dc0e582558b3861b24617a1 (commit) from d658a8846d0d4583b385549ccd604ac1a02a9bc8 (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 | 15 +++++---------- src/pcb-printf.c | 12 +++++++++--- src/pcb-printf.h | 9 ++++++++- 3 files changed, 22 insertions(+), 14 deletions(-) ================= Commit Messages ================= commit 4101b611a84fbcd00cf984c8303502935cce38e9 Author: Andrew Poelstra (local) <apo...@wp...> Commit: Andrew Poelstra (local) <apo...@wp...> gerber.c: Use ` modifier in pcb-printf to fix internationalization bug :100644 100644 1539f88... 9280af4... M src/hid/gerber/gerber.c commit b7434eec4dc642adcdd5fd468bad851cad6df4ee Author: Andrew Poelstra (local) <apo...@wp...> Commit: Andrew Poelstra (local) <apo...@wp...> Revert "Fix locale-dependent gerber output" This reverts commit 2473e26c7d9581753a28f1f55a4a4b7ff109a3f2. A better fix would be to use the new pcb-printf specifier, rather than manually using g_ascii_strtod with the COORD_TO_ macros. :100644 100644 4e0007b... 1539f88... M src/hid/gerber/gerber.c commit 9cb66f740b56b3743dc0e582558b3861b24617a1 Author: Andrew Poelstra (local) <apo...@wp...> Commit: Andrew Poelstra (local) <apo...@wp...> Add ` modifier to pcb-printf, which forces '.' as a decimal separator This should be used for the gerber exporter and other formats that need to use '.' regardless of locale in order to obey their standards. Note that the %mr specifier (which restricts suffixes to mm and mil so that old pcb versions can read them) uses this by default, so no changes need to be made to file.c. :100644 100644 f687e06... 183ea18... M src/pcb-printf.c :100644 100644 cbd9bbd... 4b37b38... M src/pcb-printf.h ========= Changes ========= commit 4101b611a84fbcd00cf984c8303502935cce38e9 Author: Andrew Poelstra (local) <apo...@wp...> Commit: Andrew Poelstra (local) <apo...@wp...> gerber.c: Use ` modifier in pcb-printf to fix internationalization bug diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c index 1539f88..9280af4 100644 --- a/src/hid/gerber/gerber.c +++ b/src/hid/gerber/gerber.c @@ -229,13 +229,13 @@ fprintAperture (FILE *f, Aperture *aptr) switch (aptr->shape) { case ROUND: - pcb_fprintf (f, "%%ADD%dC,%.4mi*%%\r\n", aptr->dCode, aptr->width); + pcb_fprintf (f, "%%ADD%dC,%.4`mi*%%\r\n", aptr->dCode, aptr->width); break; case SQUARE: - pcb_fprintf (f, "%%ADD%dR,%.4miX%.4mi*%%\r\n", aptr->dCode, aptr->width, aptr->width); + pcb_fprintf (f, "%%ADD%dR,%.4`miX%.4`mi*%%\r\n", aptr->dCode, aptr->width, aptr->width); break; case OCTAGON: - pcb_fprintf (f, "%%AMOCT%d*5,0,8,0,0,%.4mi,22.5*%%\r\n" + pcb_fprintf (f, "%%AMOCT%d*5,0,8,0,0,%.4`mi,22.5*%%\r\n" "%%ADD%dOCT%d*%%\r\n", aptr->dCode, (Coord) ((double) aptr->width / COS_22_5_DEGREE), aptr->dCode, aptr->dCode); @@ -741,7 +741,7 @@ gerber_set_layer (const char *name, int group, int empty) always six-digit 0.1 mil resolution (i.e. 001100 = 0.11")*/ fprintf (f, "M48\r\n" "INCH\r\n"); for (search = aptr_list->data; search; search = search->next) - pcb_fprintf (f, "T%02dC%.3mi\r\n", search->dCode, search->width); + pcb_fprintf (f, "T%02dC%.3`mi\r\n", search->dCode, search->width); fprintf (f, "%%\r\n"); /* FIXME */ return 1; commit b7434eec4dc642adcdd5fd468bad851cad6df4ee Author: Andrew Poelstra (local) <apo...@wp...> Commit: Andrew Poelstra (local) <apo...@wp...> Revert "Fix locale-dependent gerber output" This reverts commit 2473e26c7d9581753a28f1f55a4a4b7ff109a3f2. A better fix would be to use the new pcb-printf specifier, rather than manually using g_ascii_strtod with the COORD_TO_ macros. diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c index 4e0007b..1539f88 100644 --- a/src/hid/gerber/gerber.c +++ b/src/hid/gerber/gerber.c @@ -226,23 +226,18 @@ findAperture (ApertureList *list, Coord width, ApertureShape shape) static void fprintAperture (FILE *f, Aperture *aptr) { - char buf[50]; - switch (aptr->shape) { case ROUND: - g_ascii_formatd (buf, 50, "%.4f", COORD_TO_INCH (aptr->width)); - pcb_fprintf (f, "%%ADD%dC,%s*%%\r\n", aptr->dCode, buf); + pcb_fprintf (f, "%%ADD%dC,%.4mi*%%\r\n", aptr->dCode, aptr->width); break; case SQUARE: - g_ascii_formatd (buf, 50, "%.4f", COORD_TO_INCH (aptr->width)); - pcb_fprintf (f, "%%ADD%dR,%sX%s*%%\r\n", aptr->dCode, buf, buf); + pcb_fprintf (f, "%%ADD%dR,%.4miX%.4mi*%%\r\n", aptr->dCode, aptr->width, aptr->width); break; case OCTAGON: - g_ascii_formatd (buf, 50, "%.4f", COORD_TO_INCH (aptr->width / COS_22_5_DEGREE)); - pcb_fprintf (f, "%%AMOCT%d*5,0,8,0,0,%s,22.5*%%\r\n" + pcb_fprintf (f, "%%AMOCT%d*5,0,8,0,0,%.4mi,22.5*%%\r\n" "%%ADD%dOCT%d*%%\r\n", aptr->dCode, - buf, aptr->dCode, + (Coord) ((double) aptr->width / COS_22_5_DEGREE), aptr->dCode, aptr->dCode); break; #if 0 commit 9cb66f740b56b3743dc0e582558b3861b24617a1 Author: Andrew Poelstra (local) <apo...@wp...> Commit: Andrew Poelstra (local) <apo...@wp...> Add ` modifier to pcb-printf, which forces '.' as a decimal separator This should be used for the gerber exporter and other formats that need to use '.' regardless of locale in order to obey their standards. Note that the %mr specifier (which restricts suffixes to mm and mil so that old pcb versions can read them) uses this by default, so no changes need to be made to file.c. diff --git a/src/pcb-printf.c b/src/pcb-printf.c index f687e06..183ea18 100644 --- a/src/pcb-printf.c +++ b/src/pcb-printf.c @@ -382,7 +382,7 @@ static gchar *CoordsToString(Coord coord[], int n_coords, const char *printf_spe * (+ 2 skips the ", " for first value) */ if (n_coords > 1) g_string_append_c (buff, '('); - if (suffix_type == FILE_MODE) + if (suffix_type == FILE_MODE || suffix_type == FILE_MODE_NO_SUFFIX) { g_ascii_formatd (filemode_buff, sizeof filemode_buff, printf_buff + 2, value[0]); g_string_append_printf (buff, "%s", filemode_buff); @@ -391,7 +391,7 @@ static gchar *CoordsToString(Coord coord[], int n_coords, const char *printf_spe g_string_append_printf (buff, printf_buff + 2, value[0]); for (i = 1; i < n_coords; ++i) { - if (suffix_type == FILE_MODE) + if (suffix_type == FILE_MODE || suffix_type == FILE_MODE_NO_SUFFIX) { g_ascii_formatd (filemode_buff, sizeof filemode_buff, printf_buff, value[i]); g_string_append_printf (buff, "%s", filemode_buff); @@ -407,6 +407,7 @@ static gchar *CoordsToString(Coord coord[], int n_coords, const char *printf_spe switch (suffix_type) { case NO_SUFFIX: + case FILE_MODE_NO_SUFFIX: break; case SUFFIX: g_string_append_printf (buff, " %s", suffix); @@ -479,7 +480,12 @@ gchar *pcb_vprintf(const char *fmt, va_list args) } if(*fmt == '$') { - suffix = SUFFIX; + suffix = (suffix == NO_SUFFIX) ? SUFFIX : FILE_MODE; + fmt++; + } + if(*fmt == '`') + { + suffix = (suffix == SUFFIX) ? FILE_MODE : FILE_MODE_NO_SUFFIX; fmt++; } /* Tack full specifier onto specifier */ diff --git a/src/pcb-printf.h b/src/pcb-printf.h index cbd9bbd..4b37b38 100644 --- a/src/pcb-printf.h +++ b/src/pcb-printf.h @@ -59,6 +59,8 @@ * # prevents all scaling for %mS/D/1/.../9 (this should * ONLY be used for debug code since its output exposes * pcb's base units). + * ` always use '.' as decimal separator (note that %mr uses + * this by default). * * KNOWN ISSUES: * No support for %zu size_t printf spec @@ -96,7 +98,12 @@ enum e_allow { }; enum e_family { METRIC, IMPERIAL }; -enum e_suffix { NO_SUFFIX, SUFFIX, FILE_MODE }; +enum e_suffix { + NO_SUFFIX, /* no suffix */ + SUFFIX, /* suffix, prefixed with ' ' */ + FILE_MODE_NO_SUFFIX, /* no suffix, force '.' as decimal */ + FILE_MODE /* suffix, force '.' as decimal */ +}; struct unit { int index; /* Index into Unit[] list */ |
From: <gi...@gp...> - 2011-11-20 17:36:23
|
The branch, master has been updated via d658a8846d0d4583b385549ccd604ac1a02a9bc8 (commit) via 4a90dbb5552e967eecbe12048daa204cebdfc9a8 (commit) from 9c591b7f752d6c149aafd97d364f82b08f74eee5 (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 ========= tests/golden/hid_gcode1/Makefile.am | 6 +++--- tests/golden/hid_gcode10/Makefile.am | 6 +++--- tests/golden/hid_gcode11/Makefile.am | 6 +++--- tests/golden/hid_gcode2/Makefile.am | 6 +++--- tests/golden/hid_gcode3/Makefile.am | 6 +++--- tests/golden/hid_gcode4/Makefile.am | 6 +++--- tests/golden/hid_gcode5/Makefile.am | 6 +++--- tests/golden/hid_gcode6/Makefile.am | 6 +++--- tests/golden/hid_gcode7/Makefile.am | 6 +++--- tests/golden/hid_gcode8/Makefile.am | 6 +++--- tests/golden/hid_gcode9/Makefile.am | 6 +++--- tests/run_tests.sh | 2 +- 12 files changed, 34 insertions(+), 34 deletions(-) ================= Commit Messages ================= commit d658a8846d0d4583b385549ccd604ac1a02a9bc8 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode test Makefiles now dist the golden results with the new filenames :100644 100644 b07c896... e0523e7... M tests/golden/hid_gcode1/Makefile.am :100644 100644 b07c896... cb93bf5... M tests/golden/hid_gcode10/Makefile.am :100644 100644 b07c896... e0523e7... M tests/golden/hid_gcode11/Makefile.am :100644 100644 a771564... fa76ed3... M tests/golden/hid_gcode2/Makefile.am :100644 100644 b07c896... e0523e7... M tests/golden/hid_gcode3/Makefile.am :100644 100644 b07c896... e0523e7... M tests/golden/hid_gcode4/Makefile.am :100644 100644 b07c896... e0523e7... M tests/golden/hid_gcode5/Makefile.am :100644 100644 b07c896... e0523e7... M tests/golden/hid_gcode6/Makefile.am :100644 100644 b07c896... e0523e7... M tests/golden/hid_gcode7/Makefile.am :100644 100644 b07c896... cb93bf5... M tests/golden/hid_gcode8/Makefile.am :100644 100644 b07c896... e0523e7... M tests/golden/hid_gcode9/Makefile.am commit 4a90dbb5552e967eecbe12048daa204cebdfc9a8 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode tests: date-stripping now supports all valid dates :100755 100755 4ceeeb0... 5bd4acb... M tests/run_tests.sh ========= Changes ========= commit d658a8846d0d4583b385549ccd604ac1a02a9bc8 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode test Makefiles now dist the golden results with the new filenames diff --git a/tests/golden/hid_gcode1/Makefile.am b/tests/golden/hid_gcode1/Makefile.am index b07c896..e0523e7 100644 --- a/tests/golden/hid_gcode1/Makefile.am +++ b/tests/golden/hid_gcode1/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.0350.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode10/Makefile.am b/tests/golden/hid_gcode10/Makefile.am index b07c896..cb93bf5 100644 --- a/tests/golden/hid_gcode10/Makefile.am +++ b/tests/golden/hid_gcode10/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.8890.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode11/Makefile.am b/tests/golden/hid_gcode11/Makefile.am index b07c896..e0523e7 100644 --- a/tests/golden/hid_gcode11/Makefile.am +++ b/tests/golden/hid_gcode11/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.0350.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode2/Makefile.am b/tests/golden/hid_gcode2/Makefile.am index a771564..fa76ed3 100644 --- a/tests/golden/hid_gcode2/Makefile.am +++ b/tests/golden/hid_gcode2/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - out.bottom.cnc \ - out.drill.cnc \ - out.top.cnc + out-0.0350.drill.gcode \ + out-bottom.gcode \ + out-top.gcode diff --git a/tests/golden/hid_gcode3/Makefile.am b/tests/golden/hid_gcode3/Makefile.am index b07c896..e0523e7 100644 --- a/tests/golden/hid_gcode3/Makefile.am +++ b/tests/golden/hid_gcode3/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.0350.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode4/Makefile.am b/tests/golden/hid_gcode4/Makefile.am index b07c896..e0523e7 100644 --- a/tests/golden/hid_gcode4/Makefile.am +++ b/tests/golden/hid_gcode4/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.0350.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode5/Makefile.am b/tests/golden/hid_gcode5/Makefile.am index b07c896..e0523e7 100644 --- a/tests/golden/hid_gcode5/Makefile.am +++ b/tests/golden/hid_gcode5/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.0350.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode6/Makefile.am b/tests/golden/hid_gcode6/Makefile.am index b07c896..e0523e7 100644 --- a/tests/golden/hid_gcode6/Makefile.am +++ b/tests/golden/hid_gcode6/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.0350.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode7/Makefile.am b/tests/golden/hid_gcode7/Makefile.am index b07c896..e0523e7 100644 --- a/tests/golden/hid_gcode7/Makefile.am +++ b/tests/golden/hid_gcode7/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.0350.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode8/Makefile.am b/tests/golden/hid_gcode8/Makefile.am index b07c896..cb93bf5 100644 --- a/tests/golden/hid_gcode8/Makefile.am +++ b/tests/golden/hid_gcode8/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.8890.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode diff --git a/tests/golden/hid_gcode9/Makefile.am b/tests/golden/hid_gcode9/Makefile.am index b07c896..e0523e7 100644 --- a/tests/golden/hid_gcode9/Makefile.am +++ b/tests/golden/hid_gcode9/Makefile.am @@ -1,6 +1,6 @@ ## -*- makefile -*- EXTRA_DIST= \ - gcode_oneline.gcode.bottom.cnc \ - gcode_oneline.gcode.drill.cnc \ - gcode_oneline.gcode.top.cnc + gcode_oneline-0.0350.drill.gcode \ + gcode_oneline-bottom.gcode \ + gcode_oneline-top.gcode commit 4a90dbb5552e967eecbe12048daa204cebdfc9a8 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode tests: date-stripping now supports all valid dates diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 4ceeeb0..5bd4acb 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -392,7 +392,7 @@ normalize_gcode() { local f1="$1" local f2="$2" # matches string such as '( Tue Mar 9 17:45:43 2010 )' - $AWK --posix '!/^\( *[A-Z][a-z]{2} [A-Z][a-z]{2} [01 ][0-9] [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]{4} *\)$/' \ + $AWK --posix '!/^\( *[A-Z][a-z]{2} [A-Z][a-z]{2} [0123 ][0-9] [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]{4} *\)$/' \ $f1 > $f2 } |
From: <gi...@gp...> - 2011-11-20 01:13:01
|
The branch, master has been updated via 9c591b7f752d6c149aafd97d364f82b08f74eee5 (commit) via 25b839354351c4ac97ae887eaa6f9d3456c96fba (commit) via 494d9be6ef390cefcc00f0ce0116b30a47b58ab0 (commit) from 2473e26c7d9581753a28f1f55a4a4b7ff109a3f2 (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/gcode/gcode.c | 4 ++-- src/hid/png/png.c | 17 ++++++++++------- src/set.c | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) ================= Commit Messages ================= commit 9c591b7f752d6c149aafd97d364f82b08f74eee5 Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Add missing pcb-printf.h set.c was calling pcb_g_strdup_printf() without #including pcb-printf.h, resulting in a missing prototype warning. :100644 100644 5712bca... 7c637c1... M src/set.c commit 25b839354351c4ac97ae887eaa6f9d3456c96fba Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> png hid: fixed some instances of an 'int' being used instead of Coord. After the unit switch, some cases where an int has sufficed previously no longer work. An example is png output of tilted, square pads. Before this patch those pads do not get drawn correctly; their size is completely wrong. :100644 100644 f00d407... ff8931a... M src/hid/png/png.c commit 494d9be6ef390cefcc00f0ce0116b30a47b58ab0 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> g-code hid: converted use of hypot() to Distance() :100644 100644 65fd843... f12f6b6... M src/hid/gcode/gcode.c ========= Changes ========= commit 9c591b7f752d6c149aafd97d364f82b08f74eee5 Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Add missing pcb-printf.h set.c was calling pcb_g_strdup_printf() without #including pcb-printf.h, resulting in a missing prototype warning. diff --git a/src/set.c b/src/set.c index 5712bca..7c637c1 100644 --- a/src/set.c +++ b/src/set.c @@ -55,6 +55,7 @@ #include "misc.h" #include "set.h" #include "undo.h" +#include "pcb-printf.h" #ifdef HAVE_LIBDMALLOC #include <dmalloc.h> commit 25b839354351c4ac97ae887eaa6f9d3456c96fba Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> png hid: fixed some instances of an 'int' being used instead of Coord. After the unit switch, some cases where an int has sufficed previously no longer work. An example is png output of tilted, square pads. Before this patch those pads do not get drawn correctly; their size is completely wrong. diff --git a/src/hid/png/png.c b/src/hid/png/png.c index f00d407..ff8931a 100644 --- a/src/hid/png/png.c +++ b/src/hid/png/png.c @@ -70,7 +70,7 @@ static int show_solder_side; #define SCALE(w) ((int)((w)/scale + 0.5)) #define SCALE_X(x) ((int)(((x) - x_shift)/scale)) #define SCALE_Y(y) ((int)(((show_solder_side ? (PCB->MaxHeight-(y)) : (y)) - y_shift)/scale)) -#define SWAP_IF_SOLDER(a,b) do { int c; if (show_solder_side) { c=a; a=b; b=c; }} while (0) +#define SWAP_IF_SOLDER(a,b) do { Coord c; if (show_solder_side) { c=a; a=b; b=c; }} while (0) /* Used to detect non-trivial outlines */ #define NOT_EDGE_X(x) ((x) != 0 && (x) != PCB->MaxWidth) @@ -634,8 +634,9 @@ png_do_export (HID_Attr_Val * options) int save_ons[MAX_LAYER + 2]; int i; BoxType *bbox; - int w, h; - int xmax, ymax, dpi; + Coord w, h; + Coord xmax, ymax; + int dpi; const char *fmt; bool format_error = false; @@ -1493,13 +1494,15 @@ png_draw_line (hidGC gc, Coord x1, Coord y1, Coord x2, Coord y2) * it as a filled polygon. */ int fg = gdImageColorResolve (im, gc->color->r, gc->color->g, - gc->color->b), - w = gc->width, dx = x2 - x1, dy = y2 - y1, dwx, dwy; + gc->color->b); + Coord w = gc->width; + Coord dwx, dwy; + gdPoint p[4]; - double l = sqrt (dx * dx + dy * dy) * 2; + double l = Distance(x1, y1, x2, y2) * 2; w += 2 * bloat; - dwx = -w / l * dy; dwy = w / l * dx; + dwx = -w / l * (y2 - y1); dwy = w / l * (x2 - x1); p[0].x = SCALE_X (x1 + dwx - dwy); p[0].y = SCALE_Y(y1 + dwy + dwx); p[1].x = SCALE_X (x1 - dwx - dwy); p[1].y = SCALE_Y(y1 - dwy + dwx); p[2].x = SCALE_X (x2 - dwx + dwy); p[2].y = SCALE_Y(y2 - dwy - dwx); commit 494d9be6ef390cefcc00f0ce0116b30a47b58ab0 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> g-code hid: converted use of hypot() to Distance() diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index 65fd843..f12f6b6 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -697,8 +697,8 @@ gcode_do_export (HID_Attr_Val * options) fprintf (gcode_f2, "G0 Z%s\n", variable_safeZ); } if (r > 0) - d += hypot( drill->holes[r].x - drill->holes[r - 1].x, - drill->holes[r].y - drill->holes[r - 1].y ); + d += Distance(drill->holes[r - 1].x, drill->holes[r - 1].y, + drill->holes[r ].x, drill->holes[r ].y); } if (gcode_advanced) fprintf (gcode_f2, "M5 M9 M2\n"); |
From: <gi...@gp...> - 2011-11-20 01:07:45
|
The branch, master has been updated via 2473e26c7d9581753a28f1f55a4a4b7ff109a3f2 (commit) from bba2c1d29cfe341f2ad1e4eefeef76f9134e1d50 (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 | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) ================= Commit Messages ================= commit 2473e26c7d9581753a28f1f55a4a4b7ff109a3f2 Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Fix locale-dependent gerber output pcb_printf doesn't have a modifier that lets you select a unit (%mi) and locale-independent format (like %mr) at the same time. The gerber hid was using %mi to output to a file, but that resulted in ',' instead of '.' for some locales. This patch switches it to call g_ascii_formatd() on the value first, to ensure it's output with '.'. :100644 100644 1539f88... 4e0007b... M src/hid/gerber/gerber.c ========= Changes ========= commit 2473e26c7d9581753a28f1f55a4a4b7ff109a3f2 Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Fix locale-dependent gerber output pcb_printf doesn't have a modifier that lets you select a unit (%mi) and locale-independent format (like %mr) at the same time. The gerber hid was using %mi to output to a file, but that resulted in ',' instead of '.' for some locales. This patch switches it to call g_ascii_formatd() on the value first, to ensure it's output with '.'. diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c index 1539f88..4e0007b 100644 --- a/src/hid/gerber/gerber.c +++ b/src/hid/gerber/gerber.c @@ -226,18 +226,23 @@ findAperture (ApertureList *list, Coord width, ApertureShape shape) static void fprintAperture (FILE *f, Aperture *aptr) { + char buf[50]; + switch (aptr->shape) { case ROUND: - pcb_fprintf (f, "%%ADD%dC,%.4mi*%%\r\n", aptr->dCode, aptr->width); + g_ascii_formatd (buf, 50, "%.4f", COORD_TO_INCH (aptr->width)); + pcb_fprintf (f, "%%ADD%dC,%s*%%\r\n", aptr->dCode, buf); break; case SQUARE: - pcb_fprintf (f, "%%ADD%dR,%.4miX%.4mi*%%\r\n", aptr->dCode, aptr->width, aptr->width); + g_ascii_formatd (buf, 50, "%.4f", COORD_TO_INCH (aptr->width)); + pcb_fprintf (f, "%%ADD%dR,%sX%s*%%\r\n", aptr->dCode, buf, buf); break; case OCTAGON: - pcb_fprintf (f, "%%AMOCT%d*5,0,8,0,0,%.4mi,22.5*%%\r\n" + g_ascii_formatd (buf, 50, "%.4f", COORD_TO_INCH (aptr->width / COS_22_5_DEGREE)); + pcb_fprintf (f, "%%AMOCT%d*5,0,8,0,0,%s,22.5*%%\r\n" "%%ADD%dOCT%d*%%\r\n", aptr->dCode, - (Coord) ((double) aptr->width / COS_22_5_DEGREE), aptr->dCode, + buf, aptr->dCode, aptr->dCode); break; #if 0 |
From: <gi...@gp...> - 2011-11-19 23:47:28
|
The branch, master has been updated via bba2c1d29cfe341f2ad1e4eefeef76f9134e1d50 (commit) from 57873daeadfaf1c2966a7c30d5c839c921c5af9d (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/common/hidgl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit bba2c1d29cfe341f2ad1e4eefeef76f9134e1d50 Author: Ahmed El-Mahmoudy <ael...@sa...> Commit: DJ Delorie <dj...@de...> Fix typo (recieved -> received) :100644 100644 21edb5d... 7ec148f... M src/hid/common/hidgl.c ========= Changes ========= commit bba2c1d29cfe341f2ad1e4eefeef76f9134e1d50 Author: Ahmed El-Mahmoudy <ael...@sa...> Commit: DJ Delorie <dj...@de...> Fix typo (recieved -> received) diff --git a/src/hid/common/hidgl.c b/src/hid/common/hidgl.c index 21edb5d..7ec148f 100644 --- a/src/hid/common/hidgl.c +++ b/src/hid/common/hidgl.c @@ -521,7 +521,7 @@ myVertex (GLdouble *vertex_data) } } else - printf ("Vertex recieved with unknown type\n"); + printf ("Vertex received with unknown type\n"); } void |
From: <gi...@gp...> - 2011-11-19 23:34:22
|
The branch, master has been updated via 57873daeadfaf1c2966a7c30d5c839c921c5af9d (commit) from 1d82803aa20acc5e379e53a548a0ba4e29d23339 (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 ========= tools/Makefile.am | 3 +- tools/pcbdiff | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) create mode 100755 tools/pcbdiff ================= Commit Messages ================= commit 57873daeadfaf1c2966a7c30d5c839c921c5af9d Author: Alan Somers <as...@gm...> Commit: DJ Delorie <dj...@de...> Adding a script to graphically diff PCB files :100644 100644 d9665a9... f350471... M tools/Makefile.am :000000 100755 0000000... 00378cd... A tools/pcbdiff ========= Changes ========= commit 57873daeadfaf1c2966a7c30d5c839c921c5af9d Author: Alan Somers <as...@gm...> Commit: DJ Delorie <dj...@de...> Adding a script to graphically diff PCB files diff --git a/tools/Makefile.am b/tools/Makefile.am index d9665a9..f350471 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,7 +21,8 @@ TOOLS= \ tgo2pcb.tcl \ MergePCBPS \ Merge_dimPCBPS \ - PCB2HPGL + PCB2HPGL \ + pcbdiff DIST_SCM= \ gnet-pcbfwd.scm diff --git a/tools/pcbdiff b/tools/pcbdiff new file mode 100755 index 0000000..00378cd --- /dev/null +++ b/tools/pcbdiff @@ -0,0 +1,64 @@ +#! /bin/sh + +usage () +{ + echo Usage: + echo \\tpcbdiff firstfile secondfile + echo \\tView a graphical diff of PCB files + echo + echo \\tTo use with git, just place this script in your PATH and do + echo \\tgit difftool -x pcbdiff ... + echo + echo \\tTo use with mercurial, add the following lines to your .hgrc: + echo \\t\\t[extensions] + echo \\t\\thgext.extdiff = + echo \\t\\t[extdiff] + echo \\t\\tcmd.pcbdiff = /PATH/TO/pcbdiff + echo \\tthen to invoke it, do + echo \\thg pcbdiff ... + echo + echo \\tTo use with subversion, place it in your PATH and do + echo \\tsvn diff --diff-cmd pcbdiff ... + + echo \\tRequirements: Imagemagick and gschem be installed +} + + +for PROG in pcb convert composite +do + if which $PROG > /dev/null + then + true + else + echo "$PROG is not found. Either it is not installed, or not in your PATH" + exit 1 + fi +done + +#In case the script was invoked with extra option arguments, throw them away +shift `expr $# - 2` + +if test -d $1 -o -d $2 + then echo "ERROR: pcbdiff cannot diff entire directories" + exit 1 +fi + +LEFTFILE=$1 +RIGHTFILE=$2 +LEFTPNG=`mktemp --tmpdir pcbdiff.XXXXXXXXXX` +RIGHTPNG=`mktemp --tmpdir pcbdiff.XXXXXXXXXX` +LEFTBNW=`mktemp --tmpdir pcbdiff.XXXXXXXXXX` +RIGHTBNW=`mktemp --tmpdir pcbdiff.XXXXXXXXXX` +DIFFPNG=`mktemp --tmpdir pcbdiff.XXXXXXXXXX` + +pcb -x png --dpi 200 --only-visible --photo-mode --outfile $LEFTPNG $LEFTFILE +pcb -x png --dpi 200 --only-visible --photo-mode --outfile $RIGHTPNG $RIGHTFILE +convert -colorspace gray $LEFTPNG $LEFTBNW +convert -colorspace gray $RIGHTPNG $RIGHTBNW +composite -stereo 0 $LEFTBNW $RIGHTBNW $DIFFPNG +display $DIFFPNG +rm $LEFTPNG +rm $RIGHTPNG +rm $LEFTBNW +rm $RIGHTBNW +rm $DIFFPNG |
From: <gi...@gp...> - 2011-11-19 23:13:11
|
The branch, master has been updated via 1d82803aa20acc5e379e53a548a0ba4e29d23339 (commit) via a858a225f69176e913e811d9f3a6b155d5cffb4c (commit) via a34b5d9ff0851ca54546263b9f06c84cf78854a1 (commit) via b6f4fb5561420d11f0a3051f19fe671e07f3f840 (commit) via 78f02193b05e6952c2d5b2b0bb6d44a762f62529 (commit) via 1177764cfa2f2af70a25b3acc058b414301860b7 (commit) via f546e9fa060abab5d1bc6f2bb7e27ab28c8180f8 (commit) via 2a38d72638f8acb7e625ad03b3a3314c2d2055bd (commit) via 728eb911f9cf88f20d5eb33c0bd62e0637b4115d (commit) via a55da655ae12c0934141d64ec423fa9131fd2483 (commit) via 100197a9f6d182979837a7338a147848219ad506 (commit) via d05f2f19a2a14ab1634c8477f7e189e8e26a3d9a (commit) via 356e5c1f7d58f3930056ee39bc2ed11346b64d14 (commit) via cd063cb3a69922c7be3ad2df7511a5fd6e1392b5 (commit) via 9d3843a6b72ac6bdcd4d76d28162a700f1a7923b (commit) via f39ac9ce9e0141c8f1e3828d280fd8df95da4522 (commit) via 83dba626f35195a00f1ef2f23ab2d235b4f6757b (commit) from 48b13a7ef095b479235c69b08c57bac74e81b3b6 (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/gcode/gcode.c | 334 +++++++++++++------- .../gcode_oneline-0.0350.drill.gcode} | 7 +- .../gcode_oneline-bottom.gcode} | 3 +- .../gcode_oneline-top.gcode} | 3 +- .../golden/hid_gcode1/gcode_oneline.gcode.top.cnc | 34 -- ....drill.cnc => gcode_oneline-0.8890.drill.gcode} | 7 +- ...gcode.bottom.cnc => gcode_oneline-bottom.gcode} | 3 +- ...eline.gcode.top.cnc => gcode_oneline-top.gcode} | 3 +- ....drill.cnc => gcode_oneline-0.0350.drill.gcode} | 7 +- ...gcode.bottom.cnc => gcode_oneline-bottom.gcode} | 3 +- ...eline.gcode.top.cnc => gcode_oneline-top.gcode} | 3 +- .../out-0.0350.drill.gcode} | 7 +- .../out-bottom.gcode} | 3 +- .../out-top.gcode} | 3 +- tests/golden/hid_gcode2/out.bottom.cnc | 34 -- tests/golden/hid_gcode2/out.drill.cnc | 12 - tests/golden/hid_gcode2/out.top.cnc | 34 -- .../gcode_oneline-0.0350.drill.gcode} | 7 +- tests/golden/hid_gcode3/gcode_oneline-bottom.gcode | 41 +++ tests/golden/hid_gcode3/gcode_oneline-top.gcode | 41 +++ .../hid_gcode3/gcode_oneline.gcode.bottom.cnc | 40 --- .../hid_gcode3/gcode_oneline.gcode.drill.cnc | 12 - .../golden/hid_gcode3/gcode_oneline.gcode.top.cnc | 40 --- .../gcode_oneline-0.0350.drill.gcode} | 7 +- .../gcode_oneline-bottom.gcode} | 5 +- .../gcode_oneline-top.gcode} | 5 +- .../hid_gcode4/gcode_oneline.gcode.bottom.cnc | 34 -- .../hid_gcode4/gcode_oneline.gcode.drill.cnc | 12 - .../golden/hid_gcode4/gcode_oneline.gcode.top.cnc | 34 -- .../gcode_oneline-0.0350.drill.gcode} | 9 +- .../gcode_oneline-bottom.gcode} | 5 +- .../gcode_oneline-top.gcode} | 5 +- .../hid_gcode5/gcode_oneline.gcode.bottom.cnc | 34 -- .../hid_gcode5/gcode_oneline.gcode.drill.cnc | 12 - .../golden/hid_gcode5/gcode_oneline.gcode.top.cnc | 34 -- .../gcode_oneline-0.0350.drill.gcode} | 7 +- tests/golden/hid_gcode6/gcode_oneline-bottom.gcode | 39 +++ tests/golden/hid_gcode6/gcode_oneline-top.gcode | 39 +++ .../hid_gcode6/gcode_oneline.gcode.bottom.cnc | 43 --- .../hid_gcode6/gcode_oneline.gcode.drill.cnc | 12 - .../golden/hid_gcode6/gcode_oneline.gcode.top.cnc | 43 --- .../gcode_oneline-0.0350.drill.gcode} | 7 +- .../gcode_oneline-bottom.gcode} | 3 +- .../gcode_oneline-top.gcode} | 3 +- .../hid_gcode7/gcode_oneline.gcode.bottom.cnc | 34 -- .../hid_gcode7/gcode_oneline.gcode.drill.cnc | 12 - .../gcode_oneline-0.8890.drill.gcode} | 7 +- .../gcode_oneline-bottom.gcode} | 3 +- .../gcode_oneline-top.gcode} | 3 +- .../hid_gcode8/gcode_oneline.gcode.bottom.cnc | 34 -- .../hid_gcode8/gcode_oneline.gcode.drill.cnc | 12 - .../golden/hid_gcode8/gcode_oneline.gcode.top.cnc | 34 -- ....drill.cnc => gcode_oneline-0.0350.drill.gcode} | 7 +- ...gcode.bottom.cnc => gcode_oneline-bottom.gcode} | 3 +- ...eline.gcode.top.cnc => gcode_oneline-top.gcode} | 3 +- tests/run_tests.sh | 62 ++-- tests/tests.list | 32 +- 57 files changed, 515 insertions(+), 804 deletions(-) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.drill.cnc => hid_gcode1/gcode_oneline-0.0350.drill.gcode} (69%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.bottom.cnc => hid_gcode1/gcode_oneline-bottom.gcode} (92%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.top.cnc => hid_gcode1/gcode_oneline-top.gcode} (92%) delete mode 100644 tests/golden/hid_gcode1/gcode_oneline.gcode.top.cnc rename tests/golden/hid_gcode10/{gcode_oneline.gcode.drill.cnc => gcode_oneline-0.8890.drill.gcode} (69%) rename tests/golden/hid_gcode10/{gcode_oneline.gcode.bottom.cnc => gcode_oneline-bottom.gcode} (93%) rename tests/golden/hid_gcode10/{gcode_oneline.gcode.top.cnc => gcode_oneline-top.gcode} (93%) rename tests/golden/hid_gcode11/{gcode_oneline.gcode.drill.cnc => gcode_oneline-0.0350.drill.gcode} (69%) rename tests/golden/hid_gcode11/{gcode_oneline.gcode.bottom.cnc => gcode_oneline-bottom.gcode} (94%) rename tests/golden/hid_gcode11/{gcode_oneline.gcode.top.cnc => gcode_oneline-top.gcode} (94%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.drill.cnc => hid_gcode2/out-0.0350.drill.gcode} (69%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.bottom.cnc => hid_gcode2/out-bottom.gcode} (92%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.top.cnc => hid_gcode2/out-top.gcode} (92%) delete mode 100644 tests/golden/hid_gcode2/out.bottom.cnc delete mode 100644 tests/golden/hid_gcode2/out.drill.cnc delete mode 100644 tests/golden/hid_gcode2/out.top.cnc copy tests/golden/{hid_gcode9/gcode_oneline.gcode.drill.cnc => hid_gcode3/gcode_oneline-0.0350.drill.gcode} (69%) create mode 100644 tests/golden/hid_gcode3/gcode_oneline-bottom.gcode create mode 100644 tests/golden/hid_gcode3/gcode_oneline-top.gcode delete mode 100644 tests/golden/hid_gcode3/gcode_oneline.gcode.bottom.cnc delete mode 100644 tests/golden/hid_gcode3/gcode_oneline.gcode.drill.cnc delete mode 100644 tests/golden/hid_gcode3/gcode_oneline.gcode.top.cnc copy tests/golden/{hid_gcode9/gcode_oneline.gcode.drill.cnc => hid_gcode4/gcode_oneline-0.0350.drill.gcode} (69%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.bottom.cnc => hid_gcode4/gcode_oneline-bottom.gcode} (88%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.top.cnc => hid_gcode4/gcode_oneline-top.gcode} (88%) delete mode 100644 tests/golden/hid_gcode4/gcode_oneline.gcode.bottom.cnc delete mode 100644 tests/golden/hid_gcode4/gcode_oneline.gcode.drill.cnc delete mode 100644 tests/golden/hid_gcode4/gcode_oneline.gcode.top.cnc copy tests/golden/{hid_gcode9/gcode_oneline.gcode.drill.cnc => hid_gcode5/gcode_oneline-0.0350.drill.gcode} (62%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.bottom.cnc => hid_gcode5/gcode_oneline-bottom.gcode} (89%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.top.cnc => hid_gcode5/gcode_oneline-top.gcode} (89%) delete mode 100644 tests/golden/hid_gcode5/gcode_oneline.gcode.bottom.cnc delete mode 100644 tests/golden/hid_gcode5/gcode_oneline.gcode.drill.cnc delete mode 100644 tests/golden/hid_gcode5/gcode_oneline.gcode.top.cnc copy tests/golden/{hid_gcode9/gcode_oneline.gcode.drill.cnc => hid_gcode6/gcode_oneline-0.0350.drill.gcode} (69%) create mode 100644 tests/golden/hid_gcode6/gcode_oneline-bottom.gcode create mode 100644 tests/golden/hid_gcode6/gcode_oneline-top.gcode delete mode 100644 tests/golden/hid_gcode6/gcode_oneline.gcode.bottom.cnc delete mode 100644 tests/golden/hid_gcode6/gcode_oneline.gcode.drill.cnc delete mode 100644 tests/golden/hid_gcode6/gcode_oneline.gcode.top.cnc copy tests/golden/{hid_gcode9/gcode_oneline.gcode.drill.cnc => hid_gcode7/gcode_oneline-0.0350.drill.gcode} (70%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.bottom.cnc => hid_gcode7/gcode_oneline-bottom.gcode} (92%) copy tests/golden/{hid_gcode9/gcode_oneline.gcode.top.cnc => hid_gcode7/gcode_oneline-top.gcode} (92%) delete mode 100644 tests/golden/hid_gcode7/gcode_oneline.gcode.bottom.cnc delete mode 100644 tests/golden/hid_gcode7/gcode_oneline.gcode.drill.cnc rename tests/golden/{hid_gcode1/gcode_oneline.gcode.drill.cnc => hid_gcode8/gcode_oneline-0.8890.drill.gcode} (69%) rename tests/golden/{hid_gcode1/gcode_oneline.gcode.bottom.cnc => hid_gcode8/gcode_oneline-bottom.gcode} (93%) rename tests/golden/{hid_gcode7/gcode_oneline.gcode.top.cnc => hid_gcode8/gcode_oneline-top.gcode} (93%) delete mode 100644 tests/golden/hid_gcode8/gcode_oneline.gcode.bottom.cnc delete mode 100644 tests/golden/hid_gcode8/gcode_oneline.gcode.drill.cnc delete mode 100644 tests/golden/hid_gcode8/gcode_oneline.gcode.top.cnc rename tests/golden/hid_gcode9/{gcode_oneline.gcode.drill.cnc => gcode_oneline-0.0350.drill.gcode} (69%) rename tests/golden/hid_gcode9/{gcode_oneline.gcode.bottom.cnc => gcode_oneline-bottom.gcode} (92%) rename tests/golden/hid_gcode9/{gcode_oneline.gcode.top.cnc => gcode_oneline-top.gcode} (92%) ================= Commit Messages ================= commit 1d82803aa20acc5e379e53a548a0ba4e29d23339 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> reference gcode tests now match the latest generated gcode :100644 100644 63f6a2d... 4e978bd... M tests/golden/hid_gcode1/gcode_oneline-0.0350.drill.gcode :100644 100644 2031270... d8f7d01... M tests/golden/hid_gcode1/gcode_oneline-bottom.gcode :100644 100644 afd6cb2... 6aca656... M tests/golden/hid_gcode1/gcode_oneline-top.gcode :100644 100644 7deace0... 8ddf366... M tests/golden/hid_gcode10/gcode_oneline-0.8890.drill.gcode :100644 100644 19a703d... 3c4f9da... M tests/golden/hid_gcode10/gcode_oneline-bottom.gcode :100644 100644 a1d48bd... de9db0c... M tests/golden/hid_gcode10/gcode_oneline-top.gcode :100644 100644 37b9668... a857934... M tests/golden/hid_gcode11/gcode_oneline-0.0350.drill.gcode :100644 100644 c144b05... cb47417... M tests/golden/hid_gcode11/gcode_oneline-bottom.gcode :100644 100644 ddf7394... 9a74775... M tests/golden/hid_gcode11/gcode_oneline-top.gcode :100644 100644 f7c6d78... 4e978bd... M tests/golden/hid_gcode2/out-0.0350.drill.gcode :100644 100644 c3b0526... d8f7d01... M tests/golden/hid_gcode2/out-bottom.gcode :100644 100644 ca2b079... 6aca656... M tests/golden/hid_gcode2/out-top.gcode :100644 100644 e7be01d... 4e978bd... M tests/golden/hid_gcode3/gcode_oneline-0.0350.drill.gcode :100644 100644 e67b085... e066761... M tests/golden/hid_gcode3/gcode_oneline-bottom.gcode :100644 100644 d7c8c9f... 77fa466... M tests/golden/hid_gcode3/gcode_oneline-top.gcode :100644 100644 c648655... 4e978bd... M tests/golden/hid_gcode4/gcode_oneline-0.0350.drill.gcode :100644 100644 d049972... 7a4cf41... M tests/golden/hid_gcode4/gcode_oneline-bottom.gcode :100644 100644 78e64a5... 9a83d97... M tests/golden/hid_gcode4/gcode_oneline-top.gcode :100644 100644 77d8d60... da70a5b... M tests/golden/hid_gcode5/gcode_oneline-0.0350.drill.gcode :100644 100644 8041f98... 40aa456... M tests/golden/hid_gcode5/gcode_oneline-bottom.gcode :100644 100644 e3bbd7e... 07819ff... M tests/golden/hid_gcode5/gcode_oneline-top.gcode :100644 100644 6b44265... 4e978bd... M tests/golden/hid_gcode6/gcode_oneline-0.0350.drill.gcode :100644 100644 7d33799... 5440510... M tests/golden/hid_gcode6/gcode_oneline-bottom.gcode :100644 100644 7dfd6a0... c9cd5e6... M tests/golden/hid_gcode6/gcode_oneline-top.gcode :100644 100644 e8c41bf... 1edd7fb... M tests/golden/hid_gcode7/gcode_oneline-0.0350.drill.gcode :100644 100644 b92e532... 10719a2... M tests/golden/hid_gcode7/gcode_oneline-bottom.gcode :100644 100644 4c64804... 369c625... M tests/golden/hid_gcode7/gcode_oneline-top.gcode :100644 100644 77ac526... 3bb6ff3... M tests/golden/hid_gcode8/gcode_oneline-0.8890.drill.gcode :100644 100644 286cab5... 00742fa... M tests/golden/hid_gcode8/gcode_oneline-bottom.gcode :100644 100644 a57aeb7... e402b4c... M tests/golden/hid_gcode8/gcode_oneline-top.gcode :100644 100644 c4b730a... 75c7fa7... M tests/golden/hid_gcode9/gcode_oneline-0.0350.drill.gcode :100644 100644 49ebcd5... 10719a2... M tests/golden/hid_gcode9/gcode_oneline-bottom.gcode :100644 100644 638cec1... 369c625... M tests/golden/hid_gcode9/gcode_oneline-top.gcode commit a858a225f69176e913e811d9f3a6b155d5cffb4c Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode tests: stripping creation timestamp more robustly :100755 100755 085e8ca... 4ceeeb0... M tests/run_tests.sh commit a34b5d9ff0851ca54546263b9f06c84cf78854a1 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> fixed broken bom, xy and gcode testing I was comparing the reference files to themselves. Now comparing reference and test files :100755 100755 9544377... 085e8ca... M tests/run_tests.sh commit b6f4fb5561420d11f0a3051f19fe671e07f3f840 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> test script: local-ized all variables passed into functions. stuff no longer gets overwritten :100755 100755 11009f8... 9544377... M tests/run_tests.sh commit 78f02193b05e6952c2d5b2b0bb6d44a762f62529 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> test script: added missing boilerplate to set normalized filenames :100755 100755 abd894d... 11009f8... M tests/run_tests.sh commit 1177764cfa2f2af70a25b3acc058b414301860b7 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> unit test script: fixed incorrect file existence check :100755 100755 e9a4ac2... abd894d... M tests/run_tests.sh commit f546e9fa060abab5d1bc6f2bb7e27ab28c8180f8 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode tests now look for the new size-specific drill files :000000 100644 0000000... 63f6a2d... A tests/golden/hid_gcode1/gcode_oneline-0.0350.drill.gcode :100644 000000 63f6a2d... 0000000... D tests/golden/hid_gcode1/gcode_oneline-drill.gcode :000000 100644 0000000... 7deace0... A tests/golden/hid_gcode10/gcode_oneline-0.8890.drill.gcode :100644 000000 7deace0... 0000000... D tests/golden/hid_gcode10/gcode_oneline-drill.gcode :000000 100644 0000000... 37b9668... A tests/golden/hid_gcode11/gcode_oneline-0.0350.drill.gcode :100644 000000 37b9668... 0000000... D tests/golden/hid_gcode11/gcode_oneline-drill.gcode :000000 100644 0000000... f7c6d78... A tests/golden/hid_gcode2/out-0.0350.drill.gcode :100644 000000 f7c6d78... 0000000... D tests/golden/hid_gcode2/out-drill.gcode :000000 100644 0000000... e7be01d... A tests/golden/hid_gcode3/gcode_oneline-0.0350.drill.gcode :100644 000000 e7be01d... 0000000... D tests/golden/hid_gcode3/gcode_oneline-drill.gcode :000000 100644 0000000... c648655... A tests/golden/hid_gcode4/gcode_oneline-0.0350.drill.gcode :100644 000000 c648655... 0000000... D tests/golden/hid_gcode4/gcode_oneline-drill.gcode :000000 100644 0000000... 77d8d60... A tests/golden/hid_gcode5/gcode_oneline-0.0350.drill.gcode :100644 000000 77d8d60... 0000000... D tests/golden/hid_gcode5/gcode_oneline-drill.gcode :000000 100644 0000000... 6b44265... A tests/golden/hid_gcode6/gcode_oneline-0.0350.drill.gcode :100644 000000 6b44265... 0000000... D tests/golden/hid_gcode6/gcode_oneline-drill.gcode :000000 100644 0000000... e8c41bf... A tests/golden/hid_gcode7/gcode_oneline-0.0350.drill.gcode :100644 000000 e8c41bf... 0000000... D tests/golden/hid_gcode7/gcode_oneline-drill.gcode :000000 100644 0000000... 77ac526... A tests/golden/hid_gcode8/gcode_oneline-0.8890.drill.gcode :100644 000000 77ac526... 0000000... D tests/golden/hid_gcode8/gcode_oneline-drill.gcode :000000 100644 0000000... c4b730a... A tests/golden/hid_gcode9/gcode_oneline-0.0350.drill.gcode :100644 000000 c4b730a... 0000000... D tests/golden/hid_gcode9/gcode_oneline-drill.gcode :100644 100644 a9a396d... e9812bf... M tests/tests.list commit 2a38d72638f8acb7e625ad03b3a3314c2d2055bd Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> updated tests.list to use tool diameter instead of radius when testing gcode :100644 100644 25e820e... a9a396d... M tests/tests.list commit 728eb911f9cf88f20d5eb33c0bd62e0637b4115d Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> fixed incorrect comment in tests.list :100644 100644 422e8e5... 25e820e... M tests/tests.list commit a55da655ae12c0934141d64ec423fa9131fd2483 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> added some forgotten newlines in the gcode output :100644 100644 31874d0... 65fd843... M src/hid/gcode/gcode.c commit 100197a9f6d182979837a7338a147848219ad506 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> g-code exporter now outputs NC-drills for different hole sizes into different files :100644 100644 2e80e6e... 31874d0... M src/hid/gcode/gcode.c commit d05f2f19a2a14ab1634c8477f7e189e8e26a3d9a Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> a few tab->spaces conversions in comments :100644 100644 8a8d011... 2e80e6e... M src/hid/gcode/gcode.c commit 356e5c1f7d58f3930056ee39bc2ed11346b64d14 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> removed some trailing whitespace in comments :100644 100644 25f35be... 8a8d011... M src/hid/gcode/gcode.c commit cd063cb3a69922c7be3ad2df7511a5fd6e1392b5 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode exporter: reworked and cleaned up sort_drill() This function no longer deallocates the memory passed into it, which is a potential source of issues for the unsuspecting caller. Instead it sorts the data in-place :100644 100644 790aa61... 25f35be... M src/hid/gcode/gcode.c commit 9d3843a6b72ac6bdcd4d76d28162a700f1a7923b Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode exporter: minor whitespace corrections :100644 100644 1774ea0... 790aa61... M src/hid/gcode/gcode.c commit f39ac9ce9e0141c8f1e3828d280fd8df95da4522 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> gcode exporter: made some functions static :100644 100644 d9f2ec1... 1774ea0... M src/hid/gcode/gcode.c commit 83dba626f35195a00f1ef2f23ab2d235b4f6757b Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> renamed golden test files to match new gcode output filenames :000000 100644 0000000... 2031270... A tests/golden/hid_gcode1/gcode_oneline-bottom.gcode :000000 100644 0000000... 63f6a2d... A tests/golden/hid_gcode1/gcode_oneline-drill.gcode :000000 100644 0000000... afd6cb2... A tests/golden/hid_gcode1/gcode_oneline-top.gcode :100644 000000 2031270... 0000000... D tests/golden/hid_gcode1/gcode_oneline.gcode.bottom.cnc :100644 000000 63f6a2d... 0000000... D tests/golden/hid_gcode1/gcode_oneline.gcode.drill.cnc :100644 000000 afd6cb2... 0000000... D tests/golden/hid_gcode1/gcode_oneline.gcode.top.cnc :000000 100644 0000000... 19a703d... A tests/golden/hid_gcode10/gcode_oneline-bottom.gcode :000000 100644 0000000... 7deace0... A tests/golden/hid_gcode10/gcode_oneline-drill.gcode :000000 100644 0000000... a1d48bd... A tests/golden/hid_gcode10/gcode_oneline-top.gcode :100644 000000 19a703d... 0000000... D tests/golden/hid_gcode10/gcode_oneline.gcode.bottom.cnc :100644 000000 7deace0... 0000000... D tests/golden/hid_gcode10/gcode_oneline.gcode.drill.cnc :100644 000000 a1d48bd... 0000000... D tests/golden/hid_gcode10/gcode_oneline.gcode.top.cnc :000000 100644 0000000... c144b05... A tests/golden/hid_gcode11/gcode_oneline-bottom.gcode :000000 100644 0000000... 37b9668... A tests/golden/hid_gcode11/gcode_oneline-drill.gcode :000000 100644 0000000... ddf7394... A tests/golden/hid_gcode11/gcode_oneline-top.gcode :100644 000000 c144b05... 0000000... D tests/golden/hid_gcode11/gcode_oneline.gcode.bottom.cnc :100644 000000 37b9668... 0000000... D tests/golden/hid_gcode11/gcode_oneline.gcode.drill.cnc :100644 000000 ddf7394... 0000000... D tests/golden/hid_gcode11/gcode_oneline.gcode.top.cnc :000000 100644 0000000... c3b0526... A tests/golden/hid_gcode2/out-bottom.gcode :000000 100644 0000000... f7c6d78... A tests/golden/hid_gcode2/out-drill.gcode :000000 100644 0000000... ca2b079... A tests/golden/hid_gcode2/out-top.gcode :100644 000000 c3b0526... 0000000... D tests/golden/hid_gcode2/out.bottom.cnc :100644 000000 f7c6d78... 0000000... D tests/golden/hid_gcode2/out.drill.cnc :100644 000000 ca2b079... 0000000... D tests/golden/hid_gcode2/out.top.cnc :000000 100644 0000000... e67b085... A tests/golden/hid_gcode3/gcode_oneline-bottom.gcode :000000 100644 0000000... e7be01d... A tests/golden/hid_gcode3/gcode_oneline-drill.gcode :000000 100644 0000000... d7c8c9f... A tests/golden/hid_gcode3/gcode_oneline-top.gcode :100644 000000 e67b085... 0000000... D tests/golden/hid_gcode3/gcode_oneline.gcode.bottom.cnc :100644 000000 e7be01d... 0000000... D tests/golden/hid_gcode3/gcode_oneline.gcode.drill.cnc :100644 000000 d7c8c9f... 0000000... D tests/golden/hid_gcode3/gcode_oneline.gcode.top.cnc :000000 100644 0000000... d049972... A tests/golden/hid_gcode4/gcode_oneline-bottom.gcode :000000 100644 0000000... c648655... A tests/golden/hid_gcode4/gcode_oneline-drill.gcode :000000 100644 0000000... 78e64a5... A tests/golden/hid_gcode4/gcode_oneline-top.gcode :100644 000000 d049972... 0000000... D tests/golden/hid_gcode4/gcode_oneline.gcode.bottom.cnc :100644 000000 c648655... 0000000... D tests/golden/hid_gcode4/gcode_oneline.gcode.drill.cnc :100644 000000 78e64a5... 0000000... D tests/golden/hid_gcode4/gcode_oneline.gcode.top.cnc :000000 100644 0000000... 8041f98... A tests/golden/hid_gcode5/gcode_oneline-bottom.gcode :000000 100644 0000000... 77d8d60... A tests/golden/hid_gcode5/gcode_oneline-drill.gcode :000000 100644 0000000... e3bbd7e... A tests/golden/hid_gcode5/gcode_oneline-top.gcode :100644 000000 8041f98... 0000000... D tests/golden/hid_gcode5/gcode_oneline.gcode.bottom.cnc :100644 000000 77d8d60... 0000000... D tests/golden/hid_gcode5/gcode_oneline.gcode.drill.cnc :100644 000000 e3bbd7e... 0000000... D tests/golden/hid_gcode5/gcode_oneline.gcode.top.cnc :000000 100644 0000000... 7d33799... A tests/golden/hid_gcode6/gcode_oneline-bottom.gcode :000000 100644 0000000... 6b44265... A tests/golden/hid_gcode6/gcode_oneline-drill.gcode :000000 100644 0000000... 7dfd6a0... A tests/golden/hid_gcode6/gcode_oneline-top.gcode :100644 000000 7d33799... 0000000... D tests/golden/hid_gcode6/gcode_oneline.gcode.bottom.cnc :100644 000000 6b44265... 0000000... D tests/golden/hid_gcode6/gcode_oneline.gcode.drill.cnc :100644 000000 7dfd6a0... 0000000... D tests/golden/hid_gcode6/gcode_oneline.gcode.top.cnc :000000 100644 0000000... b92e532... A tests/golden/hid_gcode7/gcode_oneline-bottom.gcode :000000 100644 0000000... e8c41bf... A tests/golden/hid_gcode7/gcode_oneline-drill.gcode :000000 100644 0000000... 4c64804... A tests/golden/hid_gcode7/gcode_oneline-top.gcode :100644 000000 b92e532... 0000000... D tests/golden/hid_gcode7/gcode_oneline.gcode.bottom.cnc :100644 000000 e8c41bf... 0000000... D tests/golden/hid_gcode7/gcode_oneline.gcode.drill.cnc :100644 000000 4c64804... 0000000... D tests/golden/hid_gcode7/gcode_oneline.gcode.top.cnc :000000 100644 0000000... 286cab5... A tests/golden/hid_gcode8/gcode_oneline-bottom.gcode :000000 100644 0000000... 77ac526... A tests/golden/hid_gcode8/gcode_oneline-drill.gcode :000000 100644 0000000... a57aeb7... A tests/golden/hid_gcode8/gcode_oneline-top.gcode :100644 000000 286cab5... 0000000... D tests/golden/hid_gcode8/gcode_oneline.gcode.bottom.cnc :100644 000000 77ac526... 0000000... D tests/golden/hid_gcode8/gcode_oneline.gcode.drill.cnc :100644 000000 a57aeb7... 0000000... D tests/golden/hid_gcode8/gcode_oneline.gcode.top.cnc :000000 100644 0000000... 49ebcd5... A tests/golden/hid_gcode9/gcode_oneline-bottom.gcode :000000 100644 0000000... c4b730a... A tests/golden/hid_gcode9/gcode_oneline-drill.gcode :000000 100644 0000000... 638cec1... A tests/golden/hid_gcode9/gcode_oneline-top.gcode :100644 000000 49ebcd5... 0000000... D tests/golden/hid_gcode9/gcode_oneline.gcode.bottom.cnc :100644 000000 c4b730a... 0000000... D tests/golden/hid_gcode9/gcode_oneline.gcode.drill.cnc :100644 000000 638cec1... 0000000... D tests/golden/hid_gcode9/gcode_oneline.gcode.top.cnc :100644 100644 3433452... 422e8e5... M tests/tests.list ========= Changes ========= commit 1d82803aa20acc5e379e53a548a0ba4e29d23339 Author: Dima Kogan <di...@se...> Commit: DJ Delorie <dj...@de...> reference gcode tests now match the latest generated gcode diff --git a/tests/golden/hid_gcode1/gcode_oneline-0.0350.drill.gcode b/tests/golden/hid_gcode1/gcode_oneline-0.0350.drill.gcode index 63f6a2d..4e978bd 100644 --- a/tests/golden/hid_gcode1/gcode_oneline-0.0350.drill.gcode +++ b/tests/golden/hid_gcode1/gcode_oneline-0.0350.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 17:31:54 2010 ) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-2.000000 (drill depth) +( Sun Nov 13 16:33:40 2011 ) +(Unit: inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#102=-0.002000 (drill depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 -G81 X27.940000 Y12.700000 Z#101 R#100 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 +G0 Z#100 +G81 X1.100000 Y0.500000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode1/gcode_oneline-bottom.gcode b/tests/golden/hid_gcode1/gcode_oneline-bottom.gcode index 2031270..d8f7d01 100644 --- a/tests/golden/hid_gcode1/gcode_oneline-bottom.gcode +++ b/tests/golden/hid_gcode1/gcode_oneline-bottom.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 17:31:54 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X27.770667 Y13.546667 (start point) +G0 X1.093333 Y0.530000 (start point) G1 Z#101 -G1 X27.559000 Y13.462000 -G1 X27.305000 Y13.292667 -G1 X7.450667 Y13.292667 -G1 X7.196667 Y13.081000 -G1 X6.985000 Y12.827000 -G1 X6.985000 Y12.530667 -G1 X7.196667 Y12.276667 -G1 X7.450667 Y12.065000 -G1 X27.305000 Y12.065000 -G1 X27.643667 Y11.853333 -G1 X28.194000 Y11.853333 -G1 X28.532667 Y12.065000 -G1 X28.744333 Y12.403667 -G1 X28.744333 Y12.954000 -G1 X28.532667 Y13.292667 -G1 X28.194000 Y13.504333 -G1 X27.770667 Y13.546667 +G1 X1.083333 Y0.525000 +G1 X1.076667 Y0.520000 +G1 X0.291667 Y0.518333 +G1 X0.280000 Y0.506667 +G1 X0.280000 Y0.491667 +G1 X0.291667 Y0.480000 +G1 X1.076667 Y0.478333 +G1 X1.088333 Y0.470000 +G1 X1.100000 Y0.468333 +G1 X1.113333 Y0.471667 +G1 X1.123333 Y0.480000 +G1 X1.130000 Y0.493333 +G1 X1.130000 Y0.505000 +G1 X1.123333 Y0.518333 +G1 X1.115000 Y0.525000 +G1 X1.103333 Y0.530000 +G1 X1.093333 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode1/gcode_oneline-top.gcode b/tests/golden/hid_gcode1/gcode_oneline-top.gcode index afd6cb2..6aca656 100644 --- a/tests/golden/hid_gcode1/gcode_oneline-top.gcode +++ b/tests/golden/hid_gcode1/gcode_oneline-top.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 17:31:51 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X22.733000 Y13.546667 (start point) +G0 X0.895000 Y0.530000 (start point) G1 Z#101 -G1 X22.521333 Y13.462000 -G1 X22.267333 Y13.292667 -G1 X2.413000 Y13.292667 -G1 X2.159000 Y13.081000 -G1 X1.947333 Y12.827000 -G1 X1.947333 Y12.530667 -G1 X2.159000 Y12.276667 -G1 X2.413000 Y12.065000 -G1 X22.267333 Y12.065000 -G1 X22.606000 Y11.853333 -G1 X23.156333 Y11.853333 -G1 X23.495000 Y12.065000 -G1 X23.706667 Y12.403667 -G1 X23.706667 Y12.954000 -G1 X23.495000 Y13.292667 -G1 X23.156333 Y13.504333 -G1 X22.733000 Y13.546667 +G1 X0.885000 Y0.525000 +G1 X0.878333 Y0.520000 +G1 X0.093333 Y0.518333 +G1 X0.081667 Y0.506667 +G1 X0.081667 Y0.491667 +G1 X0.093333 Y0.480000 +G1 X0.878333 Y0.478333 +G1 X0.890000 Y0.470000 +G1 X0.901667 Y0.468333 +G1 X0.915000 Y0.471667 +G1 X0.925000 Y0.480000 +G1 X0.931667 Y0.493333 +G1 X0.931667 Y0.505000 +G1 X0.925000 Y0.518333 +G1 X0.916667 Y0.525000 +G1 X0.905000 Y0.530000 +G1 X0.895000 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode10/gcode_oneline-0.8890.drill.gcode b/tests/golden/hid_gcode10/gcode_oneline-0.8890.drill.gcode index 7deace0..8ddf366 100644 --- a/tests/golden/hid_gcode10/gcode_oneline-0.8890.drill.gcode +++ b/tests/golden/hid_gcode10/gcode_oneline-0.8890.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 17:45:32 2010 ) +( Sun Nov 13 16:33:41 2011 ) (Unit: mm) (Board size: 50.80x25.40 mm) #100=0.002000 (safe Z) -#101=-0.002000 (drill depth) +#102=-0.002000 (drill depth) (---------------------------------) G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 -G81 X27.940000 Y12.700000 Z#101 R#100 +G0 Z#100 +G81 X27.940000 Y12.700000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode10/gcode_oneline-bottom.gcode b/tests/golden/hid_gcode10/gcode_oneline-bottom.gcode index 19a703d..3c4f9da 100644 --- a/tests/golden/hid_gcode10/gcode_oneline-bottom.gcode +++ b/tests/golden/hid_gcode10/gcode_oneline-bottom.gcode @@ -1,7 +1,8 @@ (Created by G-code exporter) -( Tue Mar 9 17:45:32 2010 ) +( Sun Nov 13 16:33:41 2011 ) (600 dpi) (Unit: mm) +(Tool diameter: 0.000200 mm) (Board size: 50.80x25.40 mm) #100=0.002000 (safe Z) #101=-0.000050 (cutting depth) diff --git a/tests/golden/hid_gcode10/gcode_oneline-top.gcode b/tests/golden/hid_gcode10/gcode_oneline-top.gcode index a1d48bd..de9db0c 100644 --- a/tests/golden/hid_gcode10/gcode_oneline-top.gcode +++ b/tests/golden/hid_gcode10/gcode_oneline-top.gcode @@ -1,7 +1,8 @@ (Created by G-code exporter) -( Tue Mar 9 17:45:28 2010 ) +( Sun Nov 13 16:33:41 2011 ) (600 dpi) (Unit: mm) +(Tool diameter: 0.000200 mm) (Board size: 50.80x25.40 mm) #100=0.002000 (safe Z) #101=-0.000050 (cutting depth) diff --git a/tests/golden/hid_gcode11/gcode_oneline-0.0350.drill.gcode b/tests/golden/hid_gcode11/gcode_oneline-0.0350.drill.gcode index 37b9668..a857934 100644 --- a/tests/golden/hid_gcode11/gcode_oneline-0.0350.drill.gcode +++ b/tests/golden/hid_gcode11/gcode_oneline-0.0350.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 17:45:55 2010 ) +( Sun Nov 13 16:33:41 2011 ) (Unit: inch) (Board size: 2.00x1.00 inches) #100=2.000000 (safe Z) -#101=-2.000000 (drill depth) +#102=-2.000000 (drill depth) (---------------------------------) G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 -G81 X1.100000 Y0.500000 Z#101 R#100 +G0 Z#100 +G81 X1.100000 Y0.500000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode11/gcode_oneline-bottom.gcode b/tests/golden/hid_gcode11/gcode_oneline-bottom.gcode index c144b05..cb47417 100644 --- a/tests/golden/hid_gcode11/gcode_oneline-bottom.gcode +++ b/tests/golden/hid_gcode11/gcode_oneline-bottom.gcode @@ -1,7 +1,8 @@ (Created by G-code exporter) -( Tue Mar 9 17:45:55 2010 ) +( Sun Nov 13 16:33:41 2011 ) (600 dpi) (Unit: inch) +(Tool diameter: 0.200000 inch) (Board size: 2.00x1.00 inches) #100=2.000000 (safe Z) #101=-0.050000 (cutting depth) diff --git a/tests/golden/hid_gcode11/gcode_oneline-top.gcode b/tests/golden/hid_gcode11/gcode_oneline-top.gcode index ddf7394..9a74775 100644 --- a/tests/golden/hid_gcode11/gcode_oneline-top.gcode +++ b/tests/golden/hid_gcode11/gcode_oneline-top.gcode @@ -1,7 +1,8 @@ (Created by G-code exporter) -( Tue Mar 9 17:45:43 2010 ) +( Sun Nov 13 16:33:41 2011 ) (600 dpi) (Unit: inch) +(Tool diameter: 0.200000 inch) (Board size: 2.00x1.00 inches) #100=2.000000 (safe Z) #101=-0.050000 (cutting depth) diff --git a/tests/golden/hid_gcode2/out-0.0350.drill.gcode b/tests/golden/hid_gcode2/out-0.0350.drill.gcode index f7c6d78..4e978bd 100644 --- a/tests/golden/hid_gcode2/out-0.0350.drill.gcode +++ b/tests/golden/hid_gcode2/out-0.0350.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 17:35:19 2010 ) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-2.000000 (drill depth) +( Sun Nov 13 16:33:40 2011 ) +(Unit: inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#102=-0.002000 (drill depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 -G81 X27.940000 Y12.700000 Z#101 R#100 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 +G0 Z#100 +G81 X1.100000 Y0.500000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode2/out-bottom.gcode b/tests/golden/hid_gcode2/out-bottom.gcode index c3b0526..d8f7d01 100644 --- a/tests/golden/hid_gcode2/out-bottom.gcode +++ b/tests/golden/hid_gcode2/out-bottom.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 17:35:19 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X27.770667 Y13.546667 (start point) +G0 X1.093333 Y0.530000 (start point) G1 Z#101 -G1 X27.559000 Y13.462000 -G1 X27.305000 Y13.292667 -G1 X7.450667 Y13.292667 -G1 X7.196667 Y13.081000 -G1 X6.985000 Y12.827000 -G1 X6.985000 Y12.530667 -G1 X7.196667 Y12.276667 -G1 X7.450667 Y12.065000 -G1 X27.305000 Y12.065000 -G1 X27.643667 Y11.853333 -G1 X28.194000 Y11.853333 -G1 X28.532667 Y12.065000 -G1 X28.744333 Y12.403667 -G1 X28.744333 Y12.954000 -G1 X28.532667 Y13.292667 -G1 X28.194000 Y13.504333 -G1 X27.770667 Y13.546667 +G1 X1.083333 Y0.525000 +G1 X1.076667 Y0.520000 +G1 X0.291667 Y0.518333 +G1 X0.280000 Y0.506667 +G1 X0.280000 Y0.491667 +G1 X0.291667 Y0.480000 +G1 X1.076667 Y0.478333 +G1 X1.088333 Y0.470000 +G1 X1.100000 Y0.468333 +G1 X1.113333 Y0.471667 +G1 X1.123333 Y0.480000 +G1 X1.130000 Y0.493333 +G1 X1.130000 Y0.505000 +G1 X1.123333 Y0.518333 +G1 X1.115000 Y0.525000 +G1 X1.103333 Y0.530000 +G1 X1.093333 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode2/out-top.gcode b/tests/golden/hid_gcode2/out-top.gcode index ca2b079..6aca656 100644 --- a/tests/golden/hid_gcode2/out-top.gcode +++ b/tests/golden/hid_gcode2/out-top.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 17:35:16 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X22.733000 Y13.546667 (start point) +G0 X0.895000 Y0.530000 (start point) G1 Z#101 -G1 X22.521333 Y13.462000 -G1 X22.267333 Y13.292667 -G1 X2.413000 Y13.292667 -G1 X2.159000 Y13.081000 -G1 X1.947333 Y12.827000 -G1 X1.947333 Y12.530667 -G1 X2.159000 Y12.276667 -G1 X2.413000 Y12.065000 -G1 X22.267333 Y12.065000 -G1 X22.606000 Y11.853333 -G1 X23.156333 Y11.853333 -G1 X23.495000 Y12.065000 -G1 X23.706667 Y12.403667 -G1 X23.706667 Y12.954000 -G1 X23.495000 Y13.292667 -G1 X23.156333 Y13.504333 -G1 X22.733000 Y13.546667 +G1 X0.885000 Y0.525000 +G1 X0.878333 Y0.520000 +G1 X0.093333 Y0.518333 +G1 X0.081667 Y0.506667 +G1 X0.081667 Y0.491667 +G1 X0.093333 Y0.480000 +G1 X0.878333 Y0.478333 +G1 X0.890000 Y0.470000 +G1 X0.901667 Y0.468333 +G1 X0.915000 Y0.471667 +G1 X0.925000 Y0.480000 +G1 X0.931667 Y0.493333 +G1 X0.931667 Y0.505000 +G1 X0.925000 Y0.518333 +G1 X0.916667 Y0.525000 +G1 X0.905000 Y0.530000 +G1 X0.895000 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode3/gcode_oneline-0.0350.drill.gcode b/tests/golden/hid_gcode3/gcode_oneline-0.0350.drill.gcode index e7be01d..4e978bd 100644 --- a/tests/golden/hid_gcode3/gcode_oneline-0.0350.drill.gcode +++ b/tests/golden/hid_gcode3/gcode_oneline-0.0350.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 17:36:04 2010 ) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-2.000000 (drill depth) +( Sun Nov 13 16:33:40 2011 ) +(Unit: inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#102=-0.002000 (drill depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 -G81 X27.940000 Y12.700000 Z#101 R#100 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 +G0 Z#100 +G81 X1.100000 Y0.500000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode3/gcode_oneline-bottom.gcode b/tests/golden/hid_gcode3/gcode_oneline-bottom.gcode index e67b085..e066761 100644 --- a/tests/golden/hid_gcode3/gcode_oneline-bottom.gcode +++ b/tests/golden/hid_gcode3/gcode_oneline-bottom.gcode @@ -1,40 +1,41 @@ (Created by G-code exporter) -( Tue Mar 9 17:36:04 2010 ) +( Sun Nov 13 16:33:40 2011 ) (1200 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X27.813000 Y13.546667 (start point) +G0 X1.095000 Y0.530000 (start point) G1 Z#101 -G1 X27.664833 Y13.504333 -G1 X27.453167 Y13.398500 -G1 X27.326167 Y13.292667 -G1 X7.535333 Y13.292667 -G1 X7.323667 Y13.229167 -G1 X7.069667 Y12.975167 -G1 X7.006167 Y12.763500 -G1 X7.006167 Y12.615333 -G1 X7.069667 Y12.403667 -G1 X7.323667 Y12.149667 -G1 X7.535333 Y12.086167 -G1 X27.326167 Y12.086167 -G1 X27.495500 Y11.959167 -G1 X27.728333 Y11.853333 -G1 X28.130500 Y11.853333 -G1 X28.448000 Y12.001500 -G1 X28.638500 Y12.213167 -G1 X28.765500 Y12.488333 -G1 X28.765500 Y12.890500 -G1 X28.638500 Y13.165667 -G1 X28.448000 Y13.377333 -G1 X28.130500 Y13.525500 -G1 X27.813000 Y13.546667 +G1 X1.088333 Y0.527500 +G1 X1.081667 Y0.524167 +G1 X1.078333 Y0.520000 +G1 X0.297500 Y0.520000 +G1 X0.290833 Y0.518333 +G1 X0.280833 Y0.508333 +G1 X0.279167 Y0.501667 +G1 X0.279167 Y0.497500 +G1 X0.280833 Y0.490833 +G1 X0.290833 Y0.480833 +G1 X0.297500 Y0.479167 +G1 X1.078333 Y0.479167 +G1 X1.082500 Y0.474167 +G1 X1.092500 Y0.470000 +G1 X1.106667 Y0.470000 +G1 X1.115833 Y0.474167 +G1 X1.125000 Y0.482500 +G1 X1.129167 Y0.492500 +G1 X1.129167 Y0.506667 +G1 X1.125000 Y0.516667 +G1 X1.115833 Y0.525000 +G1 X1.106667 Y0.529167 +G1 X1.095000 Y0.530000 G0 Z#100 -(polygon end, distance 45.35) -(end, total distance 45.35mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode3/gcode_oneline-top.gcode b/tests/golden/hid_gcode3/gcode_oneline-top.gcode index d7c8c9f..77fa466 100644 --- a/tests/golden/hid_gcode3/gcode_oneline-top.gcode +++ b/tests/golden/hid_gcode3/gcode_oneline-top.gcode @@ -1,40 +1,41 @@ (Created by G-code exporter) -( Tue Mar 9 17:35:46 2010 ) +( Sun Nov 13 16:33:40 2011 ) (1200 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X22.754167 Y13.546667 (start point) +G0 X0.895833 Y0.530000 (start point) G1 Z#101 -G1 X22.606000 Y13.504333 -G1 X22.394333 Y13.398500 -G1 X22.267333 Y13.292667 -G1 X2.476500 Y13.292667 -G1 X2.264833 Y13.229167 -G1 X2.010833 Y12.975167 -G1 X1.947333 Y12.763500 -G1 X1.947333 Y12.615333 -G1 X2.010833 Y12.403667 -G1 X2.264833 Y12.149667 -G1 X2.476500 Y12.086167 -G1 X22.267333 Y12.086167 -G1 X22.436667 Y11.959167 -G1 X22.669500 Y11.853333 -G1 X23.071667 Y11.853333 -G1 X23.389167 Y12.001500 -G1 X23.579667 Y12.213167 -G1 X23.706667 Y12.488333 -G1 X23.706667 Y12.890500 -G1 X23.579667 Y13.165667 -G1 X23.389167 Y13.377333 -G1 X23.071667 Y13.525500 -G1 X22.754167 Y13.546667 +G1 X0.889167 Y0.527500 +G1 X0.882500 Y0.524167 +G1 X0.879167 Y0.520000 +G1 X0.098333 Y0.520000 +G1 X0.091667 Y0.518333 +G1 X0.081667 Y0.508333 +G1 X0.080000 Y0.501667 +G1 X0.080000 Y0.497500 +G1 X0.081667 Y0.490833 +G1 X0.091667 Y0.480833 +G1 X0.098333 Y0.479167 +G1 X0.879167 Y0.479167 +G1 X0.883333 Y0.474167 +G1 X0.893333 Y0.470000 +G1 X0.907500 Y0.470000 +G1 X0.916667 Y0.474167 +G1 X0.925833 Y0.482500 +G1 X0.930000 Y0.492500 +G1 X0.930000 Y0.506667 +G1 X0.925833 Y0.516667 +G1 X0.916667 Y0.525000 +G1 X0.907500 Y0.529167 +G1 X0.895833 Y0.530000 G0 Z#100 -(polygon end, distance 45.35) -(end, total distance 45.35mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode4/gcode_oneline-0.0350.drill.gcode b/tests/golden/hid_gcode4/gcode_oneline-0.0350.drill.gcode index c648655..4e978bd 100644 --- a/tests/golden/hid_gcode4/gcode_oneline-0.0350.drill.gcode +++ b/tests/golden/hid_gcode4/gcode_oneline-0.0350.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 17:36:12 2010 ) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-2.000000 (drill depth) +( Sun Nov 13 16:33:40 2011 ) +(Unit: inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#102=-0.002000 (drill depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 -G81 X27.940000 Y12.700000 Z#101 R#100 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 +G0 Z#100 +G81 X1.100000 Y0.500000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode4/gcode_oneline-bottom.gcode b/tests/golden/hid_gcode4/gcode_oneline-bottom.gcode index d049972..7a4cf41 100644 --- a/tests/golden/hid_gcode4/gcode_oneline-bottom.gcode +++ b/tests/golden/hid_gcode4/gcode_oneline-bottom.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 17:36:12 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=5.000000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=0.005000 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X27.770667 Y13.546667 (start point) +G0 X1.093333 Y0.530000 (start point) G1 Z#101 -G1 X27.559000 Y13.462000 -G1 X27.305000 Y13.292667 -G1 X7.450667 Y13.292667 -G1 X7.196667 Y13.081000 -G1 X6.985000 Y12.827000 -G1 X6.985000 Y12.530667 -G1 X7.196667 Y12.276667 -G1 X7.450667 Y12.065000 -G1 X27.305000 Y12.065000 -G1 X27.643667 Y11.853333 -G1 X28.194000 Y11.853333 -G1 X28.532667 Y12.065000 -G1 X28.744333 Y12.403667 -G1 X28.744333 Y12.954000 -G1 X28.532667 Y13.292667 -G1 X28.194000 Y13.504333 -G1 X27.770667 Y13.546667 +G1 X1.083333 Y0.525000 +G1 X1.076667 Y0.520000 +G1 X0.291667 Y0.518333 +G1 X0.280000 Y0.506667 +G1 X0.280000 Y0.491667 +G1 X0.291667 Y0.480000 +G1 X1.076667 Y0.478333 +G1 X1.088333 Y0.470000 +G1 X1.100000 Y0.468333 +G1 X1.113333 Y0.471667 +G1 X1.123333 Y0.480000 +G1 X1.130000 Y0.493333 +G1 X1.130000 Y0.505000 +G1 X1.123333 Y0.518333 +G1 X1.115000 Y0.525000 +G1 X1.103333 Y0.530000 +G1 X1.093333 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode4/gcode_oneline-top.gcode b/tests/golden/hid_gcode4/gcode_oneline-top.gcode index 78e64a5..9a83d97 100644 --- a/tests/golden/hid_gcode4/gcode_oneline-top.gcode +++ b/tests/golden/hid_gcode4/gcode_oneline-top.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 17:36:08 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=5.000000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=0.005000 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X22.733000 Y13.546667 (start point) +G0 X0.895000 Y0.530000 (start point) G1 Z#101 -G1 X22.521333 Y13.462000 -G1 X22.267333 Y13.292667 -G1 X2.413000 Y13.292667 -G1 X2.159000 Y13.081000 -G1 X1.947333 Y12.827000 -G1 X1.947333 Y12.530667 -G1 X2.159000 Y12.276667 -G1 X2.413000 Y12.065000 -G1 X22.267333 Y12.065000 -G1 X22.606000 Y11.853333 -G1 X23.156333 Y11.853333 -G1 X23.495000 Y12.065000 -G1 X23.706667 Y12.403667 -G1 X23.706667 Y12.954000 -G1 X23.495000 Y13.292667 -G1 X23.156333 Y13.504333 -G1 X22.733000 Y13.546667 +G1 X0.885000 Y0.525000 +G1 X0.878333 Y0.520000 +G1 X0.093333 Y0.518333 +G1 X0.081667 Y0.506667 +G1 X0.081667 Y0.491667 +G1 X0.093333 Y0.480000 +G1 X0.878333 Y0.478333 +G1 X0.890000 Y0.470000 +G1 X0.901667 Y0.468333 +G1 X0.915000 Y0.471667 +G1 X0.925000 Y0.480000 +G1 X0.931667 Y0.493333 +G1 X0.931667 Y0.505000 +G1 X0.925000 Y0.518333 +G1 X0.916667 Y0.525000 +G1 X0.905000 Y0.530000 +G1 X0.895000 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode5/gcode_oneline-0.0350.drill.gcode b/tests/golden/hid_gcode5/gcode_oneline-0.0350.drill.gcode index 77d8d60..da70a5b 100644 --- a/tests/golden/hid_gcode5/gcode_oneline-0.0350.drill.gcode +++ b/tests/golden/hid_gcode5/gcode_oneline-0.0350.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 18:06:42 2010 ) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=10.000000 (safe Z) -#101=-2.000000 (drill depth) +( Sun Nov 13 16:33:40 2011 ) +(Unit: inch) +(Board size: 2.00x1.00 inches) +#100=0.010000 (safe Z) +#102=-0.002000 (drill depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 -G81 X27.940000 Y12.700000 Z#101 R#100 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 +G0 Z#100 +G81 X1.100000 Y0.500000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode5/gcode_oneline-bottom.gcode b/tests/golden/hid_gcode5/gcode_oneline-bottom.gcode index 8041f98..40aa456 100644 --- a/tests/golden/hid_gcode5/gcode_oneline-bottom.gcode +++ b/tests/golden/hid_gcode5/gcode_oneline-bottom.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 18:06:42 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=10.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.010000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X27.770667 Y13.546667 (start point) +G0 X1.093333 Y0.530000 (start point) G1 Z#101 -G1 X27.559000 Y13.462000 -G1 X27.305000 Y13.292667 -G1 X7.450667 Y13.292667 -G1 X7.196667 Y13.081000 -G1 X6.985000 Y12.827000 -G1 X6.985000 Y12.530667 -G1 X7.196667 Y12.276667 -G1 X7.450667 Y12.065000 -G1 X27.305000 Y12.065000 -G1 X27.643667 Y11.853333 -G1 X28.194000 Y11.853333 -G1 X28.532667 Y12.065000 -G1 X28.744333 Y12.403667 -G1 X28.744333 Y12.954000 -G1 X28.532667 Y13.292667 -G1 X28.194000 Y13.504333 -G1 X27.770667 Y13.546667 +G1 X1.083333 Y0.525000 +G1 X1.076667 Y0.520000 +G1 X0.291667 Y0.518333 +G1 X0.280000 Y0.506667 +G1 X0.280000 Y0.491667 +G1 X0.291667 Y0.480000 +G1 X1.076667 Y0.478333 +G1 X1.088333 Y0.470000 +G1 X1.100000 Y0.468333 +G1 X1.113333 Y0.471667 +G1 X1.123333 Y0.480000 +G1 X1.130000 Y0.493333 +G1 X1.130000 Y0.505000 +G1 X1.123333 Y0.518333 +G1 X1.115000 Y0.525000 +G1 X1.103333 Y0.530000 +G1 X1.093333 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode5/gcode_oneline-top.gcode b/tests/golden/hid_gcode5/gcode_oneline-top.gcode index e3bbd7e..07819ff 100644 --- a/tests/golden/hid_gcode5/gcode_oneline-top.gcode +++ b/tests/golden/hid_gcode5/gcode_oneline-top.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 18:06:40 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=10.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.010000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X22.733000 Y13.546667 (start point) +G0 X0.895000 Y0.530000 (start point) G1 Z#101 -G1 X22.521333 Y13.462000 -G1 X22.267333 Y13.292667 -G1 X2.413000 Y13.292667 -G1 X2.159000 Y13.081000 -G1 X1.947333 Y12.827000 -G1 X1.947333 Y12.530667 -G1 X2.159000 Y12.276667 -G1 X2.413000 Y12.065000 -G1 X22.267333 Y12.065000 -G1 X22.606000 Y11.853333 -G1 X23.156333 Y11.853333 -G1 X23.495000 Y12.065000 -G1 X23.706667 Y12.403667 -G1 X23.706667 Y12.954000 -G1 X23.495000 Y13.292667 -G1 X23.156333 Y13.504333 -G1 X22.733000 Y13.546667 +G1 X0.885000 Y0.525000 +G1 X0.878333 Y0.520000 +G1 X0.093333 Y0.518333 +G1 X0.081667 Y0.506667 +G1 X0.081667 Y0.491667 +G1 X0.093333 Y0.480000 +G1 X0.878333 Y0.478333 +G1 X0.890000 Y0.470000 +G1 X0.901667 Y0.468333 +G1 X0.915000 Y0.471667 +G1 X0.925000 Y0.480000 +G1 X0.931667 Y0.493333 +G1 X0.931667 Y0.505000 +G1 X0.925000 Y0.518333 +G1 X0.916667 Y0.525000 +G1 X0.905000 Y0.530000 +G1 X0.895000 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode6/gcode_oneline-0.0350.drill.gcode b/tests/golden/hid_gcode6/gcode_oneline-0.0350.drill.gcode index 6b44265..4e978bd 100644 --- a/tests/golden/hid_gcode6/gcode_oneline-0.0350.drill.gcode +++ b/tests/golden/hid_gcode6/gcode_oneline-0.0350.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 17:45:05 2010 ) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-2.000000 (drill depth) +( Sun Nov 13 16:33:40 2011 ) +(Unit: inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#102=-0.002000 (drill depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 -G81 X27.940000 Y12.700000 Z#101 R#100 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 +G0 Z#100 +G81 X1.100000 Y0.500000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode6/gcode_oneline-bottom.gcode b/tests/golden/hid_gcode6/gcode_oneline-bottom.gcode index 7d33799..5440510 100644 --- a/tests/golden/hid_gcode6/gcode_oneline-bottom.gcode +++ b/tests/golden/hid_gcode6/gcode_oneline-bottom.gcode @@ -1,43 +1,39 @@ (Created by G-code exporter) -( Tue Mar 9 17:45:05 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.030000 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X0.000000 Y25.400000 (start point) +G0 X1.091667 Y0.545000 (start point) G1 Z#101 -G1 X0.000000 Y0.000000 -G1 X37.295667 Y0.000000 -G1 X38.057667 Y0.635000 -G1 X39.073667 Y1.524000 -G1 X39.962667 Y2.540000 -G1 X40.597667 Y3.302000 -G1 X41.486667 Y4.656667 -G1 X41.952333 Y5.503333 -G1 X42.418000 Y6.477000 -G1 X42.883667 Y7.704667 -G1 X43.264667 Y9.017000 -G1 X43.518667 Y10.329333 -G1 X43.645667 Y11.514667 -G1 X43.645667 Y13.843000 -G1 X43.518667 Y15.028333 -G1 X43.264667 Y16.340667 -G1 X42.883667 Y17.653000 -G1 X42.418000 Y18.880667 -G1 X41.952333 Y19.854333 -G1 X41.486667 Y20.701000 -G1 X40.597667 Y22.055667 -G1 X39.962667 Y22.817667 -G1 X39.073667 Y23.833667 -G1 X38.057667 Y24.722667 -G1 X37.253333 Y25.400000 -G1 X0.000000 Y25.400000 +G1 X1.080000 Y0.540000 +G1 X1.071667 Y0.535000 +G1 X0.291667 Y0.535000 +G1 X0.278333 Y0.528333 +G1 X0.268333 Y0.516667 +G1 X0.263333 Y0.505000 +G1 X0.263333 Y0.491667 +G1 X0.270000 Y0.478333 +G1 X0.281667 Y0.468333 +G1 X0.293333 Y0.463333 +G1 X1.071667 Y0.463333 +G1 X1.086667 Y0.455000 +G1 X1.111667 Y0.455000 +G1 X1.125000 Y0.461667 +G1 X1.135000 Y0.470000 +G1 X1.143333 Y0.486667 +G1 X1.143333 Y0.511667 +G1 X1.135000 Y0.528333 +G1 X1.125000 Y0.536667 +G1 X1.111667 Y0.543333 +G1 X1.091667 Y0.545000 G0 Z#100 -(polygon end, distance 129.45) -(end, total distance 129.45mm = 5.10in) +(polygon end, distance 1.86) +(end, total distance 47.25mm = 1.86in) M5 M9 M2 diff --git a/tests/golden/hid_gcode6/gcode_oneline-top.gcode b/tests/golden/hid_gcode6/gcode_oneline-top.gcode index 7dfd6a0..c9cd5e6 100644 --- a/tests/golden/hid_gcode6/gcode_oneline-top.gcode +++ b/tests/golden/hid_gcode6/gcode_oneline-top.gcode @@ -1,43 +1,39 @@ (Created by G-code exporter) -( Tue Mar 9 17:39:31 2010 ) +( Sun Nov 13 16:33:40 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.030000 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X0.000000 Y25.400000 (start point) +G0 X0.893333 Y0.545000 (start point) G1 Z#101 -G1 X0.000000 Y0.000000 -G1 X32.258000 Y0.000000 -G1 X33.020000 Y0.635000 -G1 X34.036000 Y1.524000 -G1 X34.925000 Y2.540000 -G1 X35.560000 Y3.302000 -G1 X36.449000 Y4.656667 -G1 X36.914667 Y5.503333 -G1 X37.380333 Y6.477000 -G1 X37.846000 Y7.704667 -G1 X38.227000 Y9.017000 -G1 X38.481000 Y10.329333 -G1 X38.608000 Y11.514667 -G1 X38.608000 Y13.843000 -G1 X38.481000 Y15.028333 -G1 X38.227000 Y16.340667 -G1 X37.846000 Y17.653000 -G1 X37.380333 Y18.880667 -G1 X36.914667 Y19.854333 -G1 X36.449000 Y20.701000 -G1 X35.560000 Y22.055667 -G1 X34.925000 Y22.817667 -G1 X34.036000 Y23.833667 -G1 X33.020000 Y24.722667 -G1 X32.215667 Y25.400000 -G1 X0.000000 Y25.400000 +G1 X0.881667 Y0.540000 +G1 X0.873333 Y0.535000 +G1 X0.093333 Y0.535000 +G1 X0.080000 Y0.528333 +G1 X0.070000 Y0.516667 +G1 X0.065000 Y0.505000 +G1 X0.065000 Y0.491667 +G1 X0.071667 Y0.478333 +G1 X0.083333 Y0.468333 +G1 X0.095000 Y0.463333 +G1 X0.873333 Y0.463333 +G1 X0.888333 Y0.455000 +G1 X0.913333 Y0.455000 +G1 X0.926667 Y0.461667 +G1 X0.936667 Y0.470000 +G1 X0.945000 Y0.486667 +G1 X0.945000 Y0.511667 +G1 X0.936667 Y0.528333 +G1 X0.926667 Y0.536667 +G1 X0.913333 Y0.543333 +G1 X0.893333 Y0.545000 G0 Z#100 -(polygon end, distance 119.38) -(end, total distance 119.38mm = 4.70in) +(polygon end, distance 1.86) +(end, total distance 47.25mm = 1.86in) M5 M9 M2 diff --git a/tests/golden/hid_gcode7/gcode_oneline-0.0350.drill.gcode b/tests/golden/hid_gcode7/gcode_oneline-0.0350.drill.gcode index e8c41bf..1edd7fb 100644 --- a/tests/golden/hid_gcode7/gcode_oneline-0.0350.drill.gcode +++ b/tests/golden/hid_gcode7/gcode_oneline-0.0350.drill.gcode @@ -1,12 +1,13 @@ (Created by G-code exporter) (drill file: 1 drills) -( Tue Mar 9 17:45:12 2010 ) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=70.000000 (drill depth) +( Sun Nov 13 16:33:41 2011 ) +(Unit: inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#102=0.070000 (drill depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 -G81 X27.940000 Y12.700000 Z#101 R#100 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 +G0 Z#100 +G81 X1.100000 Y0.500000 Z#102 R#100 M5 M9 M2 (end, total distance 0.00mm = 0.00in) diff --git a/tests/golden/hid_gcode7/gcode_oneline-bottom.gcode b/tests/golden/hid_gcode7/gcode_oneline-bottom.gcode index b92e532..10719a2 100644 --- a/tests/golden/hid_gcode7/gcode_oneline-bottom.gcode +++ b/tests/golden/hid_gcode7/gcode_oneline-bottom.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 17:45:12 2010 ) +( Sun Nov 13 16:33:41 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting depth) +(Unit: inch) +(Tool diameter: 0.000200 inch) +(Board size: 2.00x1.00 inches) +#100=0.002000 (safe Z) +#101=-0.000050 (cutting depth) (---------------------------------) -G17 G21 G90 G64 P0.003 M3 S3000 M7 F25 +G17 G20 G90 G64 P0.003 M3 S3000 M7 F1 G0 Z#100 (polygon 1) -G0 X27.770667 Y13.546667 (start point) +G0 X1.093333 Y0.530000 (start point) G1 Z#101 -G1 X27.559000 Y13.462000 -G1 X27.305000 Y13.292667 -G1 X7.450667 Y13.292667 -G1 X7.196667 Y13.081000 -G1 X6.985000 Y12.827000 -G1 X6.985000 Y12.530667 -G1 X7.196667 Y12.276667 -G1 X7.450667 Y12.065000 -G1 X27.305000 Y12.065000 -G1 X27.643667 Y11.853333 -G1 X28.194000 Y11.853333 -G1 X28.532667 Y12.065000 -G1 X28.744333 Y12.403667 -G1 X28.744333 Y12.954000 -G1 X28.532667 Y13.292667 -G1 X28.194000 Y13.504333 -G1 X27.770667 Y13.546667 +G1 X1.083333 Y0.525000 +G1 X1.076667 Y0.520000 +G1 X0.291667 Y0.518333 +G1 X0.280000 Y0.506667 +G1 X0.280000 Y0.491667 +G1 X0.291667 Y0.480000 +G1 X1.076667 Y0.478333 +G1 X1.088333 Y0.470000 +G1 X1.100000 Y0.468333 +G1 X1.113333 Y0.471667 +G1 X1.123333 Y0.480000 +G1 X1.130000 Y0.493333 +G1 X1.130000 Y0.505000 +G1 X1.123333 Y0.518333 +G1 X1.115000 Y0.525000 +G1 X1.103333 Y0.530000 +G1 X1.093333 Y0.530000 G0 Z#100 -(polygon end, distance 45.38) -(end, total distance 45.38mm = 1.79in) +(polygon end, distance 1.77) +(end, total distance 44.84mm = 1.77in) M5 M9 M2 diff --git a/tests/golden/hid_gcode7/gcode_oneline-top.gcode b/tests/golden/hid_gcode7/gcode_oneline-top.gcode index 4c64804..369c625 100644 --- a/tests/golden/hid_gcode7/gcode_oneline-top.gcode +++ b/tests/golden/hid_gcode7/gcode_oneline-top.gcode @@ -1,34 +1,35 @@ (Created by G-code exporter) -( Tue Mar 9 17:45:08 2010 ) +( Sun Nov 13 16:33:41 2011 ) (600 dpi) -(Unit: mm) -(Board size: 50.80x25.40 mm) -#100=2.000000 (safe Z) -#101=-0.050000 (cutting dep... [truncated message content] |
From: <gi...@gp...> - 2011-11-16 18:27:21
|
The branch, master has been updated via 48b13a7ef095b479235c69b08c57bac74e81b3b6 (commit) from 658e2517d906c0d925a643b91bde006fce81c57b (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/file.c | 10 ++++++++-- src/set.c | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) ================= Commit Messages ================= commit 48b13a7ef095b479235c69b08c57bac74e81b3b6 Author: Andrew Poelstra (local) <apo...@wp...> Commit: Andrew Poelstra (local) <apo...@wp...> Add attribute PCB::grid::size for user's grid setting This stores the grid size using pcb-printf for full precision; the ordinary value in Grid[] needs to be in cmils for backward compatibility, so it cannot store metric settings correctly. :100644 100644 99ba274... 501b735... M src/file.c :100644 100644 1f86adb... 5712bca... M src/set.c ========= Changes ========= commit 48b13a7ef095b479235c69b08c57bac74e81b3b6 Author: Andrew Poelstra (local) <apo...@wp...> Commit: Andrew Poelstra (local) <apo...@wp...> Add attribute PCB::grid::size for user's grid setting This stores the grid size using pcb-printf for full precision; the ordinary value in Grid[] needs to be in cmils for backward compatibility, so it cannot store metric settings correctly. diff --git a/src/file.c b/src/file.c index 99ba274..501b735 100644 --- a/src/file.c +++ b/src/file.c @@ -390,7 +390,7 @@ set_some_route_style () static int real_load_pcb (char *Filename, bool revert) { - const char *unit_suffix; + const char *unit_suffix, *grid_size; char *new_filename; PCBTypePtr newPCB = CreateNewPCB (false); PCBTypePtr oldPCB; @@ -447,6 +447,12 @@ real_load_pcb (char *Filename, bool revert) Settings.grid_unit = new_unit; } AttributePut (PCB, "PCB::grid::unit", Settings.grid_unit->suffix); + /* Use attribute PCB::grid::size as size, if we can */ + grid_size = AttributeGet (PCB, "PCB::grid::size"); + if (grid_size) + { + PCB->Grid = GetValue (grid_size, NULL, NULL); + } sort_netlist (); @@ -601,7 +607,7 @@ WritePCBDataHeader (FILE * FP) fputs ("\nPCB[", FP); PrintQuotedString (FP, (char *)EMPTY (PCB->Name)); pcb_fprintf (FP, " %mr %mr]\n\n", PCB->MaxWidth, PCB->MaxHeight); - pcb_fprintf (FP, "Grid[%.1mr %mr %mr %d]\n", PCB->Grid, PCB->GridOffsetX, PCB->GridOffsetY, Settings.DrawGrid); + pcb_fprintf (FP, "Grid[%s %mr %mr %d]\n", c_dtostr (COORD_TO_MIL (PCB->Grid) * 100), PCB->GridOffsetX, PCB->GridOffsetY, Settings.DrawGrid); pcb_fprintf (FP, "Cursor[%mr %mr %s]\n", Crosshair.X, Crosshair.Y, c_dtostr (PCB->Zoom)); /* PolyArea should be output in square cmils, no suffix */ diff --git a/src/set.c b/src/set.c index 1f86adb..5712bca 100644 --- a/src/set.c +++ b/src/set.c @@ -71,6 +71,7 @@ static int mode_stack[MAX_MODESTACK_DEPTH]; void SetGrid (Coord Grid, bool align) { + char *grid_string; if (Grid >= 1 && Grid <= MAX_GRID) { if (align) @@ -79,6 +80,10 @@ SetGrid (Coord Grid, bool align) PCB->GridOffsetY = Crosshair.Y % Grid; } PCB->Grid = Grid; + grid_string = pcb_g_strdup_printf ("%mr", Grid); + if (grid_string) + AttributePut (PCB, "PCB::grid::size", grid_string); + g_free (grid_string); if (Settings.DrawGrid) Redraw (); } |
From: <gi...@gp...> - 2011-11-13 21:32:09
|
The branch, master has been updated via 658e2517d906c0d925a643b91bde006fce81c57b (commit) from 4474f788581363491a39eb2e7f30fe13a1814cde (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/pcb-printf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ================= Commit Messages ================= commit 658e2517d906c0d925a643b91bde006fce81c57b Author: Richard Barlow <ri...@ri...> Commit: DJ Delorie <dj...@de...> Fix parsing of route styles with units A bug appeared after route styles started being saved with units suffixed. When loading a PCB file the units were ignored and therefore it was assumed the values were in cmils. This was a problem in the get_unit_struct() function which didn't handle long strings well. If the unit was followed by more characters strcmp would return non-zero. The function has already worked out the length of the unit text and therefore strncmp should be used. :100644 100644 c57a570... f687e06... M src/pcb-printf.c ========= Changes ========= commit 658e2517d906c0d925a643b91bde006fce81c57b Author: Richard Barlow <ri...@ri...> Commit: DJ Delorie <dj...@de...> Fix parsing of route styles with units A bug appeared after route styles started being saved with units suffixed. When loading a PCB file the units were ignored and therefore it was assumed the values were in cmils. This was a problem in the get_unit_struct() function which didn't handle long strings well. If the unit was followed by more characters strcmp would return non-zero. The function has already worked out the length of the unit text and therefore strncmp should be used. diff --git a/src/pcb-printf.c b/src/pcb-printf.c index c57a570..f687e06 100644 --- a/src/pcb-printf.c +++ b/src/pcb-printf.c @@ -182,10 +182,10 @@ const Unit *get_unit_struct (const char *const_suffix) } /* Do lookup */ - if (*suffix) + if (*suffix && s_len > 0) for (i = 0; i < N_UNITS; ++i) - if (strcmp (suffix, Units[i].suffix) == 0 || - strcmp (suffix, Units[i].alias[0]) == 0) + if (strncmp (suffix, Units[i].suffix, s_len) == 0 || + strncmp (suffix, Units[i].alias[0], s_len) == 0) { g_free (m_suffix); return &Units[i]; |
From: <gi...@gp...> - 2011-11-06 22:35:17
|
The branch, master has been updated via 4474f788581363491a39eb2e7f30fe13a1814cde (commit) via f3da7f10fda1580c8de59d6a9447a7323d258b50 (commit) from 9eede495c51ccf920224a5d93cdac763726921b4 (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 ========= lib/geda.inc | 1 + src/hid/ps/ps.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ================= Commit Messages ================= commit 4474f788581363491a39eb2e7f30fe13a1814cde Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Add 4-pin DIP Add DIP4 to the collection of standard DIP packages :100644 100644 a56b6ea... d25dd1d... M lib/geda.inc commit f3da7f10fda1580c8de59d6a9447a7323d258b50 Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Fix postscript alignment marks The delta-x and delta-y parameters of corner() are scales, not coordinates. Change them to "int" so the +1/-1 won't get scaled to zero. :100644 100644 8e29fd5... 6ecbc64... M src/hid/ps/ps.c ========= Changes ========= commit 4474f788581363491a39eb2e7f30fe13a1814cde Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Add 4-pin DIP Add DIP4 to the collection of standard DIP packages diff --git a/lib/geda.inc b/lib/geda.inc index a56b6ea..d25dd1d 100644 --- a/lib/geda.inc +++ b/lib/geda.inc @@ -13,6 +13,7 @@ ## Dual in-line package, narrow (300 mil) # DIP6 .. DIP64, DIP24N, DIP28N # +define(`PKG_DIP4', `PKG_N(`$1', `$2', `$3', 4, 300)'); define(`PKG_DIP6', `PKG_N(`$1', `$2', `$3', 6, 300)'); define(`PKG_DIP8', `PKG_N(`$1', `$2', `$3', 8, 300)'); define(`PKG_DIP14', `PKG_N(`$1', `$2', `$3', 14, 300)'); commit f3da7f10fda1580c8de59d6a9447a7323d258b50 Author: DJ Delorie <dj...@de...> Commit: DJ Delorie <dj...@de...> Fix postscript alignment marks The delta-x and delta-y parameters of corner() are scales, not coordinates. Change them to "int" so the +1/-1 won't get scaled to zero. diff --git a/src/hid/ps/ps.c b/src/hid/ps/ps.c index 8e29fd5..6ecbc64 100644 --- a/src/hid/ps/ps.c +++ b/src/hid/ps/ps.c @@ -761,7 +761,7 @@ ps_parse_arguments (int *argc, char ***argv) } static void -corner (FILE *fh, Coord x, Coord y, Coord dx, Coord dy) +corner (FILE *fh, Coord x, Coord y, int dx, int dy) { Coord len = MIL_TO_COORD (2000); Coord len2 = MIL_TO_COORD (200); @@ -775,7 +775,7 @@ corner (FILE *fh, Coord x, Coord y, Coord dx, Coord dy) * of the thick line. */ - pcb_fprintf (fh, "gsave %mi setlinewidth %mi %mi translate %mi %mi scale\n", + pcb_fprintf (fh, "gsave %mi setlinewidth %mi %mi translate %d %d scale\n", thick * 2, x, y, dx, dy); pcb_fprintf (fh, "%mi %mi moveto %mi %mi %mi 0 90 arc %mi %mi lineto\n", len, thick, thick, thick, len2 + thick, thick, len); |
From: <gi...@gp...> - 2011-11-02 20:29:31
|
The branch, master has been updated via 9eede495c51ccf920224a5d93cdac763726921b4 (commit) via 530710fc2c8e75e9c9b0a45cf16d13abda760987 (commit) via d400c61139d3b729103f18ada67e1b39c6931249 (commit) via db3ee42f204c0d8b711ac72f4c3dff16b01827ad (commit) from f60343f00fa3bccb0c212409e64dbaef96801d53 (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/gcode/gcode.c | 47 ++++++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 17 deletions(-) ================= Commit Messages ================= commit 9eede495c51ccf920224a5d93cdac763726921b4 Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: use drill cycles only for advanced G-code. Not all machine controllers understand drill cycles, so a more common denominatior is needed. Gladly, almost all the code was there in comments already. Affects-bug: lp-699497 :100644 100644 17b8b1f... d9f2ec1... M src/hid/gcode/gcode.c commit 530710fc2c8e75e9c9b0a45cf16d13abda760987 Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: simplify code a bit. This is mostly for additional code coming soon. Affects-bug: lp-699497 :100644 100644 6b45f66... 17b8b1f... M src/hid/gcode/gcode.c commit d400c61139d3b729103f18ada67e1b39c6931249 Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: add a comment about the tool diameter into the G-code file. Affects-bug: lp-699497 :100644 100644 e45b21c... 6b45f66... M src/hid/gcode/gcode.c commit db3ee42f204c0d8b711ac72f4c3dff16b01827ad Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: switch from tool-radius to tool-diameter in the user interface. Affects-bug: lp-699497 :100644 100644 740b1ca... e45b21c... M src/hid/gcode/gcode.c ========= Changes ========= commit 9eede495c51ccf920224a5d93cdac763726921b4 Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: use drill cycles only for advanced G-code. Not all machine controllers understand drill cycles, so a more common denominatior is needed. Gladly, almost all the code was there in comments already. Affects-bug: lp-699497 diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index 17b8b1f..d9f2ec1 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -176,7 +176,7 @@ HID_Attribute gcode_attribute_list[] = { #define HA_unit 6 {"advanced-gcode", "wether to produce G-code for advanced interpreters,\n" - "like using variables for often used values. Not all\n" + "like using variables or drill cycles. Not all\n" "machine controllers understand this, but it allows\n" "better hand-editing of the resulting files", HID_Boolean, 0, 0, {-1, 0, 0}, 0, 0}, @@ -633,7 +633,7 @@ gcode_do_export (HID_Attr_Val * options) fprintf (gcode_f2, "G17\nG%d\nG90\nG64 P0.003\nM3 S3000\nM7\nF%d\n", metric ? 21 : 20, metric ? 25 : 1); } -/* fprintf(gcode_f2,"G0 Z%s\n",variable_safeZ); */ + fprintf (gcode_f2, "G0 Z%s\n", variable_safeZ); for (r = 0; r < n_drill; r++) { double drillX, drillY; @@ -648,11 +648,15 @@ gcode_do_export (HID_Attr_Val * options) drillX = drill[r].x; drillY = drill[r].y; } -/* fprintf(gcode_f2,"G0 X%f Y%f\n",drillX,drillY); */ - fprintf (gcode_f2, "G81 X%f Y%f Z%s R%s\n", - drillX, drillY, variable_drilldepth, variable_safeZ); -/* fprintf(gcode_f2,"G1 Z%s\n",variable_depth); */ -/* fprintf(gcode_f2,"G0 Z%s\n",variable_safeZ); */ + if (gcode_advanced) + fprintf (gcode_f2, "G81 X%f Y%f Z%s R%s\n", drillX, drillY, + variable_drilldepth, variable_safeZ); + else + { + fprintf (gcode_f2, "G0 X%f Y%f\n", drillX, drillY); + fprintf (gcode_f2, "G1 Z%s\n", variable_drilldepth); + fprintf (gcode_f2, "G0 Z%s\n", variable_safeZ); + } if (r > 0) d += sqrt ((drill[r].x - drill[r - 1].x) * (drill[r].x - commit 530710fc2c8e75e9c9b0a45cf16d13abda760987 Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: simplify code a bit. This is mostly for additional code coming soon. Affects-bug: lp-699497 diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index 6b45f66..17b8b1f 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -636,16 +636,21 @@ gcode_do_export (HID_Attr_Val * options) /* fprintf(gcode_f2,"G0 Z%s\n",variable_safeZ); */ for (r = 0; r < n_drill; r++) { -/* if(metric) fprintf(gcode_f2,"G0 X%f Y%f\n",drill[r].x*25.4,drill[r].y*25.4); */ -/* else fprintf(gcode_f2,"G0 X%f Y%f\n",drill[r].x,drill[r].y); */ + double drillX, drillY; + if (metric) - fprintf (gcode_f2, "G81 X%f Y%f Z%s R%s\n", - drill[r].x * 25.4, drill[r].y * 25.4, - variable_drilldepth, variable_safeZ); + { + drillX = drill[r].x * 25.4; + drillY = drill[r].y * 25.4; + } else - fprintf (gcode_f2, "G81 X%f Y%f Z%s R%s\n", - drill[r].x, drill[r].y, - variable_drilldepth, variable_safeZ); + { + drillX = drill[r].x; + drillY = drill[r].y; + } +/* fprintf(gcode_f2,"G0 X%f Y%f\n",drillX,drillY); */ + fprintf (gcode_f2, "G81 X%f Y%f Z%s R%s\n", + drillX, drillY, variable_drilldepth, variable_safeZ); /* fprintf(gcode_f2,"G1 Z%s\n",variable_depth); */ /* fprintf(gcode_f2,"G0 Z%s\n",variable_safeZ); */ if (r > 0) commit d400c61139d3b729103f18ada67e1b39c6931249 Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: add a comment about the tool diameter into the G-code file. Affects-bug: lp-699497 diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index e45b21c..6b45f66 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -122,7 +122,7 @@ static int gcode_dpi = -1; static double gcode_cutdepth = 0; /* milling depth (inch) */ static double gcode_drilldepth = 0; /* drilling depth (inch) */ static double gcode_safeZ = 100; /* safe Z (inch) */ -static double gcode_toolradius = 0; /* tool radius(inch) */ +static double gcode_toolradius = 0; /* tool radius (1/100 mil) */ static char gcode_advanced = 0; static int save_drill = 0; static int n_drill = 0; @@ -543,6 +543,9 @@ gcode_do_export (HID_Attr_Val * options) fprintf (gcode_f2, "( %s )\n", filename); fprintf (gcode_f2, "(%d dpi)\n", gcode_dpi); fprintf (gcode_f2, "(Unit: %s)\n", metric ? "mm" : "inch"); + fprintf (gcode_f2, "(Tool diameter: %f %s)\n", + options[HA_tooldiameter].real_value * scale, + metric ? "mm" : "inch"); if (metric) pcb_fprintf (gcode_f2, "(Board size: %.2mmx%.2mm mm)", PCB->MaxWidth, PCB->MaxHeight); else commit db3ee42f204c0d8b711ac72f4c3dff16b01827ad Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: switch from tool-radius to tool-diameter in the user interface. Affects-bug: lp-699497 diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index 740b1ca..e45b21c 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -162,9 +162,10 @@ HID_Attribute gcode_attribute_list[] = { HID_Real, -1000, 10000, {0, 0, 2}, 0, 0}, #define HA_safeZ 3 - {"tool-radius", "Milling tool radius compensation", - HID_Real, 0, 10000, {0, 0, 0.1}, 0, 0}, -#define HA_toolradius 4 + {"tool-diameter", "Milling tool diameter, or twice the offset of the\n" + "G-code track from the resulting copper track", + HID_Real, 0, 10000, {0, 0, 0.2}, 0, 0}, +#define HA_tooldiameter 4 {"drill-depth", "Drilling depth", HID_Real, -10000, 10000, {0, 0, -2}, 0, 0}, @@ -458,8 +459,8 @@ gcode_do_export (HID_Attr_Val * options) gcode_drilldepth = options[HA_drilldepth].real_value * scale; gcode_safeZ = options[HA_safeZ].real_value * scale; gcode_toolradius = metric - ? MM_TO_COORD(options[HA_toolradius].real_value * scale) - : INCH_TO_COORD(options[HA_toolradius].real_value * scale); + ? MM_TO_COORD(options[HA_tooldiameter].real_value / 2 * scale) + : INCH_TO_COORD(options[HA_tooldiameter].real_value / 2 * scale); gcode_advanced = options[HA_advanced].int_value; gcode_choose_groups (); if (gcode_advanced) |
From: <gi...@gp...> - 2011-10-26 21:36:02
|
The branch, master has been updated via f60343f00fa3bccb0c212409e64dbaef96801d53 (commit) from 0374e23c9a4c6d6039c2ade3fa97fb9bff9bed21 (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/insert.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ================= Commit Messages ================= commit f60343f00fa3bccb0c212409e64dbaef96801d53 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Fix computation of 45-degree edges when inserting a point into an edge Fixes a few mistakes introduced in commit b59ab044afe3ac362f8cb4da10ea410280b4323a which was bisected to and identified as the cuplrit by Gabriel Paubert. Reported-by: Gabriel Paubert <pa...@ir...> :100644 100644 514754f... 42661ec... M src/insert.c ========= Changes ========= commit f60343f00fa3bccb0c212409e64dbaef96801d53 Author: Peter Clifton <pc...@ca...> Commit: Peter Clifton <pc...@ca...> Fix computation of 45-degree edges when inserting a point into an edge Fixes a few mistakes introduced in commit b59ab044afe3ac362f8cb4da10ea410280b4323a which was bisected to and identified as the cuplrit by Gabriel Paubert. Reported-by: Gabriel Paubert <pa...@ir...> diff --git a/src/insert.c b/src/insert.c index 514754f..42661ec 100644 --- a/src/insert.c +++ b/src/insert.c @@ -275,7 +275,7 @@ AdjustInsertPoint (void) m1 = 2; /* 2 signals infinite slope */ else { - m = (double) (Crosshair.X - line->Point1.X) / (Crosshair.Y - line->Point1.Y); + m = (double) (Crosshair.Y - line->Point1.Y) / (Crosshair.X - line->Point1.X); m1 = 0; if (m > TAN_30_DEGREE) m1 = (m > TAN_60_DEGREE) ? 2 : 1; @@ -286,7 +286,7 @@ AdjustInsertPoint (void) m2 = 2; /* 2 signals infinite slope */ else { - m = (double) (Crosshair.X - line->Point1.X) / (Crosshair.Y - line->Point1.Y); + m = (double) (Crosshair.Y - line->Point2.Y) / (Crosshair.X - line->Point2.X); m2 = 0; if (m > TAN_30_DEGREE) m2 = (m > TAN_60_DEGREE) ? 2 : 1; |
From: <gi...@gp...> - 2011-10-23 20:16:51
|
The branch, master has been updated via 0374e23c9a4c6d6039c2ade3fa97fb9bff9bed21 (commit) from 4b37816d8a624fdac5dafa20aaf3d3188c555215 (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/gcode/gcode.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ================= Commit Messages ================= commit 0374e23c9a4c6d6039c2ade3fa97fb9bff9bed21 Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: remove a leftover debug-printf. Affects-bug: lp-699497 :100644 100644 a5a6dcb... 740b1ca... M src/hid/gcode/gcode.c ========= Changes ========= commit 0374e23c9a4c6d6039c2ade3fa97fb9bff9bed21 Author: Markus Hitter <ma...@ju...> Commit: Felix Ruoff <Fe...@po...> HID-gcode: remove a leftover debug-printf. Affects-bug: lp-699497 diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c index a5a6dcb..740b1ca 100644 --- a/src/hid/gcode/gcode.c +++ b/src/hid/gcode/gcode.c @@ -484,7 +484,6 @@ gcode_do_export (HID_Attr_Val * options) /* magic */ idx = (i >= 0 && i < max_group) ? PCB->LayerGroups.Entries[i][0] : i; - printf ("idx=%d %s\n", idx, layer_type_to_file_name (idx, FNS_fixed)); is_solder = (GetLayerGroupNumberByNumber (idx) == GetLayerGroupNumberByNumber (solder_silk_layer)) ? 1 : 0; |