Skip to content

Commit 9f35e38

Browse files
jp-charrasjp-charras
committed
Pcbnew: fix a few plot issues (from master branch)
1 parent 6b1b6d4 commit 9f35e38

13 files changed

+331
-305
lines changed

‎common/common_plotPDF_functions.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* This program source code file is part of KiCad, a free EDA CAD application.
88
*
99
* Copyright (C) 1992-2012 Lorenzo Marcantonio, l.marcantonio@logossrl.com
10-
* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
10+
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
1111
*
1212
* This program is free software; you can redistribute it and/or
1313
* modify it under the terms of the GNU General Public License
@@ -766,7 +766,10 @@ void PDF_PLOTTER::Text( const wxPoint& aPos,
766766
aMultilineAllowed = false; // the text has only one line.
767767

768768
// Emit native PDF text (if requested)
769-
if( m_textMode != PLOTTEXTMODE_STROKE && !aMultilineAllowed )
769+
// Currently: does not work: disable it
770+
bool use_native = false; // = m_textMode != PLOTTEXTMODE_STROKE && !aMultilineAllowed;
771+
772+
if( use_native )
770773
{
771774
const char *fontname = aItalic ? (aBold ? "/KicadFontBI" : "/KicadFontI")
772775
: (aBold ? "/KicadFontB" : "/KicadFont");
@@ -822,7 +825,7 @@ void PDF_PLOTTER::Text( const wxPoint& aPos,
822825
}
823826

824827
// Plot the stroked text (if requested)
825-
if( m_textMode != PLOTTEXTMODE_NATIVE || aMultilineAllowed )
828+
if( !use_native )
826829
{
827830
PLOTTER::Text( aPos, aColor, aText, aOrient, aSize, aH_justify, aV_justify,
828831
aWidth, aItalic, aBold, aMultilineAllowed );

‎common/common_plotPS_functions.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* This program source code file is part of KiCad, a free EDA CAD application.
33
*
4-
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
5-
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
4+
* Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
5+
* Copyright (C) 2017 KiCad Developers, see CHANGELOG.TXT for contributors.
66
*
77
* This program is free software; you can redistribute it and/or
88
* modify it under the terms of the GNU General Public License
@@ -873,7 +873,10 @@ void PS_PLOTTER::Text( const wxPoint& aPos,
873873
aMultilineAllowed = false; // the text has only one line.
874874

875875
// Draw the native postscript text (if requested)
876-
if( m_textMode == PLOTTEXTMODE_NATIVE && !aMultilineAllowed )
876+
// Currently: does not work: disable it
877+
bool use_native = false; // = m_textMode == PLOTTEXTMODE_NATIVE && !aMultilineAllowed;
878+
879+
if( use_native )
877880
{
878881
const char *fontname = aItalic ? (aBold ? "/KicadFont-BoldOblique"
879882
: "/KicadFont-Oblique")
@@ -926,7 +929,7 @@ void PS_PLOTTER::Text( const wxPoint& aPos,
926929
}
927930

928931
// Draw the stroked text (if requested)
929-
if( m_textMode != PLOTTEXTMODE_NATIVE || aMultilineAllowed )
932+
if( !use_native )
930933
{
931934
PLOTTER::Text( aPos, aColor, aText, aOrient, aSize, aH_justify, aV_justify,
932935
aWidth, aItalic, aBold, aMultilineAllowed );

‎pcbnew/dialogs/dialog_SVG_print.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,11 +337,6 @@ bool DIALOG_SVG_PRINT::CreateSVGFile( const wxString& aFullFileName, bool aOnlyO
337337
plot_opts.SetMirror( m_printMirror );
338338
plot_opts.SetFormat( PLOT_FORMAT_SVG );
339339

340-
EDA_COLOR_T color = UNSPECIFIED_COLOR; // Used layer color to plot ref and value
341-
342-
plot_opts.SetReferenceColor( color );
343-
plot_opts.SetValueColor( color );
344-
345340
PAGE_INFO pageInfo = m_board->GetPageSettings();
346341
wxPoint axisorigin = m_board->GetAuxOrigin();
347342

‎pcbnew/dialogs/dialog_plot.cpp

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/*
66
* This program source code file is part of KiCad, a free EDA CAD application.
77
*
8-
* Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
8+
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
99
*
1010
* This program is free software; you can redistribute it and/or
1111
* modify it under the terms of the GNU General Public License
@@ -46,14 +46,14 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
4646
m_plotOpts( aParent->GetPlotSettings() )
4747
{
4848
m_config = Kiface().KifaceSettings();
49-
Init_Dialog();
49+
init_Dialog();
5050

5151
GetSizer()->Fit( this );
5252
GetSizer()->SetSizeHints( this );
5353
}
5454

5555

56-
void DIALOG_PLOT::Init_Dialog()
56+
void DIALOG_PLOT::init_Dialog()
5757
{
5858
wxString msg;
5959
wxFileName fileName;
@@ -195,10 +195,10 @@ void DIALOG_PLOT::Init_Dialog()
195195
setPlotModeChoiceSelection( m_plotOpts.GetPlotMode() );
196196

197197
// Plot outline mode
198-
m_plotOutlineModeOpt->SetValue( m_plotOpts.GetPlotOutlineMode() );
198+
m_DXF_plotModeOpt->SetValue( m_plotOpts.GetDXFPlotPolygonMode() );
199199

200200
// Plot text mode
201-
m_plotTextAsLineOpt->SetValue( m_plotOpts.GetTextMode() == PLOTTEXTMODE_DEFAULT );
201+
m_DXF_plotTextStrokeFontOpt->SetValue( m_plotOpts.GetTextMode() == PLOTTEXTMODE_DEFAULT );
202202

203203
// Plot mirror option
204204
m_plotMirrorOpt->SetValue( m_plotOpts.GetMirror() );
@@ -294,11 +294,16 @@ void DIALOG_PLOT::CreateDrillFile( wxCommandEvent& event )
294294
}
295295

296296

297-
void DIALOG_PLOT::OnChangeOutlineMode( wxCommandEvent& event )
297+
void DIALOG_PLOT::OnChangeDXFPlotMode( wxCommandEvent& event )
298298
{
299-
m_plotTextAsLineOpt->Enable( !m_plotOutlineModeOpt->GetValue() );
300-
if( !m_plotTextAsLineOpt->IsEnabled() )
301-
m_plotTextAsLineOpt->SetValue( true );
299+
// m_DXF_plotTextStrokeFontOpt is disabled if m_DXF_plotModeOpt
300+
// is checked (plot in DXF polygon mode)
301+
m_DXF_plotTextStrokeFontOpt->Enable( !m_DXF_plotModeOpt->GetValue() );
302+
303+
// if m_DXF_plotTextStrokeFontOpt option is disabled (plot DXF in polygon mode),
304+
// force m_DXF_plotTextStrokeFontOpt to true to use Pcbnew stroke font
305+
if( !m_DXF_plotTextStrokeFontOpt->IsEnabled() )
306+
m_DXF_plotTextStrokeFontOpt->SetValue( true );
302307
}
303308

304309

@@ -369,15 +374,16 @@ PlotFormat DIALOG_PLOT::getPlotFormat()
369374
// and clear also some optional values
370375
void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
371376
{
377+
// this option exist only in DXF format:
378+
m_DXF_plotModeOpt->Enable( getPlotFormat() == PLOT_FORMAT_DXF );
379+
372380
switch( getPlotFormat() )
373381
{
374382
case PLOT_FORMAT_PDF:
375383
case PLOT_FORMAT_SVG:
376384
m_drillShapeOpt->Enable( true );
377385
m_plotModeOpt->Enable( false );
378386
setPlotModeChoiceSelection( FILLED );
379-
m_plotOutlineModeOpt->Enable( false );
380-
m_plotOutlineModeOpt->SetValue( false );
381387
m_plotMirrorOpt->Enable( true );
382388
m_useAuxOriginCheckBox->Enable( false );
383389
m_useAuxOriginCheckBox->SetValue( false );
@@ -399,19 +405,16 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
399405
m_plotPSNegativeOpt->Enable( true );
400406
m_forcePSA4OutputOpt->Enable( false );
401407
m_forcePSA4OutputOpt->SetValue( false );
402-
m_plotTextAsLineOpt->Enable( false );
403-
m_plotTextAsLineOpt->SetValue( false );
404408

405409
m_PlotOptionsSizer->Hide( m_GerberOptionsSizer );
406410
m_PlotOptionsSizer->Hide( m_HPGLOptionsSizer );
407411
m_PlotOptionsSizer->Hide( m_PSOptionsSizer );
412+
m_PlotOptionsSizer->Hide( m_SizerDXF_options );
408413
break;
409414

410415
case PLOT_FORMAT_POST:
411416
m_drillShapeOpt->Enable( true );
412417
m_plotModeOpt->Enable( true );
413-
m_plotOutlineModeOpt->Enable( false );
414-
m_plotOutlineModeOpt->SetValue( false );
415418
m_plotMirrorOpt->Enable( true );
416419
m_useAuxOriginCheckBox->Enable( false );
417420
m_useAuxOriginCheckBox->SetValue( false );
@@ -431,21 +434,18 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
431434
m_PSFineAdjustWidthOpt->Enable( true );
432435
m_plotPSNegativeOpt->Enable( true );
433436
m_forcePSA4OutputOpt->Enable( true );
434-
m_plotTextAsLineOpt->Enable( false );
435-
m_plotTextAsLineOpt->SetValue( true );
436437

437438
m_PlotOptionsSizer->Hide( m_GerberOptionsSizer );
438439
m_PlotOptionsSizer->Hide( m_HPGLOptionsSizer );
439440
m_PlotOptionsSizer->Show( m_PSOptionsSizer );
441+
m_PlotOptionsSizer->Hide( m_SizerDXF_options );
440442
break;
441443

442444
case PLOT_FORMAT_GERBER:
443445
m_drillShapeOpt->Enable( false );
444446
m_drillShapeOpt->SetSelection( 0 );
445447
m_plotModeOpt->Enable( false );
446448
setPlotModeChoiceSelection( FILLED );
447-
m_plotOutlineModeOpt->Enable( false );
448-
m_plotOutlineModeOpt->SetValue( false );
449449
m_plotMirrorOpt->Enable( false );
450450
m_plotMirrorOpt->SetValue( false );
451451
m_useAuxOriginCheckBox->Enable( true );
@@ -465,19 +465,16 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
465465
m_plotPSNegativeOpt->SetValue( false );
466466
m_forcePSA4OutputOpt->Enable( false );
467467
m_forcePSA4OutputOpt->SetValue( false );
468-
m_plotTextAsLineOpt->Enable( false );
469-
m_plotTextAsLineOpt->SetValue( true );
470468

471469
m_PlotOptionsSizer->Show( m_GerberOptionsSizer );
472470
m_PlotOptionsSizer->Hide( m_HPGLOptionsSizer );
473471
m_PlotOptionsSizer->Hide( m_PSOptionsSizer );
472+
m_PlotOptionsSizer->Hide( m_SizerDXF_options );
474473
break;
475474

476475
case PLOT_FORMAT_HPGL:
477476
m_drillShapeOpt->Enable( true );
478477
m_plotModeOpt->Enable( true );
479-
m_plotOutlineModeOpt->Enable( false );
480-
m_plotOutlineModeOpt->SetValue( false );
481478
m_plotMirrorOpt->Enable( true );
482479
m_useAuxOriginCheckBox->Enable( false );
483480
m_useAuxOriginCheckBox->SetValue( false );
@@ -498,19 +495,17 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
498495
m_plotPSNegativeOpt->SetValue( false );
499496
m_plotPSNegativeOpt->Enable( false );
500497
m_forcePSA4OutputOpt->Enable( true );
501-
m_plotTextAsLineOpt->Enable( false );
502-
m_plotTextAsLineOpt->SetValue( true );
503498

504499
m_PlotOptionsSizer->Hide( m_GerberOptionsSizer );
505500
m_PlotOptionsSizer->Show( m_HPGLOptionsSizer );
506501
m_PlotOptionsSizer->Hide( m_PSOptionsSizer );
502+
m_PlotOptionsSizer->Hide( m_SizerDXF_options );
507503
break;
508504

509505
case PLOT_FORMAT_DXF:
510506
m_drillShapeOpt->Enable( true );
511507
m_plotModeOpt->Enable( false );
512508
setPlotModeChoiceSelection( FILLED );
513-
m_plotOutlineModeOpt->Enable( true );
514509
m_plotMirrorOpt->Enable( false );
515510
m_plotMirrorOpt->SetValue( false );
516511
m_useAuxOriginCheckBox->Enable( true );
@@ -537,8 +532,9 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
537532
m_PlotOptionsSizer->Hide( m_GerberOptionsSizer );
538533
m_PlotOptionsSizer->Hide( m_HPGLOptionsSizer );
539534
m_PlotOptionsSizer->Hide( m_PSOptionsSizer );
535+
m_PlotOptionsSizer->Show( m_SizerDXF_options );
540536

541-
OnChangeOutlineMode( event );
537+
OnChangeDXFPlotMode( event );
542538
break;
543539

544540
default:
@@ -612,10 +608,14 @@ void DIALOG_PLOT::applyPlotSettings()
612608
( m_drillShapeOpt->GetSelection() ) );
613609
tempOptions.SetMirror( m_plotMirrorOpt->GetValue() );
614610
tempOptions.SetPlotMode( m_plotModeOpt->GetSelection() == 1 ? SKETCH : FILLED );
615-
tempOptions.SetPlotOutlineMode( m_plotOutlineModeOpt->GetValue() );
611+
tempOptions.SetDXFPlotPolygonMode( m_DXF_plotModeOpt->GetValue() );
616612
tempOptions.SetPlotViaOnMaskLayer( m_plotNoViaOnMaskOpt->GetValue() );
617-
tempOptions.SetTextMode( m_plotTextAsLineOpt->GetValue() ?
618-
PLOTTEXTMODE_DEFAULT : PLOTTEXTMODE_NATIVE );
613+
614+
if( !m_DXF_plotTextStrokeFontOpt->IsEnabled() ) // Currently, only DXF supports this option
615+
tempOptions.SetTextMode( PLOTTEXTMODE_DEFAULT );
616+
else
617+
tempOptions.SetTextMode( m_DXF_plotTextStrokeFontOpt->GetValue() ?
618+
PLOTTEXTMODE_DEFAULT : PLOTTEXTMODE_NATIVE );
619619

620620
// Update settings from text fields. Rewrite values back to the fields,
621621
// since the values may have been constrained by the setters.
@@ -731,11 +731,15 @@ void DIALOG_PLOT::applyPlotSettings()
731731
dirStr.Replace( wxT( "\\" ), wxT( "/" ) );
732732
tempOptions.SetOutputDirectory( dirStr );
733733

734-
if( m_plotOpts != tempOptions )
734+
if( !m_plotOpts.IsSameAs( tempOptions, false ) )
735735
{
736+
// First, mark board as modified only for parameters saved in file
737+
if( !m_plotOpts.IsSameAs( tempOptions, true ) )
738+
m_parent->OnModify();
739+
740+
// Now, save any change, for the session
736741
m_parent->SetPlotSettings( tempOptions );
737742
m_plotOpts = tempOptions;
738-
m_parent->OnModify();
739743
}
740744
}
741745

‎pcbnew/dialogs/dialog_plot.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/*
66
* This program source code file is part of KiCad, a free EDA CAD application.
77
*
8-
* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
8+
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
99
*
1010
* This program is free software; you can redistribute it and/or
1111
* modify it under the terms of the GNU General Public License
@@ -31,8 +31,8 @@
3131
#include <pcb_plot_params.h>
3232

3333
/**
34-
* Class DIALOG_PLOT
35-
*
34+
* Class DIALOG_PLOT is the dialog to set the plot options, and create plot files
35+
* in various formats.
3636
*/
3737
class DIALOG_PLOT : public DIALOG_PLOT_BASE
3838
{
@@ -58,19 +58,19 @@ class DIALOG_PLOT : public DIALOG_PLOT_BASE
5858
PCB_PLOT_PARAMS m_plotOpts;
5959

6060
// Event called functions
61-
void Init_Dialog();
6261
void Plot( wxCommandEvent& event ) override;
6362
void OnQuit( wxCommandEvent& event ) override;
6463
void OnClose( wxCloseEvent& event ) override;
6564
void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) override;
6665
void OnRightClick( wxMouseEvent& event ) override;
6766
void OnPopUpLayers( wxCommandEvent& event ) override;
6867
void SetPlotFormat( wxCommandEvent& event ) override;
69-
void OnChangeOutlineMode( wxCommandEvent& event ) override;
68+
void OnChangeDXFPlotMode( wxCommandEvent& event ) override;
7069
void OnSetScaleOpt( wxCommandEvent& event ) override;
7170
void CreateDrillFile( wxCommandEvent& event ) override;
7271

7372
// orther functions
73+
void init_Dialog(); // main initialization
7474
void applyPlotSettings();
7575
PlotFormat getPlotFormat();
7676

‎pcbnew/dialogs/dialog_plot_base.cpp

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
///////////////////////////////////////////////////////////////////////////
2-
// C++ code generated with wxFormBuilder (version Dec 21 2016)
2+
// C++ code generated with wxFormBuilder (version Jul 2 2017)
33
// http://www.wxformbuilder.org/
44
//
55
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -127,18 +127,6 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
127127

128128
bSizerPlotItems->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );
129129

130-
m_plotOutlineModeOpt = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Plot lines in outline mode"), wxDefaultPosition, wxDefaultSize, 0 );
131-
m_plotOutlineModeOpt->SetValue(true);
132-
m_plotOutlineModeOpt->SetToolTip( _("Otherwise plot with sketch lines in layers that don't support polygons (*.SilkS, *_User, Edge.Cuts, Margin, *.CrtYd, *.Fab) and plot in outline mode in other layers (*.Cu, *.Adhes, *.Paste, *.Mask)") );
133-
134-
bSizerPlotItems->Add( m_plotOutlineModeOpt, 0, wxALL, 2 );
135-
136-
m_plotTextAsLineOpt = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Plot all text as lines"), wxDefaultPosition, wxDefaultSize, 0 );
137-
m_plotTextAsLineOpt->SetValue(true);
138-
m_plotTextAsLineOpt->SetToolTip( _("Otherwise plot oneline ASCII text as editable text") );
139-
140-
bSizerPlotItems->Add( m_plotTextAsLineOpt, 0, wxALL, 2 );
141-
142130

143131
bSizer192->Add( bSizerPlotItems, 0, wxEXPAND, 5 );
144132

@@ -361,6 +349,23 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
361349

362350
m_PlotOptionsSizer->Add( m_PSOptionsSizer, 0, wxALL|wxEXPAND, 3 );
363351

352+
m_SizerDXF_options = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("DXF options") ), wxVERTICAL );
353+
354+
m_DXF_plotModeOpt = new wxCheckBox( m_SizerDXF_options->GetStaticBox(), wxID_ANY, _("Plot all layers in outline (polygon) mode"), wxDefaultPosition, wxDefaultSize, 0 );
355+
m_DXF_plotModeOpt->SetValue(true);
356+
m_DXF_plotModeOpt->SetToolTip( _("DXF only:\nCheck to plot all layers in polygon mode.\nUncheck to plot in sketch mode layers that don't support polygons (*.SilkS, *_User, Edge.Cuts, Margin, *.CrtYd, *.Fab)\nand plot in polygon mode other layers (*.Cu, *.Adhes, *.Paste, *.Mask)") );
357+
358+
m_SizerDXF_options->Add( m_DXF_plotModeOpt, 0, wxALL, 2 );
359+
360+
m_DXF_plotTextStrokeFontOpt = new wxCheckBox( m_SizerDXF_options->GetStaticBox(), wxID_ANY, _("Use Pcbnew font to plot texts"), wxDefaultPosition, wxDefaultSize, 0 );
361+
m_DXF_plotTextStrokeFontOpt->SetValue(true);
362+
m_DXF_plotTextStrokeFontOpt->SetToolTip( _("Check to use Pcbnew stroke font\nUncheck to plot oneline ASCII texts as editable text (using DXF font)") );
363+
364+
m_SizerDXF_options->Add( m_DXF_plotTextStrokeFontOpt, 0, wxALL, 2 );
365+
366+
367+
m_PlotOptionsSizer->Add( m_SizerDXF_options, 0, wxEXPAND, 5 );
368+
364369

365370
bmiddleSizer->Add( m_PlotOptionsSizer, 0, 0, 5 );
366371

@@ -430,8 +435,8 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
430435
m_plotFormatOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
431436
m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
432437
m_layerCheckListBox->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DIALOG_PLOT_BASE::OnRightClick ), NULL, this );
433-
m_plotOutlineModeOpt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnChangeOutlineMode ), NULL, this );
434438
m_scaleOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
439+
m_DXF_plotModeOpt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnChangeDXFPlotMode ), NULL, this );
435440
m_plotButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
436441
m_buttonDrill->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
437442
m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );
@@ -451,8 +456,8 @@ DIALOG_PLOT_BASE::~DIALOG_PLOT_BASE()
451456
m_plotFormatOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::SetPlotFormat ), NULL, this );
452457
m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
453458
m_layerCheckListBox->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( DIALOG_PLOT_BASE::OnRightClick ), NULL, this );
454-
m_plotOutlineModeOpt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnChangeOutlineMode ), NULL, this );
455459
m_scaleOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnSetScaleOpt ), NULL, this );
460+
m_DXF_plotModeOpt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnChangeDXFPlotMode ), NULL, this );
456461
m_plotButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::Plot ), NULL, this );
457462
m_buttonDrill->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::CreateDrillFile ), NULL, this );
458463
m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_BASE::OnQuit ), NULL, this );

0 commit comments

Comments
 (0)