qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-29 12:45:20 +02:00
Code

added pcbnew --fill-all-zones, stricter option semantics

Browse Source
This commit is contained in:
Wolfgang Spraul 2010-12-28 10:42:06 +00:00
parent d2da52b215
commit dd9db75be1
1 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
kicad-patches/pcbnew-scripted.patch
View File

@ -36,6 +36,17 @@ diff -ruN kicad.orig/common/confirm.cpp kicad/common/confirm.cpp
dialog = new WinEDA_MessageDialog( parent, text, _( "Info:" ), dialog = new WinEDA_MessageDialog( parent, text, _( "Info:" ),
wxOK | wxICON_INFORMATION, displaytime ); wxOK | wxICON_INFORMATION, displaytime );
diff -ruN kicad.orig/common/edaappl.cpp kicad/common/edaappl.cpp
--- kicad.orig/common/edaappl.cpp 2010-10-19 08:48:07.000000000 +0000
+++ kicad/common/edaappl.cpp 2010-12-28 08:57:27.929470001 +0000
@@ -272,6 +272,7 @@
wxString EnvLang;
m_Id = aId;
+if (!g_scripted)
m_Checker = new wxSingleInstanceChecker( aName.Lower() + wxT( "-" ) +
wxGetUserId() );
diff -ruN kicad.orig/include/common.h kicad/include/common.h diff -ruN kicad.orig/include/common.h kicad/include/common.h
--- kicad.orig/include/common.h 2010-10-19 08:48:07.000000000 +0000 --- kicad.orig/include/common.h 2010-10-19 08:48:07.000000000 +0000
+++ kicad/include/common.h 2010-12-22 18:47:54.974932729 +0000 +++ kicad/include/common.h 2010-12-22 18:47:54.974932729 +0000
@ -168,7 +179,7 @@ diff -ruN kicad.orig/pcbnew/gendrill.cpp kicad/pcbnew/gendrill.cpp
break; break;
diff -ruN kicad.orig/pcbnew/pcbnew.cpp kicad/pcbnew/pcbnew.cpp diff -ruN kicad.orig/pcbnew/pcbnew.cpp kicad/pcbnew/pcbnew.cpp
--- kicad.orig/pcbnew/pcbnew.cpp 2010-10-19 08:48:07.000000000 +0000 --- kicad.orig/pcbnew/pcbnew.cpp 2010-10-19 08:48:07.000000000 +0000
+++ kicad/pcbnew/pcbnew.cpp 2010-12-24 14:43:58.522781921 +0000 +++ kicad/pcbnew/pcbnew.cpp 2010-12-28 09:18:32.577470003 +0000
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
#include "build_version.h" #include "build_version.h"
@ -177,20 +188,20 @@ diff -ruN kicad.orig/pcbnew/pcbnew.cpp kicad/pcbnew/pcbnew.cpp
// Colors for layers and items // Colors for layers and items
COLORS_DESIGN_SETTINGS g_ColorsSettings; COLORS_DESIGN_SETTINGS g_ColorsSettings;
@@ -105,6 +106,9 @@ @@ -103,6 +104,9 @@
wxFileName fn;
InitEDA_Appl( wxT( "PCBnew" ), APP_TYPE_PCBNEW ); WinEDA_PcbFrame* frame = NULL;
+ if( Pcbnew_Scripted() ) + if( Pcbnew_Scripted() )
+ return true; + return false;
+ +
InitEDA_Appl( wxT( "PCBnew" ), APP_TYPE_PCBNEW );
if( m_Checker && m_Checker->IsAnotherRunning() ) if( m_Checker && m_Checker->IsAnotherRunning() )
{
if( !IsOK( NULL, _( "Pcbnew is already running, Continue?" ) ) )
diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
--- kicad.orig/pcbnew/pcbnew_scripted.cpp 1970-01-01 00:00:00.000000000 +0000 --- kicad.orig/pcbnew/pcbnew_scripted.cpp 1970-01-01 00:00:00.000000000 +0000
+++ kicad/pcbnew/pcbnew_scripted.cpp 2010-12-25 07:29:51.582781922 +0000 +++ kicad/pcbnew/pcbnew_scripted.cpp 2010-12-28 09:51:20.189470002 +0000
@@ -0,0 +1,524 @@ @@ -0,0 +1,552 @@
+///////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////
+// Name: pcbnew_scripted.cpp +// Name: pcbnew_scripted.cpp
+// Copyright: Wolfgang Spraul +// Copyright: Wolfgang Spraul
@ -240,14 +251,15 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
+ { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("displays help on the command line parameters"), + { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("displays help on the command line parameters"),
+ wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, + wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+ { wxCMD_LINE_SWITCH, wxT("d"), wxT("drill"), wxT("generates a .drl drill file") }, + { wxCMD_LINE_SWITCH, wxT("d"), wxT("drill"), wxT("generates a .drl drill file") },
+ { wxCMD_LINE_SWITCH, wxT("list-layers"), wxT("list-layers"), wxT("lists the name of all enabled layers in the .brd file") },
+ { wxCMD_LINE_OPTION, wxT("p"), wxT("plot"), wxT("plots the board [hpgl|gerber|ps|ps_a4|dxf]"), + { wxCMD_LINE_OPTION, wxT("p"), wxT("plot"), wxT("plots the board [hpgl|gerber|ps|ps_a4|dxf]"),
+ wxCMD_LINE_VAL_STRING }, + wxCMD_LINE_VAL_STRING },
+ { wxCMD_LINE_OPTION, wxT("l"), wxT("layers"), wxT("comma separated list of layer names (default: all layers)"), + { wxCMD_LINE_OPTION, wxT("l"), wxT("layers"), wxT("comma separated list of layer names (default: all layers)"),
+ wxCMD_LINE_VAL_STRING }, + wxCMD_LINE_VAL_STRING },
+ { wxCMD_LINE_SWITCH, wxT("list-layers"), wxT("list-layers"), wxT("lists the name of all enabled layers in the .brd file") },
+ { wxCMD_LINE_OPTION, wxT("ps-pads-drill-opt"), wxT("ps-pads-drill-opt"), wxT("Postscript pads drill option [none|small|real] (default:small)"), + { wxCMD_LINE_OPTION, wxT("ps-pads-drill-opt"), wxT("ps-pads-drill-opt"), wxT("Postscript pads drill option [none|small|real] (default:small)"),
+ wxCMD_LINE_VAL_STRING }, + wxCMD_LINE_VAL_STRING },
+ { wxCMD_LINE_SWITCH, wxT("mirror"), wxT("mirror"), wxT("mirror plot (HPGL and Postscript only)") }, + { wxCMD_LINE_SWITCH, wxT("mirror"), wxT("mirror"), wxT("mirror plot (HPGL and Postscript only)") },
+ { wxCMD_LINE_SWITCH, wxT("fill-all-zones"), wxT("fill-all-zones"), wxT("fill zones before plotting") },
+ { wxCMD_LINE_SWITCH, wxT("drc"), wxT("drc"), wxT("generates a design rule check report (.rpt)") }, + { wxCMD_LINE_SWITCH, wxT("drc"), wxT("drc"), wxT("generates a design rule check report (.rpt)") },
+ { wxCMD_LINE_SWITCH, wxT("svg"), wxT("svg"), wxT("plots the board in SVG format") }, + { wxCMD_LINE_SWITCH, wxT("svg"), wxT("svg"), wxT("plots the board in SVG format") },
+ { wxCMD_LINE_SWITCH, wxT("svg-merge"), wxT("svg-merge-layers"), wxT("merge layers into one SVG file") }, + { wxCMD_LINE_SWITCH, wxT("svg-merge"), wxT("svg-merge-layers"), wxT("merge layers into one SVG file") },
@ -267,17 +279,20 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
+ wxString str; + wxString str;
+ WinEDA_PcbFrame* frame = NULL; + WinEDA_PcbFrame* frame = NULL;
+ wxCommandEvent dummy; + wxCommandEvent dummy;
+ int i;
+ +
+ WinEDA_App& app = wxGetApp(); + WinEDA_App& app = wxGetApp();
+ if (app.argc < 2 || app.argv[1][0] != '-') + if (app.argc < 2 || app.argv[1][0] != '-')
+ return false; + return false;
+ g_scripted = true; + g_scripted = true;
+ wxLog::EnableLogging(false); // this should suppress some wx dialogs
+ app.InitEDA_Appl( wxT( "PCBnew" ), APP_TYPE_PCBNEW );
+ +
+ wxCmdLineParser parser; + wxCmdLineParser parser;
+ parser.SetDesc(g_cmdLineDesc); + parser.SetDesc(g_cmdLineDesc);
+ parser.SetCmdLine(app.argc, app.argv); + parser.SetCmdLine(app.argc, app.argv);
+ if (parser.Parse()) + if (parser.Parse())
+ exit(0); + return true;
+ if ( parser.Found( wxT("ps-pads-drill-opt"), &str ) + if ( parser.Found( wxT("ps-pads-drill-opt"), &str )
+ && str.CmpNoCase( wxT("none") ) + && str.CmpNoCase( wxT("none") )
+ && str.CmpNoCase( wxT("small") ) + && str.CmpNoCase( wxT("small") )
@ -285,7 +300,26 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
+ { + {
+ parser.Usage(); + parser.Usage();
+ wxPrintf(wxT("Unexpected pads drill option '%ls'.\n"), str.c_str()); + wxPrintf(wxT("Unexpected pads drill option '%ls'.\n"), str.c_str());
+ exit(0); + return true;
+ }
+ i = parser.Found( _("drill") )
+ + parser.Found( _("list-layers") )
+ + parser.Found( _("plot") )
+ + parser.Found( _("drc") )
+ + parser.Found( _("svg") )
+ + parser.Found( _("pos") )
+ + parser.Found( _("bom") )
+ + parser.Found( _("cmp") )
+ + parser.Found( _("vrml") );
+ if ( !i )
+ {
+ wxPrintf(wxT("One of --drill --list-layers --plot --drc --svg --pos --bom --cmp --vrml must be given.\n"));
+ return true;
+ }
+ if ( i > 1 )
+ {
+ wxPrintf(wxT("Only one of --drill --list-layers --plot --drc --svg --pos --bom --cmp --vrml may be given at a time.\n"));
+ return true;
+ } + }
+ +
+ fn = parser.GetParam(); + fn = parser.GetParam();
@ -322,10 +356,11 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
+ { + {
+ DIALOG_GENDRILL* drill_frame = new DIALOG_GENDRILL( frame ); + DIALOG_GENDRILL* drill_frame = new DIALOG_GENDRILL( frame );
+ drill_frame->GenDrillFiles( dummy ); + drill_frame->GenDrillFiles( dummy );
+ delete drill_frame;
+ } + }
+ if ( parser.Found( wxT("print-layers") ) ) + if ( parser.Found( wxT("list-layers") ) )
+ { + {
+ for ( int i = 0; i < NB_LAYERS; i++ ) + for ( i = 0; i < NB_LAYERS; i++ )
+ { + {
+ if( frame->GetBoard()->IsLayerEnabled( i ) ) + if( frame->GetBoard()->IsLayerEnabled( i ) )
+ { + {
@ -397,6 +432,9 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
+ if ( parser.Found( wxT("mirror") ) ) + if ( parser.Found( wxT("mirror") ) )
+ g_pcb_plot_options.PlotOrient = PLOT_MIROIR; + g_pcb_plot_options.PlotOrient = PLOT_MIROIR;
+ +
+ if ( parser.Found( wxT("fill-all-zones") ) )
+ frame->Fill_All_Zones( false /* verbose */ );
+
+ parser.Found( wxT("layers"), &layers_str ); + parser.Found( wxT("layers"), &layers_str );
+ wxStringTokenizer tokenizer( layers_str, _(",") ); + wxStringTokenizer tokenizer( layers_str, _(",") );
+ int layer_i = 0; + int layer_i = 0;
@ -574,14 +612,14 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
+ class DRC_LIST_MARKERS* markers = new DRC_LIST_MARKERS( frame->m_drc->m_pcb ); + class DRC_LIST_MARKERS* markers = new DRC_LIST_MARKERS( frame->m_drc->m_pcb );
+ count = markers->GetCount(); + count = markers->GetCount();
+ fprintf( fp, "\n** Found %d DRC errors **\n", count ); + fprintf( fp, "\n** Found %d DRC errors **\n", count );
+ for (int i = 0; i < count; i++) + for ( i = 0; i < count; i++ )
+ fprintf( fp, "%s", CONV_TO_UTF8( markers->GetItem( i )->ShowReport()) ); + fprintf( fp, "%s", CONV_TO_UTF8( markers->GetItem( i )->ShowReport()) );
+ delete markers; + delete markers;
+ +
+ class DRC_LIST_UNCONNECTED* unconnected = new DRC_LIST_UNCONNECTED( &frame->m_drc->m_unconnected ); + class DRC_LIST_UNCONNECTED* unconnected = new DRC_LIST_UNCONNECTED( &frame->m_drc->m_unconnected );
+ count = unconnected->GetCount(); + count = unconnected->GetCount();
+ fprintf( fp, "\n** Found %d unconnected pads **\n", count ); + fprintf( fp, "\n** Found %d unconnected pads **\n", count );
+ for (int i = 0; i < count; i++) + for ( i = 0; i < count; i++ )
+ fprintf( fp, "%s", CONV_TO_UTF8( unconnected->GetItem( i )->ShowReport()) ); + fprintf( fp, "%s", CONV_TO_UTF8( unconnected->GetItem( i )->ShowReport()) );
+ delete unconnected; + delete unconnected;
+ +
@ -713,7 +751,8 @@ diff -ruN kicad.orig/pcbnew/pcbnew_scripted.cpp kicad/pcbnew/pcbnew_scripted.cpp
+ wxMkdir( subDirFor3Dshapes ); + wxMkdir( subDirFor3Dshapes );
+ frame->ExportVRML_File( fn.GetFullPath(), 1.0 /* aScale */, true /* aExport3DFile */, subDirFor3Dshapes ); + frame->ExportVRML_File( fn.GetFullPath(), 1.0 /* aScale */, true /* aExport3DFile */, subDirFor3Dshapes );
+ } + }
+ exit(0); + delete frame;
+ return true;
+} +}
diff -ruN kicad.orig/pcbnew/pcbnew_scripted.h kicad/pcbnew/pcbnew_scripted.h diff -ruN kicad.orig/pcbnew/pcbnew_scripted.h kicad/pcbnew/pcbnew_scripted.h
--- kicad.orig/pcbnew/pcbnew_scripted.h 1970-01-01 00:00:00.000000000 +0000 --- kicad.orig/pcbnew/pcbnew_scripted.h 1970-01-01 00:00:00.000000000 +0000