Date:2012-01-11 12:21:21 (12 years 2 months ago)
Author:Wolfgang Spraul
Commit:0bdf904a561a23226dc5a1b95f2beac55fb4bc58
Message:updated patchset to kicad rev 3351 (current head)

Files: kicad-patches/cmdline-common.patch (5 diffs)
kicad-patches/cmdline-eeschema.patch (9 diffs)
kicad-patches/cmdline-new.patch (4 diffs)
kicad-patches/cmdline-pcbnew.patch (14 diffs)
kicad-patches/series (1 diff)

Change Details

kicad-patches/cmdline-common.patch
11diff -ru kicad.orig/include/appl_wxstruct.h kicad/include/appl_wxstruct.h
2+++ kicad/include/appl_wxstruct.h 2012-01-04 00:58:00.447684901 +0100
2--- kicad.orig/include/appl_wxstruct.h 2012-01-11 12:02:53.707180000 +0100
33@@ -52,6 +52,7 @@
44 class wxSingleInstanceChecker;
55 class wxHtmlHelpController;
...... 
1919      * Function SetLanguage
2020      * sets the dictionary file name for internationalization.
2121diff -ru kicad.orig/include/wxBasePcbFrame.h kicad/include/wxBasePcbFrame.h
22+++ kicad/include/wxBasePcbFrame.h 2012-01-11 11:06:46.974797876 +0100
23@@ -520,6 +520,7 @@
22--- kicad.orig/include/wxBasePcbFrame.h 2012-01-11 12:02:53.707180000 +0100
23@@ -517,6 +517,7 @@
2424
2525     bool ExportToDxfFile( const wxString& aFullFileName,
2626                           int aLayer,
27+ bool aPlotOriginIsAuxAxis,
28                           GRTraceMode aTraceMode );
27+ bool aPlotOriginIsAuxAxis,
28                           EDA_DRAW_MODE_T aTraceMode );
2929
30     void Plot_Layer( PLOTTER* plotter,
30     void Plot_Layer( PLOTTER* plotter,
3131diff -ru kicad.orig/include/wxEeschemaStruct.h kicad/include/wxEeschemaStruct.h
32+++ kicad/include/wxEeschemaStruct.h 2012-01-04 02:04:17.560214904 +0100
33@@ -585,6 +585,8 @@
32--- kicad.orig/include/wxEeschemaStruct.h 2012-01-11 12:02:53.707180000 +0100
33@@ -593,6 +593,8 @@
3434     void SVG_Print( wxCommandEvent& event );
3535
3636     // Plot functions:
...... 
4242     void ToPlot_HPGL( wxCommandEvent& event );
4343     void ToPlot_DXF( wxCommandEvent& event );
4444diff -ru kicad.orig/include/wxPcbStruct.h kicad/include/wxPcbStruct.h
45+++ kicad/include/wxPcbStruct.h 2012-01-10 17:49:51.848114042 +0100
45--- kicad.orig/include/wxPcbStruct.h 2012-01-11 12:02:53.707180000 +0100
4646@@ -75,6 +75,7 @@
4747 class PCB_EDIT_FRAME : public PCB_BASE_FRAME
4848 {
...... 
5353     void updateTraceWidthSelectBox();
5454     void updateViaSizeSelectBox();
5555diff -ru kicad.orig/common/confirm.cpp kicad/common/confirm.cpp
56+++ kicad/common/confirm.cpp 2012-01-04 00:59:04.412020890 +0100
56--- kicad.orig/common/confirm.cpp 2012-01-11 12:02:53.707180000 +0100
5757@@ -9,11 +9,18 @@
5858 #include "wx/html/htmlwin.h"
5959 #include "html_messagebox.h"
...... 
101101     dlg->AddHTML_Text( text );
102102     dlg->ShowModal();
103103diff -ru kicad.orig/common/edaappl.cpp kicad/common/edaappl.cpp
104+++ kicad/common/edaappl.cpp 2012-01-04 00:58:45.466217466 +0100
104--- kicad.orig/common/edaappl.cpp 2012-01-11 12:02:53.707180000 +0100
105105@@ -306,6 +306,7 @@
106106     wxString EnvLang;
107107
kicad-patches/cmdline-eeschema.patch
11diff -ru kicad.orig/eeschema/CMakeLists.txt kicad/eeschema/CMakeLists.txt
2+++ kicad/eeschema/CMakeLists.txt 2012-01-04 00:55:02.169540766 +0100
2--- kicad.orig/eeschema/CMakeLists.txt 2012-01-11 12:02:53.707180000 +0100
33@@ -78,6 +78,7 @@
44     eeredraw.cpp
55     eeschema.cpp
...... 
1010     events_called_functions_for_edit.cpp
1111     files-io.cpp
1212diff -ru kicad.orig/eeschema/dialogs/dialog_build_BOM.h kicad/eeschema/dialogs/dialog_build_BOM.h
13+++ kicad/eeschema/dialogs/dialog_build_BOM.h 2012-01-04 01:04:19.481832883 +0100
13--- kicad.orig/eeschema/dialogs/dialog_build_BOM.h 2012-01-11 12:02:53.707180000 +0100
1414@@ -17,6 +17,7 @@
1515
1616 class DIALOG_BUILD_BOM : public DIALOG_BUILD_BOM_BASE
...... 
2121     EDA_DRAW_FRAME* m_Parent;
2222     wxConfig* m_Config;
2323diff -ru kicad.orig/eeschema/dialogs/dialog_erc.cpp kicad/eeschema/dialogs/dialog_erc.cpp
24+++ kicad/eeschema/dialogs/dialog_erc.cpp 2012-01-10 23:17:59.518338725 +0100
24--- kicad.orig/eeschema/dialogs/dialog_erc.cpp 2012-01-11 12:02:53.707180000 +0100
2525@@ -574,10 +574,10 @@
2626                           _( "Electronic rule check file (.erc)|*.erc" ),
2727                           wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
...... 
3737             Close( true );
3838             ExecuteFile( this, wxGetApp().GetEditorName(), QuoteFullPath( fn ) );
3939diff -ru kicad.orig/eeschema/dialogs/dialog_erc.h kicad/eeschema/dialogs/dialog_erc.h
40+++ kicad/eeschema/dialogs/dialog_erc.h 2012-01-04 01:03:05.419550431 +0100
40--- kicad.orig/eeschema/dialogs/dialog_erc.h 2012-01-11 12:02:53.707180000 +0100
4141@@ -29,6 +29,7 @@
4242
4343 class DIALOG_ERC : public DIALOG_ERC_BASE
...... 
4848
4949 private:
5050diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_DXF.cpp kicad/eeschema/dialogs/dialog_plot_schematic_DXF.cpp
51+++ kicad/eeschema/dialogs/dialog_plot_schematic_DXF.cpp 2012-01-04 02:05:43.305394193 +0100
51--- kicad.orig/eeschema/dialogs/dialog_plot_schematic_DXF.cpp 2012-01-11 12:02:53.707180000 +0100
5252@@ -42,6 +42,7 @@
5353
5454 class DIALOG_PLOT_SCHEMATIC_DXF : public DIALOG_PLOT_SCHEMATIC_DXF_BASE
...... 
7575 {
7676     DIALOG_PLOT_SCHEMATIC_DXF DXF_frame( this );
7777diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_PS.cpp kicad/eeschema/dialogs/dialog_plot_schematic_PS.cpp
78+++ kicad/eeschema/dialogs/dialog_plot_schematic_PS.cpp 2012-01-04 01:20:57.415188192 +0100
78--- kicad.orig/eeschema/dialogs/dialog_plot_schematic_PS.cpp 2012-01-11 12:02:53.707180000 +0100
7979@@ -48,6 +48,7 @@
8080
8181 class DIALOG_PLOT_SCHEMATIC_PS : public DIALOG_PLOT_SCHEMATIC_PS_BASE
...... 
8585 private:
8686     SCH_EDIT_FRAME* m_Parent;
8787
88@@ -79,6 +80,15 @@
88@@ -80,6 +81,15 @@
8989 bool DIALOG_PLOT_SCHEMATIC_PS::m_plot_Sheet_Ref = true;
9090
9191
...... 
102102 {
103103     DIALOG_PLOT_SCHEMATIC_PS dlg( this );
104104diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.cpp kicad/eeschema/dialogs/dialog_SVG_print.cpp
105+++ kicad/eeschema/dialogs/dialog_SVG_print.cpp 2012-01-10 23:20:13.888411068 +0100
105--- kicad.orig/eeschema/dialogs/dialog_SVG_print.cpp 2012-01-11 12:02:53.707180000 +0100
106106@@ -53,6 +53,13 @@
107107 static bool s_Print_Frame_Ref = true;
108108 static int s_PlotBlackAndWhite = 0;
...... 
119119 /*!
120120  * DIALOG_SVG_PRINT functions
121121diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.h kicad/eeschema/dialogs/dialog_SVG_print.h
122+++ kicad/eeschema/dialogs/dialog_SVG_print.h 2012-01-04 01:03:17.627432139 +0100
123@@ -12,6 +12,7 @@
124
125 class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base
126 {
127+friend void CmdLinePrintSVGDoc( EDA_DRAW_FRAME* frame, bool aPrintAll, bool aPrint_Sheet_Ref, bool aPrintBlackAndWhite );
128 private:
129     EDA_DRAW_FRAME* m_Parent;
130     wxConfig* m_Config;
122--- kicad.orig/eeschema/dialogs/dialog_SVG_print.h 2012-01-11 12:02:53.707180000 +0100
123@@ -11,6 +11,8 @@
124
125 class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base
126 {
127+friend void CmdLinePrintSVGDoc( EDA_DRAW_FRAME* frame, bool aPrintAll, bool aPrint_Sheet_Ref, bool aPrintBlackAndWhite );
128+ private:
129 private:
130     EDA_DRAW_FRAME* m_Parent;
131     wxConfig* m_Config;
131132diff -ru kicad.orig/eeschema/eeschema.cpp kicad/eeschema/eeschema.cpp
132+++ kicad/eeschema/eeschema.cpp 2012-01-04 01:05:55.083907033 +0100
133--- kicad.orig/eeschema/eeschema.cpp 2012-01-11 12:02:53.707180000 +0100
133134@@ -41,6 +41,7 @@
134135 #include "hotkeys.h"
135136 #include "dialogs/dialog_color_config.h"
kicad-patches/cmdline-new.patch
11--- /dev/null 2012-01-06 01:10:09.493787641 +0100
2+++ kicad/eeschema/eeschema_cmdline.h 2012-01-04 00:55:43.066114352 +0100
32@@ -0,0 +1,14 @@
43+/////////////////////////////////////////////////////////////////////////////
54+// Name: eeschema_cmdline.h
...... 
1616+
1717+extern EESCHEMA_CMDLINE g_EESchemaCmdLine;
1818--- /dev/null 2012-01-06 01:10:09.493787641 +0100
19+++ kicad/eeschema/eeschema_cmdline.cpp 2012-01-10 16:33:11.565978324 +0100
2019@@ -0,0 +1,233 @@
2120+/////////////////////////////////////////////////////////////////////////////
2221+// Name: eeschema_cmdline.cpp
...... 
252252+ return true;
253253+}
254254--- /dev/null 2012-01-06 01:10:09.493787641 +0100
255+++ kicad/pcbnew/pcbnew_cmdline.h 2012-01-04 00:59:32.003734758 +0100
256255@@ -0,0 +1,7 @@
257256+/////////////////////////////////////////////////////////////////////////////
258257+// Name: pcbnew_cmdline.h
...... 
262262+
263263+bool Pcbnew_CmdLine();
264264--- /dev/null 2012-01-06 01:10:09.493787641 +0100
265+++ kicad/pcbnew/pcbnew_cmdline.cpp 2012-01-11 11:18:27.603953821 +0100
266265@@ -0,0 +1,526 @@
267266+/////////////////////////////////////////////////////////////////////////////
268267+// Name: pcbnew_cmdline.cpp
kicad-patches/cmdline-pcbnew.patch
11diff -ru kicad.orig/pcbnew/build_BOM_from_board.cpp kicad/pcbnew/build_BOM_from_board.cpp
2+++ kicad/pcbnew/build_BOM_from_board.cpp 2012-01-10 23:23:32.338040998 +0100
2--- kicad.orig/pcbnew/build_BOM_from_board.cpp 2012-01-11 12:02:53.707180000 +0100
33@@ -67,6 +67,7 @@
44     fn = GetScreen()->GetFileName();
55     fn.SetExt( CsvFileExtension );
...... 
1818     FichBom = wxFopen( fn.GetFullPath(), wxT( "wt" ) );
1919
2020diff -ru kicad.orig/pcbnew/CMakeLists.txt kicad/pcbnew/CMakeLists.txt
21+++ kicad/pcbnew/CMakeLists.txt 2012-01-05 01:53:42.424887775 +0100
21--- kicad.orig/pcbnew/CMakeLists.txt 2012-01-11 12:02:53.707180000 +0100
2222@@ -150,6 +150,7 @@
2323     onrightclick.cpp
2424     pcb_plot_params.cpp
...... 
2929     pcbplot.cpp
3030     plotgerb.cpp
3131diff -ru kicad.orig/pcbnew/dialogs/dialog_gendrill.h kicad/pcbnew/dialogs/dialog_gendrill.h
32+++ kicad/pcbnew/dialogs/dialog_gendrill.h 2012-01-05 18:07:15.289119747 +0100
32--- kicad.orig/pcbnew/dialogs/dialog_gendrill.h 2012-01-11 12:02:53.707180000 +0100
3333@@ -33,6 +33,7 @@
3434
3535 class DIALOG_GENDRILL : public DIALOG_GENDRILL_BASE
...... 
4040     static int m_UnitDrillIsInch;
4141     static int m_ZerosFormat;
4242diff -ru kicad.orig/pcbnew/dialogs/dialog_SVG_print.h kicad/pcbnew/dialogs/dialog_SVG_print.h
43+++ kicad/pcbnew/dialogs/dialog_SVG_print.h 2012-01-10 19:40:48.754648647 +0100
43--- kicad.orig/pcbnew/dialogs/dialog_SVG_print.h 2012-01-11 12:02:53.707180000 +0100
4444@@ -13,6 +13,7 @@
4545
4646 class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base
...... 
5151     PCB_BASE_FRAME* m_Parent;
5252     wxConfig* m_Config;
5353diff -ru kicad.orig/pcbnew/drc_stuff.h kicad/pcbnew/drc_stuff.h
54+++ kicad/pcbnew/drc_stuff.h 2012-01-05 18:08:06.047781508 +0100
54--- kicad.orig/pcbnew/drc_stuff.h 2012-01-11 12:02:53.707180000 +0100
5555@@ -146,6 +146,7 @@
5656  */
5757 class DRC
...... 
6262
6363 private:
6464diff -ru kicad.orig/pcbnew/gendrill.cpp kicad/pcbnew/gendrill.cpp
65+++ kicad/pcbnew/gendrill.cpp 2012-01-08 17:26:28.429837548 +0100
65--- kicad.orig/pcbnew/gendrill.cpp 2012-01-11 12:02:53.707180000 +0100
6666@@ -159,8 +159,13 @@
6767                               fn.GetFullName(), wxGetTranslation( DrillFileWildcard ),
6868                               wxFD_SAVE | wxFD_CHANGE_DIR );
...... 
107107     FILE* report_dest = wxFopen( dlg.GetPath(), wxT( "w" ) );
108108
109109diff -ru kicad.orig/pcbnew/gen_modules_placefile.cpp kicad/pcbnew/gen_modules_placefile.cpp
110+++ kicad/pcbnew/gen_modules_placefile.cpp 2012-01-08 18:32:33.547634589 +0100
110--- kicad.orig/pcbnew/gen_modules_placefile.cpp 2012-01-11 12:02:53.707180000 +0100
111111@@ -138,10 +138,10 @@
112112         return;
113113     }
...... 
131131
132132 exit: // the only safe way out of here, no returns please.
133133diff -ru kicad.orig/pcbnew/pcbnew.cpp kicad/pcbnew/pcbnew.cpp
134+++ kicad/pcbnew/pcbnew.cpp 2012-01-05 21:49:03.036099308 +0100
134--- kicad.orig/pcbnew/pcbnew.cpp 2012-01-11 12:02:53.707180000 +0100
135135@@ -44,6 +44,7 @@
136136 #include "pcbnew.h"
137137 #include "protos.h"
...... 
152152
153153     if( m_Checker && m_Checker->IsAnotherRunning() )
154154diff -ru kicad.orig/pcbnew/pcbnew.h kicad/pcbnew/pcbnew.h
155+++ kicad/pcbnew/pcbnew.h 2012-01-05 21:47:10.422652798 +0100
155--- kicad.orig/pcbnew/pcbnew.h 2012-01-11 12:02:53.707180000 +0100
156156@@ -41,6 +41,7 @@
157157 #define FORCE_SKETCH ( IS_DRAGGED | IN_EDIT )
158158
...... 
163163 extern bool g_AutoDeleteOldTrack;
164164 extern bool g_Drag_Pistes_On;
165165diff -ru kicad.orig/pcbnew/pcbplot.cpp kicad/pcbnew/pcbplot.cpp
166+++ kicad/pcbnew/pcbplot.cpp 2012-01-11 11:10:58.453057344 +0100
167@@ -774,6 +774,7 @@
166--- kicad.orig/pcbnew/pcbplot.cpp 2012-01-11 12:02:53.707180000 +0100
167@@ -820,6 +820,7 @@
168168
169169             case PLOT_FORMAT_DXF:
170170                 success = m_Parent->ExportToDxfFile( fn.GetFullPath(), layer,
...... 
174174                 break;
175175             }
176176diff -ru kicad.orig/pcbnew/plotdxf.cpp kicad/pcbnew/plotdxf.cpp
177+++ kicad/pcbnew/plotdxf.cpp 2012-01-11 11:07:41.473420495 +0100
177--- kicad.orig/pcbnew/plotdxf.cpp 2012-01-11 12:02:53.707180000 +0100
178178@@ -16,7 +16,7 @@
179179
180180
181181 bool PCB_BASE_FRAME::ExportToDxfFile( const wxString& aFullFileName, int aLayer,
182- GRTraceMode aTraceMode )
183+ bool aPlotOriginIsAuxAxis, GRTraceMode aTraceMode )
182- EDA_DRAW_MODE_T aTraceMode )
183+ bool aPlotOriginIsAuxAxis, EDA_DRAW_MODE_T aTraceMode )
184184 {
185     Ki_PageDescr* currentsheet = GetScreen()->m_CurrentSheetDesc;
185     LOCALE_IO toggle;
186186
187@@ -27,11 +27,23 @@
187@@ -27,9 +27,21 @@
188188         return false;
189189     }
190190
...... 
193193+
194194+ if( aPlotOriginIsAuxAxis )
195195+ {
196+ offset = m_originAxisPosition;
196+ offset = GetOriginAxisPosition();
197197+ }
198198+ else
199199+ {
...... 
201201+ offset.y = 0;
202202+ }
203203+
204     SetLocaleTo_C_standard();
205
206204     DXF_PLOTTER* plotter = new DXF_PLOTTER();
207     plotter->set_paper_size( currentsheet );
205     plotter->SetPageSettings( GetPageSettings() );
208206- plotter->set_viewport( wxPoint( 0, 0 ), 1, 0 );
209207+ plotter->set_viewport( offset, 1, 0 );
210208     plotter->set_creator( wxT( "PCBNEW-DXF" ) );
211209     plotter->set_filename( aFullFileName );
212210     plotter->start_plot( output_file );
213211diff -ru kicad.orig/pcbnew/xchgmod.cpp kicad/pcbnew/xchgmod.cpp
214+++ kicad/pcbnew/xchgmod.cpp 2012-01-05 21:47:50.531456715 +0100
215@@ -599,6 +599,7 @@
212--- kicad.orig/pcbnew/xchgmod.cpp 2012-01-11 12:02:53.707180000 +0100
213@@ -601,6 +601,7 @@
216214     fn.SetExt( NetCmpExtBuffer );
217215     wildcard = _( "Component files (." ) + NetCmpExtBuffer + wxT( ")|*." ) + NetCmpExtBuffer;
218216
...... 
221219     wxFileDialog dlg( this, _( "Save Component Files" ), wxGetCwd(),
222220                       fn.GetFullName(), wildcard,
223221                       wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
224@@ -607,6 +608,7 @@
222@@ -609,6 +610,7 @@
225223         return;
226224
227225     fn = dlg.GetPath();
kicad-patches/series
1# Based on BZR revision 2448
1# Based on BZR revision 3351
22
33# under discussion
44# fix-pinedit-collision.patch

Archive Download the corresponding diff file

Branches:
master



interactive