2012-01-11 01:28:19 +02:00
|
|
|
diff -ru kicad.orig/eeschema/CMakeLists.txt kicad/eeschema/CMakeLists.txt
|
2012-01-11 13:21:21 +02:00
|
|
|
--- kicad.orig/eeschema/CMakeLists.txt 2012-01-11 12:02:53.707180000 +0100
|
|
|
|
+++ kicad/eeschema/CMakeLists.txt 2012-01-11 12:06:35.801518000 +0100
|
2012-01-11 01:28:19 +02:00
|
|
|
@@ -78,6 +78,7 @@
|
|
|
|
eeredraw.cpp
|
|
|
|
eeschema.cpp
|
|
|
|
eeschema_config.cpp
|
|
|
|
+ eeschema_cmdline.cpp
|
|
|
|
erc.cpp
|
|
|
|
events_called_functions_for_edit.cpp
|
|
|
|
files-io.cpp
|
|
|
|
diff -ru kicad.orig/eeschema/dialogs/dialog_build_BOM.h kicad/eeschema/dialogs/dialog_build_BOM.h
|
2012-01-11 13:21:21 +02:00
|
|
|
--- 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-11 12:06:35.802517993 +0100
|
2012-01-11 01:28:19 +02:00
|
|
|
@@ -17,6 +17,7 @@
|
|
|
|
|
|
|
|
class DIALOG_BUILD_BOM : public DIALOG_BUILD_BOM_BASE
|
|
|
|
{
|
|
|
|
+friend class EESCHEMA_CMDLINE;
|
|
|
|
private:
|
|
|
|
EDA_DRAW_FRAME* m_Parent;
|
|
|
|
wxConfig* m_Config;
|
|
|
|
diff -ru kicad.orig/eeschema/dialogs/dialog_erc.cpp kicad/eeschema/dialogs/dialog_erc.cpp
|
2012-01-11 13:21:21 +02:00
|
|
|
--- kicad.orig/eeschema/dialogs/dialog_erc.cpp 2012-01-11 12:02:53.707180000 +0100
|
|
|
|
+++ kicad/eeschema/dialogs/dialog_erc.cpp 2012-01-11 12:06:35.813517913 +0100
|
2012-01-11 01:28:19 +02:00
|
|
|
@@ -574,10 +574,10 @@
|
|
|
|
_( "Electronic rule check file (.erc)|*.erc" ),
|
|
|
|
wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
|
|
|
|
|
|
|
|
- if( dlg.ShowModal() == wxID_CANCEL )
|
|
|
|
+ if( !g_CmdLineMode && dlg.ShowModal() == wxID_CANCEL )
|
|
|
|
return;
|
|
|
|
|
|
|
|
- if( WriteDiagnosticERC( dlg.GetPath() ) )
|
|
|
|
+ if( WriteDiagnosticERC( g_CmdLineMode ? fn.GetFullPath() : dlg.GetPath() ) )
|
|
|
|
{
|
|
|
|
Close( true );
|
|
|
|
ExecuteFile( this, wxGetApp().GetEditorName(), QuoteFullPath( fn ) );
|
|
|
|
diff -ru kicad.orig/eeschema/dialogs/dialog_erc.h kicad/eeschema/dialogs/dialog_erc.h
|
2012-01-11 13:21:21 +02:00
|
|
|
--- kicad.orig/eeschema/dialogs/dialog_erc.h 2012-01-11 12:02:53.707180000 +0100
|
|
|
|
+++ kicad/eeschema/dialogs/dialog_erc.h 2012-01-11 12:06:35.815517898 +0100
|
2012-01-11 01:28:19 +02:00
|
|
|
@@ -29,6 +29,7 @@
|
|
|
|
|
|
|
|
class DIALOG_ERC : public DIALOG_ERC_BASE
|
|
|
|
{
|
|
|
|
+friend class EESCHEMA_CMDLINE;
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
|
|
|
|
private:
|
|
|
|
diff -ru kicad.orig/eeschema/dialogs/dialog_plot_schematic_DXF.cpp kicad/eeschema/dialogs/dialog_plot_schematic_DXF.cpp
|
2012-01-11 13:21:21 +02:00
|
|
|
--- 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-11 12:06:35.816517891 +0100
|
2012-01-11 01:28:19 +02:00
|
|
|
@@ -42,6 +42,7 @@
|
|
|
|
|
|
|
|
class DIALOG_PLOT_SCHEMATIC_DXF : public DIALOG_PLOT_SCHEMATIC_DXF_BASE
|
|
|
|
{
|
|
|
|
+friend class SCH_EDIT_FRAME;
|
|
|
|
private:
|
|
|
|
SCH_EDIT_FRAME* m_Parent;
|
|
|
|
|
|
|
|
@@ -73,6 +74,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+void SCH_EDIT_FRAME::CmdLineToPlot_DXF( bool PlotBW, bool PlotSheetRef )
|
|
|
|
+{
|
|
|
|
+ DIALOG_PLOT_SCHEMATIC_DXF::m_plotColorOpt = !PlotBW;
|
|
|
|
+ DIALOG_PLOT_SCHEMATIC_DXF::m_plot_Sheet_Ref = PlotSheetRef;
|
|
|
|
+ DIALOG_PLOT_SCHEMATIC_DXF dlg( this );
|
|
|
|
+ wxCommandEvent dummy;
|
|
|
|
+ dlg.OnPlotAll( dummy );
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
void SCH_EDIT_FRAME::ToPlot_DXF( wxCommandEvent& event )
|
|
|
|
{
|
|
|
|
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
|
2012-01-11 13:21:21 +02:00
|
|
|
--- 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-11 12:06:35.818517877 +0100
|
2012-01-11 01:28:19 +02:00
|
|
|
@@ -48,6 +48,7 @@
|
|
|
|
|
|
|
|
class DIALOG_PLOT_SCHEMATIC_PS : public DIALOG_PLOT_SCHEMATIC_PS_BASE
|
|
|
|
{
|
|
|
|
+friend class SCH_EDIT_FRAME;
|
|
|
|
private:
|
|
|
|
SCH_EDIT_FRAME* m_Parent;
|
|
|
|
|
2012-01-11 13:21:21 +02:00
|
|
|
@@ -80,6 +81,15 @@
|
2012-01-11 01:28:19 +02:00
|
|
|
bool DIALOG_PLOT_SCHEMATIC_PS::m_plot_Sheet_Ref = true;
|
|
|
|
|
|
|
|
|
|
|
|
+void SCH_EDIT_FRAME::CmdLineToPlot_PS( bool PlotBW, bool PlotSheetRef )
|
|
|
|
+{
|
|
|
|
+ DIALOG_PLOT_SCHEMATIC_PS::m_plotColorOpt = !PlotBW;
|
|
|
|
+ DIALOG_PLOT_SCHEMATIC_PS::m_plot_Sheet_Ref = PlotSheetRef;
|
|
|
|
+ DIALOG_PLOT_SCHEMATIC_PS dlg( this );
|
|
|
|
+ wxCommandEvent dummy;
|
|
|
|
+ dlg.OnPlotAll( dummy );
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
void SCH_EDIT_FRAME::ToPlot_PS( wxCommandEvent& event )
|
|
|
|
{
|
|
|
|
DIALOG_PLOT_SCHEMATIC_PS dlg( this );
|
|
|
|
diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.cpp kicad/eeschema/dialogs/dialog_SVG_print.cpp
|
2012-01-11 13:21:21 +02:00
|
|
|
--- 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-11 12:06:35.820517863 +0100
|
2012-01-11 01:28:19 +02:00
|
|
|
@@ -53,6 +53,13 @@
|
|
|
|
static bool s_Print_Frame_Ref = true;
|
|
|
|
static int s_PlotBlackAndWhite = 0;
|
|
|
|
|
|
|
|
+void CmdLinePrintSVGDoc( EDA_DRAW_FRAME* frame, bool aPrintAll, bool aPrint_Sheet_Ref, bool aPrintBlackAndWhite )
|
|
|
|
+{
|
|
|
|
+ class DIALOG_SVG_PRINT* dlg = new DIALOG_SVG_PRINT( frame );
|
|
|
|
+ dlg->m_ModeColorOption->SetSelection( aPrintBlackAndWhite );
|
|
|
|
+ dlg->PrintSVGDoc( aPrintAll, aPrint_Sheet_Ref );
|
|
|
|
+ delete dlg;
|
|
|
|
+}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* DIALOG_SVG_PRINT functions
|
|
|
|
diff -ru kicad.orig/eeschema/dialogs/dialog_SVG_print.h kicad/eeschema/dialogs/dialog_SVG_print.h
|
2012-01-11 13:21:21 +02:00
|
|
|
--- 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-11 12:07:11.509255882 +0100
|
|
|
|
@@ -11,6 +11,8 @@
|
|
|
|
|
|
|
|
class DIALOG_SVG_PRINT : public DIALOG_SVG_PRINT_base
|
|
|
|
{
|
|
|
|
+friend void CmdLinePrintSVGDoc( EDA_DRAW_FRAME* frame, bool aPrintAll, bool aPrint_Sheet_Ref, bool aPrintBlackAndWhite );
|
|
|
|
+ private:
|
|
|
|
private:
|
|
|
|
EDA_DRAW_FRAME* m_Parent;
|
|
|
|
wxConfig* m_Config;
|
2012-01-11 01:28:19 +02:00
|
|
|
diff -ru kicad.orig/eeschema/eeschema.cpp kicad/eeschema/eeschema.cpp
|
2012-01-11 13:21:21 +02:00
|
|
|
--- kicad.orig/eeschema/eeschema.cpp 2012-01-11 12:02:53.707180000 +0100
|
|
|
|
+++ kicad/eeschema/eeschema.cpp 2012-01-11 12:06:35.822517848 +0100
|
2012-01-11 01:28:19 +02:00
|
|
|
@@ -41,6 +41,7 @@
|
|
|
|
#include "hotkeys.h"
|
|
|
|
#include "dialogs/dialog_color_config.h"
|
|
|
|
#include "transform.h"
|
|
|
|
+#include "eeschema_cmdline.h"
|
|
|
|
|
|
|
|
#include <wx/snglinst.h>
|
|
|
|
|
|
|
|
@@ -122,6 +123,9 @@
|
|
|
|
wxFileName filename;
|
|
|
|
SCH_EDIT_FRAME* frame = NULL;
|
|
|
|
|
|
|
|
+ if ( argc >= 2 && argv[1][0] == '-' )
|
|
|
|
+ return g_EESchemaCmdLine.Run();
|
|
|
|
+
|
|
|
|
InitEDA_Appl( wxT( "Eeschema" ), APP_EESCHEMA_T );
|
|
|
|
|
|
|
|
if( m_Checker && m_Checker->IsAnotherRunning() )
|