From 715af96184ec9cd0a1c17ace15dc7e3064be1762 Mon Sep 17 00:00:00 2001 From: Lorenzo Marcantonio Date: Wed, 29 Aug 2012 20:43:51 +0200 Subject: [PATCH] Removed g_pcb_plot_options from gerbview (which has no plotting anyway...) --- .../dialogs/dialog_print_using_printer.cpp | 3 -- gerbview/pcbplot.cpp | 4 --- gerbview/pcbplot.h | 28 ------------------- 3 files changed, 35 deletions(-) diff --git a/gerbview/dialogs/dialog_print_using_printer.cpp b/gerbview/dialogs/dialog_print_using_printer.cpp index 6a86ba0a38..8573e1306f 100644 --- a/gerbview/dialogs/dialog_print_using_printer.cpp +++ b/gerbview/dialogs/dialog_print_using_printer.cpp @@ -318,7 +318,6 @@ void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( ) int idx = m_ScaleOption->GetSelection(); s_Parameters.m_PrintScale = s_ScaleList[idx]; - g_pcb_plot_options.Scale = s_Parameters.m_PrintScale; if( m_FineAdjustXscaleOpt ) { @@ -335,8 +334,6 @@ void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( ) DisplayInfoMessage( NULL, _( "Warning: Scale option set to a very small value" ) ); m_FineAdjustYscaleOpt->GetValue().ToDouble( &s_Parameters.m_YScaleAdjust ); } - g_pcb_plot_options.ScaleAdjX = s_Parameters.m_XScaleAdjust; - g_pcb_plot_options.ScaleAdjX = s_Parameters.m_YScaleAdjust; } void DIALOG_PRINT_USING_PRINTER::OnScaleSelectionClick( wxCommandEvent& event ) diff --git a/gerbview/pcbplot.cpp b/gerbview/pcbplot.cpp index b130bda6a8..b2f089e096 100644 --- a/gerbview/pcbplot.cpp +++ b/gerbview/pcbplot.cpp @@ -9,10 +9,6 @@ #include -/* The group of plot options - sadly global XXX */ -PCB_Plot_Options g_pcb_plot_options; - - /**************************************************************/ /* void PCB_BASE_FRAME::ToPlotter(wxCommandEvent& event) */ /***************************************************************/ diff --git a/gerbview/pcbplot.h b/gerbview/pcbplot.h index 8207402e82..72eeecf906 100644 --- a/gerbview/pcbplot.h +++ b/gerbview/pcbplot.h @@ -37,32 +37,4 @@ #define OPTKEY_PRINT_PAGE_FRAME wxT( "PrintPageFrame" ) #define OPTKEY_PRINT_MONOCHROME_MODE wxT( "PrintMonochrome" ) -/* Plot Options : */ -struct PCB_Plot_Options -{ - bool Exclude_Edges_Pcb; - int PlotLine_Width; - bool Plot_Frame_Ref; // True to plot/print frame references - int Plot_Mode; - bool Plot_Set_MIROIR; - bool Sel_Rotate_Window; - int HPGL_Pen_Num; - int HPGL_Pen_Speed; - int HPGL_Pen_Diam; - int HPGL_Pen_Recouvrement; - bool HPGL_Org_Centre; // true if, HPGL originally the center of the node - int PlotPSColorOpt; // True for color Postscript output - bool Plot_PS_Negative; // True to create a negative board ps plot - - /* id for plot format (see enum PlotFormat in plot_common.h) */ - int PlotFormat; - int PlotOrient; - int PlotScaleOpt; - int DrillShapeOpt; - double Scale; - double ScaleAdjX; - double ScaleAdjY; -}; -extern PCB_Plot_Options g_pcb_plot_options; - #endif // ifndef PCBPLOT_H