mirror of
git://projects.qi-hardware.com/eda-tools.git
synced 2024-12-23 00:26:27 +02:00
merged with cmdline patches
This commit is contained in:
Wolfgang Spraul
parent
78b197d786
commit
771599b3f9
@ -1,80 +0,0 @@
|
||||
Add support for using the auxiliary axis in DXF as well.
|
||||
|
||||
Index: kicad.bzr/include/wxBasePcbFrame.h
|
||||
===================================================================
|
||||
--- kicad.bzr.orig/include/wxBasePcbFrame.h 2011-03-14 11:35:38.000000000 -0300
|
||||
+++ kicad.bzr/include/wxBasePcbFrame.h 2011-03-14 11:35:42.000000000 -0300
|
||||
@@ -337,6 +337,7 @@
|
||||
GRTraceMode trace_mode );
|
||||
bool Genere_DXF( const wxString& FullFileName,
|
||||
int Layer,
|
||||
+ bool PlotOriginIsAuxAxis,
|
||||
GRTraceMode trace_mode );
|
||||
void Plot_Layer( PLOTTER* plotter,
|
||||
int Layer,
|
||||
Index: kicad.bzr/pcbnew/pcbplot.cpp
|
||||
===================================================================
|
||||
--- kicad.bzr.orig/pcbnew/pcbplot.cpp 2011-03-14 11:35:38.000000000 -0300
|
||||
+++ kicad.bzr/pcbnew/pcbplot.cpp 2011-03-14 11:35:42.000000000 -0300
|
||||
@@ -681,7 +681,7 @@
|
||||
break;
|
||||
|
||||
case PLOT_FORMAT_DXF:
|
||||
- success = m_Parent->Genere_DXF( fn.GetFullPath(), layer,
|
||||
+ success = m_Parent->Genere_DXF( fn.GetFullPath(), layer, false,
|
||||
g_pcb_plot_options.Trace_Mode );
|
||||
break;
|
||||
}
|
||||
Index: kicad.bzr/pcbnew/plotdxf.cpp
|
||||
===================================================================
|
||||
--- kicad.bzr.orig/pcbnew/plotdxf.cpp 2011-03-14 11:35:38.000000000 -0300
|
||||
+++ kicad.bzr/pcbnew/plotdxf.cpp 2011-03-14 12:04:20.000000000 -0300
|
||||
@@ -13,9 +13,11 @@
|
||||
#include "protos.h"
|
||||
|
||||
bool WinEDA_BasePcbFrame::Genere_DXF( const wxString& FullFileName, int Layer,
|
||||
+ bool PlotOriginIsAuxAxis,
|
||||
GRTraceMode trace_mode )
|
||||
{
|
||||
Ki_PageDescr* currentsheet = GetScreen()->m_CurrentSheetDesc;
|
||||
+ wxPoint offset;
|
||||
|
||||
FILE* output_file = wxFopen( FullFileName, wxT( "wt" ) );
|
||||
if( output_file == NULL )
|
||||
@@ -25,9 +27,23 @@
|
||||
|
||||
SetLocaleTo_C_standard();
|
||||
|
||||
+ if( PlotOriginIsAuxAxis ) {
|
||||
+ /*
|
||||
+ * We undo the y offset applied in common/class_plotter.cpp, methods
|
||||
+ * set_paper_size and user_to_device_coordinates
|
||||
+ */
|
||||
+ offset.x = m_Auxiliary_Axis_Position.x;
|
||||
+ offset.y = m_Auxiliary_Axis_Position.y - currentsheet->m_Size.y * 10;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ offset.x = 0;
|
||||
+ offset.y = 0;
|
||||
+ }
|
||||
+
|
||||
DXF_PLOTTER* plotter = new DXF_PLOTTER();
|
||||
plotter->set_paper_size( currentsheet );
|
||||
- plotter->set_viewport( wxPoint( 0, 0 ), 1, 0 );
|
||||
+ plotter->set_viewport( offset, 1, 0 );
|
||||
plotter->set_creator( wxT( "PCBNEW-DXF" ) );
|
||||
plotter->set_filename( FullFileName );
|
||||
plotter->start_plot( output_file );
|
||||
Index: kicad.bzr/pcbnew/pcbnew_scripted.cpp
|
||||
===================================================================
|
||||
--- kicad.bzr.orig/pcbnew/pcbnew_scripted.cpp 2011-03-14 11:35:42.000000000 -0300
|
||||
+++ kicad.bzr/pcbnew/pcbnew_scripted.cpp 2011-03-14 11:44:25.000000000 -0300
|
||||
@@ -372,6 +372,7 @@
|
||||
|
||||
case PLOT_FORMAT_DXF:
|
||||
success = frame->Genere_DXF( fn.GetFullPath(), layer_i,
|
||||
+ false /* PlotOriginIsAuxAxis */,
|
||||
FILLED /* trace_mode */ );
|
||||
break;
|
||||
}
|
||||
@ -1,120 +0,0 @@
|
||||
Introduce option -o/--origin to use the auxiliary origin for Gerber, DXF,
|
||||
and the drill file. The auxiliary origin is always used for positioning
|
||||
files.
|
||||
|
||||
Index: kicad.bzr/pcbnew/pcbnew_scripted.cpp
|
||||
===================================================================
|
||||
--- kicad.bzr.orig/pcbnew/pcbnew_scripted.cpp 2011-03-14 11:33:42.000000000 -0300
|
||||
+++ kicad.bzr/pcbnew/pcbnew_scripted.cpp 2011-03-14 11:35:05.000000000 -0300
|
||||
@@ -56,6 +56,8 @@
|
||||
wxCMD_LINE_VAL_STRING },
|
||||
{ wxCMD_LINE_SWITCH, wxT("mirror"), wxT("mirror"), wxT("mirror plot (HPGL and Postscript only)") },
|
||||
{ wxCMD_LINE_SWITCH, wxT("e"), wxT("exclude-pcb-edge"), wxT("exclude PCB edge (Gerber only)") },
|
||||
+ { wxCMD_LINE_OPTION, wxT("o"), wxT("origin"), wxT("origin for Gerber, DXF, and drill [abs|aux] (default:abs)"),
|
||||
+ wxCMD_LINE_VAL_STRING },
|
||||
{ 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("svg"), wxT("svg"), wxT("plots the board in SVG format") },
|
||||
@@ -146,6 +148,20 @@
|
||||
frame->LoadOnePcbFile( fn.GetFullPath() );
|
||||
frame->LoadProjectSettings( fn.GetFullPath() );
|
||||
|
||||
+ // --origin
|
||||
+ if ( parser.Found( wxT("origin"), &str ) ) {
|
||||
+ if (!str.CmpNoCase( wxT("abs") ) )
|
||||
+ g_DrillOriginIsAuxAxis = FALSE;
|
||||
+ else if ( !str.CmpNoCase( wxT("aux") ) )
|
||||
+ g_DrillOriginIsAuxAxis = TRUE;
|
||||
+ else
|
||||
+ {
|
||||
+ wxFprintf( stderr,
|
||||
+ wxT("Unexpected plot origin option '%ls'.\n"), str.c_str());
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if ( parser.Found( wxT("drill") ) )
|
||||
{
|
||||
DIALOG_GENDRILL* drill_frame = new DIALOG_GENDRILL( frame );
|
||||
@@ -361,7 +377,7 @@
|
||||
|
||||
case PLOT_FORMAT_GERBER:
|
||||
success = frame->Genere_GERBER( fn.GetFullPath(), layer_i,
|
||||
- false /* PlotOriginIsAuxAxis */,
|
||||
+ g_DrillOriginIsAuxAxis,
|
||||
FILLED /* trace_mode */ );
|
||||
break;
|
||||
|
||||
@@ -372,7 +388,7 @@
|
||||
|
||||
case PLOT_FORMAT_DXF:
|
||||
success = frame->Genere_DXF( fn.GetFullPath(), layer_i,
|
||||
- false /* PlotOriginIsAuxAxis */,
|
||||
+ g_DrillOriginIsAuxAxis,
|
||||
FILLED /* trace_mode */ );
|
||||
break;
|
||||
}
|
||||
Index: kicad.bzr/pcbnew/gendrill.cpp
|
||||
===================================================================
|
||||
--- kicad.bzr.orig/pcbnew/gendrill.cpp 2011-03-14 11:26:15.000000000 -0300
|
||||
+++ kicad.bzr/pcbnew/gendrill.cpp 2011-03-14 11:34:23.000000000 -0300
|
||||
@@ -56,7 +56,7 @@
|
||||
static int s_Zeros_Format = DECIMAL_FORMAT;
|
||||
static DrillPrecision s_Precision( 2, 4 );
|
||||
|
||||
-static bool DrillOriginIsAuxAxis; /* Axis selection (main /
|
||||
+bool g_DrillOriginIsAuxAxis;/* Axis selection (main /
|
||||
* auxiliary) for drill
|
||||
* origin coordinates */
|
||||
static wxPoint File_Drill_Offset; /* Offset coordinate for
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
if( s_Zeros_Format == DECIMAL_FORMAT )
|
||||
m_Choice_Precision->Enable( false );
|
||||
- if( DrillOriginIsAuxAxis )
|
||||
+ if( g_DrillOriginIsAuxAxis )
|
||||
m_Choice_Drill_Offset->SetSelection( 1 );
|
||||
|
||||
msg << s_Precision.m_lhs << wxT( ":" ) << s_Precision.m_rhs;
|
||||
@@ -170,7 +170,7 @@
|
||||
Minimal = m_Check_Minimal->IsChecked();
|
||||
Mirror = m_Check_Mirror->IsChecked();
|
||||
s_Zeros_Format = m_Choice_Zeros_Format->GetSelection();
|
||||
- DrillOriginIsAuxAxis = m_Choice_Drill_Offset->GetSelection();
|
||||
+ g_DrillOriginIsAuxAxis = m_Choice_Drill_Offset->GetSelection();
|
||||
|
||||
msg = m_PenSpeed->GetValue();
|
||||
if( msg.ToLong( <mp ) )
|
||||
@@ -217,7 +217,7 @@
|
||||
Config->Read( MirrorKey, &Mirror );
|
||||
Config->Read( MinimalKey, &Minimal );
|
||||
Config->Read( UnitDrillInchKey, &s_Unit_Drill_is_Inch );
|
||||
- Config->Read( DrillOriginIsAuxAxisKey, &DrillOriginIsAuxAxis );
|
||||
+ Config->Read( DrillOriginIsAuxAxisKey, &g_DrillOriginIsAuxAxis );
|
||||
}
|
||||
|
||||
DIALOG_GENDRILL* frame = new DIALOG_GENDRILL( this );
|
||||
@@ -241,7 +241,7 @@
|
||||
Config->Write( MirrorKey, Mirror );
|
||||
Config->Write( MinimalKey, Minimal );
|
||||
Config->Write( UnitDrillInchKey, s_Unit_Drill_is_Inch );
|
||||
- Config->Write( DrillOriginIsAuxAxisKey, DrillOriginIsAuxAxis );
|
||||
+ Config->Write( DrillOriginIsAuxAxisKey, g_DrillOriginIsAuxAxis );
|
||||
}
|
||||
}
|
||||
|
||||
Index: kicad.bzr/pcbnew/gendrill.h
|
||||
===================================================================
|
||||
--- kicad.bzr.orig/pcbnew/gendrill.h 2011-03-14 11:26:15.000000000 -0300
|
||||
+++ kicad.bzr/pcbnew/gendrill.h 2011-03-14 11:34:23.000000000 -0300
|
||||
@@ -5,6 +5,10 @@
|
||||
#ifndef GENDRILL_H
|
||||
#define GENDRILL_H
|
||||
|
||||
+
|
||||
+extern bool g_DrillOriginIsAuxAxis; /* Axis selection */
|
||||
+
|
||||
+
|
||||
/* the DRILL_TOOL class handles tools used in the excellon drill file */
|
||||
class DRILL_TOOL
|
||||
{
|
||||
@ -3,14 +3,8 @@
|
||||
# under discussion
|
||||
fix-pinedit-collision.patch
|
||||
|
||||
# Work in progress
|
||||
#drag-override.patch
|
||||
#pcbnew-plot-only-mode.patch
|
||||
|
||||
# cmdline options for eeschema and pcbnew
|
||||
cmdline-new.patch
|
||||
cmdline-common.patch
|
||||
cmdline-eeschema.patch
|
||||
cmdline-pcbnew.patch
|
||||
#dxf-aux-origin.patch
|
||||
#origin-opt.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user