qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-19 06:07:10 +02:00
Code

updated patchset to kicad rev 3351 (current head)

Browse Source
This commit is contained in:
Wolfgang Spraul 2012-01-11 12:21:21 +01:00
parent 724ca1e3ec
commit 0bdf904a56
5 changed files with 83 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kicad-patches/cmdline-common.patch
View File

@ -1,6 +1,6 @@
diff -ru kicad.orig/include/appl_wxstruct.h kicad/include/appl_wxstruct.h diff -ru kicad.orig/include/appl_wxstruct.h kicad/include/appl_wxstruct.h
--- kicad.orig/include/appl_wxstruct.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/include/appl_wxstruct.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/include/appl_wxstruct.h 2012-01-04 00:58:00.447684901 +0100 +++ kicad/include/appl_wxstruct.h 2012-01-11 12:05:27.024023137 +0100
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
class wxSingleInstanceChecker; class wxSingleInstanceChecker;
class wxHtmlHelpController; class wxHtmlHelpController;
@ -19,20 +19,20 @@ diff -ru kicad.orig/include/appl_wxstruct.h kicad/include/appl_wxstruct.h
* Function SetLanguage * Function SetLanguage
* sets the dictionary file name for internationalization. * sets the dictionary file name for internationalization.
diff -ru kicad.orig/include/wxBasePcbFrame.h kicad/include/wxBasePcbFrame.h diff -ru kicad.orig/include/wxBasePcbFrame.h kicad/include/wxBasePcbFrame.h
--- kicad.orig/include/wxBasePcbFrame.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/include/wxBasePcbFrame.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/include/wxBasePcbFrame.h 2012-01-11 11:06:46.974797876 +0100 +++ kicad/include/wxBasePcbFrame.h 2012-01-11 12:05:52.898833056 +0100
@@ -520,6 +520,7 @@ @@ -517,6 +517,7 @@
bool ExportToDxfFile( const wxString& aFullFileName, bool ExportToDxfFile( const wxString& aFullFileName,
int aLayer, int aLayer,
+ bool aPlotOriginIsAuxAxis, + bool aPlotOriginIsAuxAxis,
GRTraceMode aTraceMode ); EDA_DRAW_MODE_T aTraceMode );
void Plot_Layer( PLOTTER* plotter, void Plot_Layer( PLOTTER* plotter,
diff -ru kicad.orig/include/wxEeschemaStruct.h kicad/include/wxEeschemaStruct.h diff -ru kicad.orig/include/wxEeschemaStruct.h kicad/include/wxEeschemaStruct.h
--- kicad.orig/include/wxEeschemaStruct.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/include/wxEeschemaStruct.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/include/wxEeschemaStruct.h 2012-01-04 02:04:17.560214904 +0100 +++ kicad/include/wxEeschemaStruct.h 2012-01-11 12:05:27.038023036 +0100
@@ -585,6 +585,8 @@ @@ -593,6 +593,8 @@
void SVG_Print( wxCommandEvent& event ); void SVG_Print( wxCommandEvent& event );
// Plot functions: // Plot functions:
@ -42,8 +42,8 @@ diff -ru kicad.orig/include/wxEeschemaStruct.h kicad/include/wxEeschemaStruct.h
void ToPlot_HPGL( wxCommandEvent& event ); void ToPlot_HPGL( wxCommandEvent& event );
void ToPlot_DXF( wxCommandEvent& event ); void ToPlot_DXF( wxCommandEvent& event );
diff -ru kicad.orig/include/wxPcbStruct.h kicad/include/wxPcbStruct.h diff -ru kicad.orig/include/wxPcbStruct.h kicad/include/wxPcbStruct.h
--- kicad.orig/include/wxPcbStruct.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/include/wxPcbStruct.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/include/wxPcbStruct.h 2012-01-10 17:49:51.848114042 +0100 +++ kicad/include/wxPcbStruct.h 2012-01-11 12:05:27.041023014 +0100
@@ -75,6 +75,7 @@ @@ -75,6 +75,7 @@
class PCB_EDIT_FRAME : public PCB_BASE_FRAME class PCB_EDIT_FRAME : public PCB_BASE_FRAME
{ {
@ -53,8 +53,8 @@ diff -ru kicad.orig/include/wxPcbStruct.h kicad/include/wxPcbStruct.h
void updateTraceWidthSelectBox(); void updateTraceWidthSelectBox();
void updateViaSizeSelectBox(); void updateViaSizeSelectBox();
diff -ru kicad.orig/common/confirm.cpp kicad/common/confirm.cpp diff -ru kicad.orig/common/confirm.cpp kicad/common/confirm.cpp
--- kicad.orig/common/confirm.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/common/confirm.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/common/confirm.cpp 2012-01-04 00:59:04.412020890 +0100 +++ kicad/common/confirm.cpp 2012-01-11 12:05:27.044022991 +0100
@@ -9,11 +9,18 @@ @@ -9,11 +9,18 @@
#include "wx/html/htmlwin.h" #include "wx/html/htmlwin.h"
#include "html_messagebox.h" #include "html_messagebox.h"
@ -101,8 +101,8 @@ diff -ru kicad.orig/common/confirm.cpp kicad/common/confirm.cpp
dlg->AddHTML_Text( text ); dlg->AddHTML_Text( text );
dlg->ShowModal(); dlg->ShowModal();
diff -ru kicad.orig/common/edaappl.cpp kicad/common/edaappl.cpp diff -ru kicad.orig/common/edaappl.cpp kicad/common/edaappl.cpp
--- kicad.orig/common/edaappl.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/common/edaappl.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/common/edaappl.cpp 2012-01-04 00:58:45.466217466 +0100 +++ kicad/common/edaappl.cpp 2012-01-11 12:05:27.045022984 +0100
@@ -306,6 +306,7 @@ @@ -306,6 +306,7 @@
wxString EnvLang; wxString EnvLang;

41
kicad-patches/cmdline-eeschema.patch
View File

@ -1,6 +1,6 @@
diff -ru kicad.orig/eeschema/CMakeLists.txt kicad/eeschema/CMakeLists.txt diff -ru kicad.orig/eeschema/CMakeLists.txt kicad/eeschema/CMakeLists.txt
--- kicad.orig/eeschema/CMakeLists.txt 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/CMakeLists.txt 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/CMakeLists.txt 2012-01-04 00:55:02.169540766 +0100 +++ kicad/eeschema/CMakeLists.txt 2012-01-11 12:06:35.801518000 +0100
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
eeredraw.cpp eeredraw.cpp
eeschema.cpp eeschema.cpp
@ -10,8 +10,8 @@ diff -ru kicad.orig/eeschema/CMakeLists.txt kicad/eeschema/CMakeLists.txt
events_called_functions_for_edit.cpp events_called_functions_for_edit.cpp
files-io.cpp files-io.cpp
diff -ru kicad.orig/eeschema/dialogs/dialog_build_BOM.h kicad/eeschema/dialogs/dialog_build_BOM.h diff -ru kicad.orig/eeschema/dialogs/dialog_build_BOM.h kicad/eeschema/dialogs/dialog_build_BOM.h
--- kicad.orig/eeschema/dialogs/dialog_build_BOM.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/dialogs/dialog_build_BOM.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/dialogs/dialog_build_BOM.h 2012-01-04 01:04:19.481832883 +0100 +++ kicad/eeschema/dialogs/dialog_build_BOM.h 2012-01-11 12:06:35.802517993 +0100
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
class DIALOG_BUILD_BOM : public DIALOG_BUILD_BOM_BASE class DIALOG_BUILD_BOM : public DIALOG_BUILD_BOM_BASE
@ -21,8 +21,8 @@ diff -ru kicad.orig/eeschema/dialogs/dialog_build_BOM.h kicad/eeschema/dialogs/d
EDA_DRAW_FRAME* m_Parent; EDA_DRAW_FRAME* m_Parent;
wxConfig* m_Config; wxConfig* m_Config;
diff -ru kicad.orig/eeschema/dialogs/dialog_erc.cpp kicad/eeschema/dialogs/dialog_erc.cpp diff -ru kicad.orig/eeschema/dialogs/dialog_erc.cpp kicad/eeschema/dialogs/dialog_erc.cpp
--- kicad.orig/eeschema/dialogs/dialog_erc.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/dialogs/dialog_erc.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/dialogs/dialog_erc.cpp 2012-01-10 23:17:59.518338725 +0100 +++ kicad/eeschema/dialogs/dialog_erc.cpp 2012-01-11 12:06:35.813517913 +0100
@@ -574,10 +574,10 @@ @@ -574,10 +574,10 @@
_( "Electronic rule check file (.erc)|*.erc" ), _( "Electronic rule check file (.erc)|*.erc" ),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
@ -37,8 +37,8 @@ diff -ru kicad.orig/eeschema/dialogs/dialog_erc.cpp kicad/eeschema/dialogs/dialo
Close( true ); Close( true );
ExecuteFile( this, wxGetApp().GetEditorName(), QuoteFullPath( fn ) ); ExecuteFile( this, wxGetApp().GetEditorName(), QuoteFullPath( fn ) );
diff -ru kicad.orig/eeschema/dialogs/dialog_erc.h kicad/eeschema/dialogs/dialog_erc.h diff -ru kicad.orig/eeschema/dialogs/dialog_erc.h kicad/eeschema/dialogs/dialog_erc.h
--- kicad.orig/eeschema/dialogs/dialog_erc.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/dialogs/dialog_erc.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/dialogs/dialog_erc.h 2012-01-04 01:03:05.419550431 +0100 +++ kicad/eeschema/dialogs/dialog_erc.h 2012-01-11 12:06:35.815517898 +0100
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
class DIALOG_ERC : public DIALOG_ERC_BASE class DIALOG_ERC : public DIALOG_ERC_BASE
@ -48,8 +48,8 @@ diff -ru kicad.orig/eeschema/dialogs/dialog_erc.h kicad/eeschema/dialogs/dialog_
private: private:
diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_DXF.cpp kicad/eeschema/dialogs/dialog_plot_schematic_DXF.cpp diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_DXF.cpp kicad/eeschema/dialogs/dialog_plot_schematic_DXF.cpp
--- kicad.orig/eeschema/dialogs/dialog_plot_schematic_DXF.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/dialogs/dialog_plot_schematic_DXF.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/dialogs/dialog_plot_schematic_DXF.cpp 2012-01-04 02:05:43.305394193 +0100 +++ kicad/eeschema/dialogs/dialog_plot_schematic_DXF.cpp 2012-01-11 12:06:35.816517891 +0100
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
class DIALOG_PLOT_SCHEMATIC_DXF : public DIALOG_PLOT_SCHEMATIC_DXF_BASE class DIALOG_PLOT_SCHEMATIC_DXF : public DIALOG_PLOT_SCHEMATIC_DXF_BASE
@ -75,8 +75,8 @@ diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_DXF.cpp kicad/eeschem
{ {
DIALOG_PLOT_SCHEMATIC_DXF DXF_frame( this ); DIALOG_PLOT_SCHEMATIC_DXF DXF_frame( this );
diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_PS.cpp kicad/eeschema/dialogs/dialog_plot_schematic_PS.cpp diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_PS.cpp kicad/eeschema/dialogs/dialog_plot_schematic_PS.cpp
--- kicad.orig/eeschema/dialogs/dialog_plot_schematic_PS.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/dialogs/dialog_plot_schematic_PS.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/dialogs/dialog_plot_schematic_PS.cpp 2012-01-04 01:20:57.415188192 +0100 +++ kicad/eeschema/dialogs/dialog_plot_schematic_PS.cpp 2012-01-11 12:06:35.818517877 +0100
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
class DIALOG_PLOT_SCHEMATIC_PS : public DIALOG_PLOT_SCHEMATIC_PS_BASE class DIALOG_PLOT_SCHEMATIC_PS : public DIALOG_PLOT_SCHEMATIC_PS_BASE
@ -85,7 +85,7 @@ diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_PS.cpp kicad/eeschema
private: private:
SCH_EDIT_FRAME* m_Parent; SCH_EDIT_FRAME* m_Parent;
@@ -79,6 +80,15 @@ @@ -80,6 +81,15 @@
bool DIALOG_PLOT_SCHEMATIC_PS::m_plot_Sheet_Ref = true; bool DIALOG_PLOT_SCHEMATIC_PS::m_plot_Sheet_Ref = true;
@ -102,8 +102,8 @@ diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_PS.cpp kicad/eeschema
{ {
DIALOG_PLOT_SCHEMATIC_PS dlg( this ); DIALOG_PLOT_SCHEMATIC_PS dlg( this );
diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.cpp kicad/eeschema/dialogs/dialog_SVG_print.cpp diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.cpp kicad/eeschema/dialogs/dialog_SVG_print.cpp
--- kicad.orig/eeschema/dialogs/dialog_SVG_print.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/dialogs/dialog_SVG_print.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/dialogs/dialog_SVG_print.cpp 2012-01-10 23:20:13.888411068 +0100 +++ kicad/eeschema/dialogs/dialog_SVG_print.cpp 2012-01-11 12:06:35.820517863 +0100
@@ -53,6 +53,13 @@ @@ -53,6 +53,13 @@
static bool s_Print_Frame_Ref = true; static bool s_Print_Frame_Ref = true;
static int s_PlotBlackAndWhite = 0; static int s_PlotBlackAndWhite = 0;
@ -119,19 +119,20 @@ diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.cpp kicad/eeschema/dialogs
/*! /*!
* DIALOG_SVG_PRINT functions * DIALOG_SVG_PRINT functions
diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.h kicad/eeschema/dialogs/dialog_SVG_print.h diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.h kicad/eeschema/dialogs/dialog_SVG_print.h
--- kicad.orig/eeschema/dialogs/dialog_SVG_print.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/dialogs/dialog_SVG_print.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/dialogs/dialog_SVG_print.h 2012-01-04 01:03:17.627432139 +0100 +++ kicad/eeschema/dialogs/dialog_SVG_print.h 2012-01-11 12:07:11.509255882 +0100
@@ -12,6 +12,7 @@ @@ -11,6 +11,8 @@
class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base
{ {
+friend void CmdLinePrintSVGDoc( EDA_DRAW_FRAME* frame, bool aPrintAll, bool aPrint_Sheet_Ref, bool aPrintBlackAndWhite ); +friend void CmdLinePrintSVGDoc( EDA_DRAW_FRAME* frame, bool aPrintAll, bool aPrint_Sheet_Ref, bool aPrintBlackAndWhite );
+ private:
private: private:
EDA_DRAW_FRAME* m_Parent; EDA_DRAW_FRAME* m_Parent;
wxConfig* m_Config; wxConfig* m_Config;
diff -ru kicad.orig/eeschema/eeschema.cpp kicad/eeschema/eeschema.cpp diff -ru kicad.orig/eeschema/eeschema.cpp kicad/eeschema/eeschema.cpp
--- kicad.orig/eeschema/eeschema.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/eeschema/eeschema.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/eeschema/eeschema.cpp 2012-01-04 01:05:55.083907033 +0100 +++ kicad/eeschema/eeschema.cpp 2012-01-11 12:06:35.822517848 +0100
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
#include "hotkeys.h" #include "hotkeys.h"
#include "dialogs/dialog_color_config.h" #include "dialogs/dialog_color_config.h"

8
kicad-patches/cmdline-new.patch
View File

@ -1,5 +1,5 @@
--- /dev/null 2012-01-06 01:10:09.493787641 +0100 --- /dev/null 2012-01-06 01:10:09.493787641 +0100
+++ kicad/eeschema/eeschema_cmdline.h 2012-01-04 00:55:43.066114352 +0100 +++ kicad/eeschema/eeschema_cmdline.h 2012-01-11 12:10:53.288629976 +0100
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+///////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////
+// Name: eeschema_cmdline.h +// Name: eeschema_cmdline.h
@ -16,7 +16,7 @@
+ +
+extern EESCHEMA_CMDLINE g_EESchemaCmdLine; +extern EESCHEMA_CMDLINE g_EESchemaCmdLine;
--- /dev/null 2012-01-06 01:10:09.493787641 +0100 --- /dev/null 2012-01-06 01:10:09.493787641 +0100
+++ kicad/eeschema/eeschema_cmdline.cpp 2012-01-10 16:33:11.565978324 +0100 +++ kicad/eeschema/eeschema_cmdline.cpp 2012-01-11 12:10:53.289629969 +0100
@@ -0,0 +1,233 @@ @@ -0,0 +1,233 @@
+///////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////
+// Name: eeschema_cmdline.cpp +// Name: eeschema_cmdline.cpp
@ -252,7 +252,7 @@
+ return true; + return true;
+} +}
--- /dev/null 2012-01-06 01:10:09.493787641 +0100 --- /dev/null 2012-01-06 01:10:09.493787641 +0100
+++ kicad/pcbnew/pcbnew_cmdline.h 2012-01-04 00:59:32.003734758 +0100 +++ kicad/pcbnew/pcbnew_cmdline.h 2012-01-11 12:10:53.301629883 +0100
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+///////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////
+// Name: pcbnew_cmdline.h +// Name: pcbnew_cmdline.h
@ -262,7 +262,7 @@
+ +
+bool Pcbnew_CmdLine(); +bool Pcbnew_CmdLine();
--- /dev/null 2012-01-06 01:10:09.493787641 +0100 --- /dev/null 2012-01-06 01:10:09.493787641 +0100
+++ kicad/pcbnew/pcbnew_cmdline.cpp 2012-01-11 11:18:27.603953821 +0100 +++ kicad/pcbnew/pcbnew_cmdline.cpp 2012-01-11 12:10:53.303629867 +0100
@@ -0,0 +1,526 @@ @@ -0,0 +1,526 @@
+///////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////
+// Name: pcbnew_cmdline.cpp +// Name: pcbnew_cmdline.cpp

68
kicad-patches/cmdline-pcbnew.patch
View File

@ -1,6 +1,6 @@
diff -ru kicad.orig/pcbnew/build_BOM_from_board.cpp kicad/pcbnew/build_BOM_from_board.cpp diff -ru kicad.orig/pcbnew/build_BOM_from_board.cpp kicad/pcbnew/build_BOM_from_board.cpp
--- kicad.orig/pcbnew/build_BOM_from_board.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/build_BOM_from_board.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/build_BOM_from_board.cpp 2012-01-10 23:23:32.338040998 +0100 +++ kicad/pcbnew/build_BOM_from_board.cpp 2012-01-11 12:11:21.955420070 +0100
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@
fn = GetScreen()->GetFileName(); fn = GetScreen()->GetFileName();
fn.SetExt( CsvFileExtension ); fn.SetExt( CsvFileExtension );
@ -18,8 +18,8 @@ diff -ru kicad.orig/pcbnew/build_BOM_from_board.cpp kicad/pcbnew/build_BOM_from_
FichBom = wxFopen( fn.GetFullPath(), wxT( "wt" ) ); FichBom = wxFopen( fn.GetFullPath(), wxT( "wt" ) );
diff -ru kicad.orig/pcbnew/CMakeLists.txt kicad/pcbnew/CMakeLists.txt diff -ru kicad.orig/pcbnew/CMakeLists.txt kicad/pcbnew/CMakeLists.txt
--- kicad.orig/pcbnew/CMakeLists.txt 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/CMakeLists.txt 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/CMakeLists.txt 2012-01-05 01:53:42.424887775 +0100 +++ kicad/pcbnew/CMakeLists.txt 2012-01-11 12:11:21.956420063 +0100
@@ -150,6 +150,7 @@ @@ -150,6 +150,7 @@
onrightclick.cpp onrightclick.cpp
pcb_plot_params.cpp pcb_plot_params.cpp
@ -29,8 +29,8 @@ diff -ru kicad.orig/pcbnew/CMakeLists.txt kicad/pcbnew/CMakeLists.txt
pcbplot.cpp pcbplot.cpp
plotgerb.cpp plotgerb.cpp
diff -ru kicad.orig/pcbnew/dialogs/dialog_gendrill.h kicad/pcbnew/dialogs/dialog_gendrill.h diff -ru kicad.orig/pcbnew/dialogs/dialog_gendrill.h kicad/pcbnew/dialogs/dialog_gendrill.h
--- kicad.orig/pcbnew/dialogs/dialog_gendrill.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/dialogs/dialog_gendrill.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/dialogs/dialog_gendrill.h 2012-01-05 18:07:15.289119747 +0100 +++ kicad/pcbnew/dialogs/dialog_gendrill.h 2012-01-11 12:11:21.968419977 +0100
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
class DIALOG_GENDRILL : public DIALOG_GENDRILL_BASE class DIALOG_GENDRILL : public DIALOG_GENDRILL_BASE
@ -40,8 +40,8 @@ diff -ru kicad.orig/pcbnew/dialogs/dialog_gendrill.h kicad/pcbnew/dialogs/dialog
static int m_UnitDrillIsInch; static int m_UnitDrillIsInch;
static int m_ZerosFormat; static int m_ZerosFormat;
diff -ru kicad.orig/pcbnew/dialogs/dialog_SVG_print.h kicad/pcbnew/dialogs/dialog_SVG_print.h diff -ru kicad.orig/pcbnew/dialogs/dialog_SVG_print.h kicad/pcbnew/dialogs/dialog_SVG_print.h
--- kicad.orig/pcbnew/dialogs/dialog_SVG_print.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/dialogs/dialog_SVG_print.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/dialogs/dialog_SVG_print.h 2012-01-10 19:40:48.754648647 +0100 +++ kicad/pcbnew/dialogs/dialog_SVG_print.h 2012-01-11 12:11:22.290417616 +0100
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base
@ -51,8 +51,8 @@ diff -ru kicad.orig/pcbnew/dialogs/dialog_SVG_print.h kicad/pcbnew/dialogs/dialo
PCB_BASE_FRAME* m_Parent; PCB_BASE_FRAME* m_Parent;
wxConfig* m_Config; wxConfig* m_Config;
diff -ru kicad.orig/pcbnew/drc_stuff.h kicad/pcbnew/drc_stuff.h diff -ru kicad.orig/pcbnew/drc_stuff.h kicad/pcbnew/drc_stuff.h
--- kicad.orig/pcbnew/drc_stuff.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/drc_stuff.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/drc_stuff.h 2012-01-05 18:08:06.047781508 +0100 +++ kicad/pcbnew/drc_stuff.h 2012-01-11 12:11:22.291417610 +0100
@@ -146,6 +146,7 @@ @@ -146,6 +146,7 @@
*/ */
class DRC class DRC
@ -62,8 +62,8 @@ diff -ru kicad.orig/pcbnew/drc_stuff.h kicad/pcbnew/drc_stuff.h
private: private:
diff -ru kicad.orig/pcbnew/gendrill.cpp kicad/pcbnew/gendrill.cpp diff -ru kicad.orig/pcbnew/gendrill.cpp kicad/pcbnew/gendrill.cpp
--- kicad.orig/pcbnew/gendrill.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/gendrill.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/gendrill.cpp 2012-01-08 17:26:28.429837548 +0100 +++ kicad/pcbnew/gendrill.cpp 2012-01-11 12:11:22.293417596 +0100
@@ -159,8 +159,13 @@ @@ -159,8 +159,13 @@
fn.GetFullName(), wxGetTranslation( DrillFileWildcard ), fn.GetFullName(), wxGetTranslation( DrillFileWildcard ),
wxFD_SAVE | wxFD_CHANGE_DIR ); wxFD_SAVE | wxFD_CHANGE_DIR );
@ -107,8 +107,8 @@ diff -ru kicad.orig/pcbnew/gendrill.cpp kicad/pcbnew/gendrill.cpp
FILE* report_dest = wxFopen( dlg.GetPath(), wxT( "w" ) ); FILE* report_dest = wxFopen( dlg.GetPath(), wxT( "w" ) );
diff -ru kicad.orig/pcbnew/gen_modules_placefile.cpp kicad/pcbnew/gen_modules_placefile.cpp diff -ru kicad.orig/pcbnew/gen_modules_placefile.cpp kicad/pcbnew/gen_modules_placefile.cpp
--- kicad.orig/pcbnew/gen_modules_placefile.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/gen_modules_placefile.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/gen_modules_placefile.cpp 2012-01-08 18:32:33.547634589 +0100 +++ kicad/pcbnew/gen_modules_placefile.cpp 2012-01-11 12:11:22.295417582 +0100
@@ -138,10 +138,10 @@ @@ -138,10 +138,10 @@
return; return;
} }
@ -131,8 +131,8 @@ diff -ru kicad.orig/pcbnew/gen_modules_placefile.cpp kicad/pcbnew/gen_modules_pl
exit: // the only safe way out of here, no returns please. exit: // the only safe way out of here, no returns please.
diff -ru kicad.orig/pcbnew/pcbnew.cpp kicad/pcbnew/pcbnew.cpp diff -ru kicad.orig/pcbnew/pcbnew.cpp kicad/pcbnew/pcbnew.cpp
--- kicad.orig/pcbnew/pcbnew.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/pcbnew.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/pcbnew.cpp 2012-01-05 21:49:03.036099308 +0100 +++ kicad/pcbnew/pcbnew.cpp 2012-01-11 12:11:22.296417575 +0100
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
#include "pcbnew.h" #include "pcbnew.h"
#include "protos.h" #include "protos.h"
@ -152,8 +152,8 @@ diff -ru kicad.orig/pcbnew/pcbnew.cpp kicad/pcbnew/pcbnew.cpp
if( m_Checker && m_Checker->IsAnotherRunning() ) if( m_Checker && m_Checker->IsAnotherRunning() )
diff -ru kicad.orig/pcbnew/pcbnew.h kicad/pcbnew/pcbnew.h diff -ru kicad.orig/pcbnew/pcbnew.h kicad/pcbnew/pcbnew.h
--- kicad.orig/pcbnew/pcbnew.h 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/pcbnew.h 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/pcbnew.h 2012-01-05 21:47:10.422652798 +0100 +++ kicad/pcbnew/pcbnew.h 2012-01-11 12:11:22.297417568 +0100
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
#define FORCE_SKETCH ( IS_DRAGGED | IN_EDIT ) #define FORCE_SKETCH ( IS_DRAGGED | IN_EDIT )
@ -163,9 +163,9 @@ diff -ru kicad.orig/pcbnew/pcbnew.h kicad/pcbnew/pcbnew.h
extern bool g_AutoDeleteOldTrack; extern bool g_AutoDeleteOldTrack;
extern bool g_Drag_Pistes_On; extern bool g_Drag_Pistes_On;
diff -ru kicad.orig/pcbnew/pcbplot.cpp kicad/pcbnew/pcbplot.cpp diff -ru kicad.orig/pcbnew/pcbplot.cpp kicad/pcbnew/pcbplot.cpp
--- kicad.orig/pcbnew/pcbplot.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/pcbplot.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/pcbplot.cpp 2012-01-11 11:10:58.453057344 +0100 +++ kicad/pcbnew/pcbplot.cpp 2012-01-11 12:11:22.299417554 +0100
@@ -774,6 +774,7 @@ @@ -820,6 +820,7 @@
case PLOT_FORMAT_DXF: case PLOT_FORMAT_DXF:
success = m_Parent->ExportToDxfFile( fn.GetFullPath(), layer, success = m_Parent->ExportToDxfFile( fn.GetFullPath(), layer,
@ -174,18 +174,18 @@ diff -ru kicad.orig/pcbnew/pcbplot.cpp kicad/pcbnew/pcbplot.cpp
break; break;
} }
diff -ru kicad.orig/pcbnew/plotdxf.cpp kicad/pcbnew/plotdxf.cpp diff -ru kicad.orig/pcbnew/plotdxf.cpp kicad/pcbnew/plotdxf.cpp
--- kicad.orig/pcbnew/plotdxf.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/plotdxf.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/plotdxf.cpp 2012-01-11 11:07:41.473420495 +0100 +++ kicad/pcbnew/plotdxf.cpp 2012-01-11 12:17:32.894708979 +0100
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
bool PCB_BASE_FRAME::ExportToDxfFile( const wxString& aFullFileName, int aLayer, bool PCB_BASE_FRAME::ExportToDxfFile( const wxString& aFullFileName, int aLayer,
- GRTraceMode aTraceMode ) - EDA_DRAW_MODE_T aTraceMode )
+ bool aPlotOriginIsAuxAxis, GRTraceMode aTraceMode ) + bool aPlotOriginIsAuxAxis, EDA_DRAW_MODE_T aTraceMode )
{ {
Ki_PageDescr* currentsheet = GetScreen()->m_CurrentSheetDesc; LOCALE_IO toggle;
@@ -27,11 +27,23 @@ @@ -27,9 +27,21 @@
return false; return false;
} }
@ -193,7 +193,7 @@ diff -ru kicad.orig/pcbnew/plotdxf.cpp kicad/pcbnew/plotdxf.cpp
+ +
+ if( aPlotOriginIsAuxAxis ) + if( aPlotOriginIsAuxAxis )
+ { + {
+ offset = m_originAxisPosition; + offset = GetOriginAxisPosition();
+ } + }
+ else + else
+ { + {
@ -201,19 +201,17 @@ diff -ru kicad.orig/pcbnew/plotdxf.cpp kicad/pcbnew/plotdxf.cpp
+ offset.y = 0; + offset.y = 0;
+ } + }
+ +
SetLocaleTo_C_standard();
DXF_PLOTTER* plotter = new DXF_PLOTTER(); DXF_PLOTTER* plotter = new DXF_PLOTTER();
plotter->set_paper_size( currentsheet ); plotter->SetPageSettings( GetPageSettings() );
- plotter->set_viewport( wxPoint( 0, 0 ), 1, 0 ); - plotter->set_viewport( wxPoint( 0, 0 ), 1, 0 );
+ plotter->set_viewport( offset, 1, 0 ); + plotter->set_viewport( offset, 1, 0 );
plotter->set_creator( wxT( "PCBNEW-DXF" ) ); plotter->set_creator( wxT( "PCBNEW-DXF" ) );
plotter->set_filename( aFullFileName ); plotter->set_filename( aFullFileName );
plotter->start_plot( output_file ); plotter->start_plot( output_file );
diff -ru kicad.orig/pcbnew/xchgmod.cpp kicad/pcbnew/xchgmod.cpp diff -ru kicad.orig/pcbnew/xchgmod.cpp kicad/pcbnew/xchgmod.cpp
--- kicad.orig/pcbnew/xchgmod.cpp 2012-01-02 15:12:29.461843000 +0100 --- kicad.orig/pcbnew/xchgmod.cpp 2012-01-11 12:02:53.707180000 +0100
+++ kicad/pcbnew/xchgmod.cpp 2012-01-05 21:47:50.531456715 +0100 +++ kicad/pcbnew/xchgmod.cpp 2012-01-11 12:11:22.303417525 +0100
@@ -599,6 +599,7 @@ @@ -601,6 +601,7 @@
fn.SetExt( NetCmpExtBuffer ); fn.SetExt( NetCmpExtBuffer );
wildcard = _( "Component files (." ) + NetCmpExtBuffer + wxT( ")|*." ) + NetCmpExtBuffer; wildcard = _( "Component files (." ) + NetCmpExtBuffer + wxT( ")|*." ) + NetCmpExtBuffer;
@ -221,7 +219,7 @@ diff -ru kicad.orig/pcbnew/xchgmod.cpp kicad/pcbnew/xchgmod.cpp
wxFileDialog dlg( this, _( "Save Component Files" ), wxGetCwd(), wxFileDialog dlg( this, _( "Save Component Files" ), wxGetCwd(),
fn.GetFullName(), wildcard, fn.GetFullName(), wildcard,
wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
@@ -607,6 +608,7 @@ @@ -609,6 +610,7 @@
return; return;
fn = dlg.GetPath(); fn = dlg.GetPath();

2
kicad-patches/series
View File

@ -1,4 +1,4 @@
# Based on BZR revision 2448 # Based on BZR revision 3351
# under discussion # under discussion
# fix-pinedit-collision.patch # fix-pinedit-collision.patch