diff --git a/eeschema/edit_component_in_schematic.cpp b/eeschema/edit_component_in_schematic.cpp index e178076821..0970e6b96c 100644 --- a/eeschema/edit_component_in_schematic.cpp +++ b/eeschema/edit_component_in_schematic.cpp @@ -76,9 +76,9 @@ void SCH_EDIT_FRAME::StartMoveCmpField( SCH_FIELD* aField, wxDC* DC ) } -/******************************************************************************/ -/* Edit the field Field (text, size) */ -/******************************************************************************/ +/* + * Edit a field: text and size +*/ void SCH_EDIT_FRAME::EditCmpFieldText( SCH_FIELD* Field, wxDC* DC ) { int fieldNdx, flag; @@ -125,7 +125,8 @@ modified!\nYou must create a new power" ) ); wxString newtext = Field->m_Text; DrawPanel->m_IgnoreMouseEvents = TRUE; - wxTextEntryDialog dlg( this, Field->m_Name, _( "Component field text" ), newtext ); + wxString title = _( "Field:" ) + wxT(" ") + Field->m_Name; + wxTextEntryDialog dlg( this, wxEmptyString , title, newtext ); int diag = dlg.ShowModal(); newtext = dlg.GetValue( ); newtext.Trim( true ); diff --git a/gerbview/dialogs/dialog_print_using_printer.cpp b/gerbview/dialogs/dialog_print_using_printer.cpp index 970c83e9f5..72950e3db9 100644 --- a/gerbview/dialogs/dialog_print_using_printer.cpp +++ b/gerbview/dialogs/dialog_print_using_printer.cpp @@ -70,7 +70,7 @@ private: public: bool IsMirrored() { return m_Print_Mirror->IsChecked(); } - bool PrintUsingSinglePage() { return m_PagesOption->GetSelection(); } + bool PrintUsingSinglePage() { return true; } int SetLayerMaskFromListSelection(); }; @@ -314,9 +314,9 @@ void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( ) s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection() != 0; - if( m_PagesOption ) - s_Parameters.m_OptionPrintPage = m_PagesOption->GetSelection() != 0; - + // Due to negative objects in gerber objects, always use one page per image, + // because these objects create artefact when they are printed on an existing image. + s_Parameters.m_OptionPrintPage = false; SetLayerMaskFromListSelection(); diff --git a/gerbview/dialogs/dialog_print_using_printer_base.cpp b/gerbview/dialogs/dialog_print_using_printer_base.cpp index 558912190c..2957e21f1a 100644 --- a/gerbview/dialogs/dialog_print_using_printer_base.cpp +++ b/gerbview/dialogs/dialog_print_using_printer_base.cpp @@ -82,12 +82,6 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare bmiddleRightSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 ); - wxString m_PagesOptionChoices[] = { _("1 Page per Layer"), _("Single page") }; - int m_PagesOptionNChoices = sizeof( m_PagesOptionChoices ) / sizeof( wxString ); - m_PagesOption = new wxRadioBox( this, wxID_PAGE_MODE, _("Page Print"), wxDefaultPosition, wxDefaultSize, m_PagesOptionNChoices, m_PagesOptionChoices, 1, wxRA_SPECIFY_COLS ); - m_PagesOption->SetSelection( 0 ); - bmiddleRightSizer->Add( m_PagesOption, 0, wxALL|wxEXPAND, 5 ); - bMainSizer->Add( bmiddleRightSizer, 0, wxEXPAND, 5 ); wxBoxSizer* b_buttonsSizer; diff --git a/gerbview/dialogs/dialog_print_using_printer_base.fbp b/gerbview/dialogs/dialog_print_using_printer_base.fbp index f6ea58371b..db3d6e6963 100644 --- a/gerbview/dialogs/dialog_print_using_printer_base.fbp +++ b/gerbview/dialogs/dialog_print_using_printer_base.fbp @@ -578,65 +578,6 @@ - - 5 - wxALL|wxEXPAND - 0 - - - "1 Page per Layer" "Single page" - - 1 - 1 - - - 0 - wxID_PAGE_MODE - Page Print - 1 - - - m_PagesOption - protected - - 0 - - wxRA_SPECIFY_COLS - - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gerbview/dialogs/dialog_print_using_printer_base.h b/gerbview/dialogs/dialog_print_using_printer_base.h index 0b1c58d185..0c954986e6 100644 --- a/gerbview/dialogs/dialog_print_using_printer_base.h +++ b/gerbview/dialogs/dialog_print_using_printer_base.h @@ -37,7 +37,6 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog enum { wxID_PRINT_MODE = 1000, - wxID_PAGE_MODE, wxID_PRINT_OPTIONS, wxID_PRINT_ALL, }; @@ -51,7 +50,6 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog wxTextCtrl* m_FineAdjustYscaleOpt; wxCheckBox* m_Print_Mirror; wxRadioBox* m_ModeColorOption; - wxRadioBox* m_PagesOption; wxButton* m_buttonOption; wxButton* m_buttonPreview; wxButton* m_buttonPrint; diff --git a/gerbview/draw_gerber_screen.cpp b/gerbview/draw_gerber_screen.cpp index 8252ec0656..ad54d90f01 100644 --- a/gerbview/draw_gerber_screen.cpp +++ b/gerbview/draw_gerber_screen.cpp @@ -53,7 +53,7 @@ void WinEDA_GerberFrame::PrintPage( wxDC* aDC, int aPrintMasklayer, DrawPanel->m_PrintIsMirrored = aPrintMirrorMode; - GetBoard()->Draw( DrawPanel, aDC, GR_COPY, wxPoint( 0, 0 ) ); + GetBoard()->Draw( DrawPanel, aDC, -1, wxPoint( 0, 0 ) ); DrawPanel->m_PrintIsMirrored = false; diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp index c7549f81fb..51ced60dba 100644 --- a/pcbnew/dialogs/dialog_design_rules.cpp +++ b/pcbnew/dialogs/dialog_design_rules.cpp @@ -322,6 +322,23 @@ void DIALOG_DESIGN_RULES::InitDimensionsLists() wxString msg; int Internal_Unit = m_Parent->m_InternalUnits; + // Compute the column widths here, after setting texts + msg = wxT("000000.000000"); // This is a very long text to display values. + // Actual values are shorter. + m_gridViaSizeList->SetCellValue( 0, 0, msg ); + m_gridViaSizeList->SetCellValue( 0, 1, msg ); + m_gridTrackWidthList->SetCellValue( 0, 0, msg ); + m_gridViaSizeList->SetColMinimalWidth(0,150); + m_gridViaSizeList->SetColMinimalWidth(1,150); + m_gridViaSizeList->AutoSizeColumns(true); + m_gridTrackWidthList->SetColMinimalWidth(0,150); + m_gridTrackWidthList->AutoSizeColumns(true); + + // Fill cells with actual values: + m_gridViaSizeList->SetCellValue( 0, 0, wxEmptyString ); + m_gridViaSizeList->SetCellValue( 0, 1, wxEmptyString ); + m_gridTrackWidthList->SetCellValue( 0, 0, wxEmptyString ); + for( unsigned ii = 0; ii < m_TracksWidthList.size(); ii++ ) { msg = ReturnStringFromValue( g_UserUnit, m_TracksWidthList[ii], Internal_Unit, false ); @@ -340,10 +357,6 @@ void DIALOG_DESIGN_RULES::InitDimensionsLists() m_gridViaSizeList->SetCellValue( ii, 1, msg ); } } - - // recompute the column widths here, after setting texts - m_gridViaSizeList->SetColumnWidth( 0, wxLIST_AUTOSIZE ); - m_gridTrackWidthList->SetColumnWidth( 0, wxLIST_AUTOSIZE ); } diff --git a/pcbnew/dialogs/dialog_design_rules_base.cpp b/pcbnew/dialogs/dialog_design_rules_base.cpp index 2b464dbf5d..02be2970b6 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.cpp +++ b/pcbnew/dialogs/dialog_design_rules_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Sep 8 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -153,7 +153,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_panelNetClassesEditor->SetSizer( bpanelNetClassesSizer ); m_panelNetClassesEditor->Layout(); bpanelNetClassesSizer->Fit( m_panelNetClassesEditor ); - m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), true ); + m_DRnotebook->AddPage( m_panelNetClassesEditor, _("Net Classes Editor"), false ); m_panelGolbalDesignRules = new wxPanel( m_DRnotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); wxBoxSizer* bpanelGlobRulesSizer; bpanelGlobRulesSizer = new wxBoxSizer( wxVERTICAL ); @@ -305,7 +305,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID // Cell Defaults m_gridViaSizeList->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - sViaSizeBox->Add( m_gridViaSizeList, 0, wxALL, 5 ); + sViaSizeBox->Add( m_gridViaSizeList, 0, wxALL|wxEXPAND, 5 ); bDesignRulesLowerSizer->Add( sViaSizeBox, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); @@ -348,7 +348,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID // Cell Defaults m_gridTrackWidthList->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - sbTracksListSizer->Add( m_gridTrackWidthList, 0, wxALL, 5 ); + sbTracksListSizer->Add( m_gridTrackWidthList, 0, wxALL|wxEXPAND, 5 ); bDesignRulesLowerSizer->Add( sbTracksListSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 ); @@ -357,7 +357,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID m_panelGolbalDesignRules->SetSizer( bpanelGlobRulesSizer ); m_panelGolbalDesignRules->Layout(); bpanelGlobRulesSizer->Fit( m_panelGolbalDesignRules ); - m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), false ); + m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), true ); bMainSizer->Add( m_DRnotebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -418,4 +418,5 @@ DIALOG_DESIGN_RULES_BASE::~DIALOG_DESIGN_RULES_BASE() m_rightClassChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnRightCBSelection ), NULL, this ); m_buttonOk->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnOkButtonClick ), NULL, this ); m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_DESIGN_RULES_BASE::OnCancelButtonClick ), NULL, this ); + } diff --git a/pcbnew/dialogs/dialog_design_rules_base.fbp b/pcbnew/dialogs/dialog_design_rules_base.fbp index 103a0e5a04..411a15d1e1 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.fbp +++ b/pcbnew/dialogs/dialog_design_rules_base.fbp @@ -1,10 +1,12 @@ - + C++ 1 + source_name + 0 UTF-8 connect dialog_design_rules_base @@ -16,13 +18,16 @@ . 1 + 1 1 0 + 1 1 + impl_virtual @@ -37,6 +42,10 @@ Design Rules Editor + + wxFILTER_NONE + wxDefaultValidator + @@ -83,6 +92,7 @@ + 1 1 @@ -97,6 +107,10 @@ wxNB_TOP + + wxFILTER_NONE + wxDefaultValidator + @@ -128,10 +142,11 @@ Net Classes Editor - 1 + 0 + 1 1 @@ -145,6 +160,10 @@ + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER|wxTAB_TRAVERSAL @@ -208,6 +227,7 @@ 6 100,120,84,85,81,90 + 1 0 1 0 @@ -239,6 +259,10 @@ Net Class parameters + + wxFILTER_NONE + wxDefaultValidator + wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL @@ -315,6 +339,7 @@ + 1 0 1 @@ -331,6 +356,10 @@ Add another Net Class + + wxFILTER_NONE + wxDefaultValidator + @@ -367,6 +396,7 @@ + 1 0 1 @@ -383,6 +413,10 @@ Remove the currently select Net Class The default Net Class cannot be removed + + wxFILTER_NONE + wxDefaultValidator + @@ -419,6 +453,7 @@ + 1 0 1 @@ -435,6 +470,10 @@ Move the currently selected Net Class up one row + + wxFILTER_NONE + wxDefaultValidator + @@ -497,6 +536,7 @@ + 1 1 @@ -511,6 +551,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -547,6 +591,7 @@ + 1 1 @@ -561,6 +606,10 @@ wxLC_HRULES|wxLC_REPORT|wxLC_VIRTUAL|wxLC_VRULES NETS_LIST_CTRL; dialog_design_rules_aux_helper_class.h + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER @@ -627,6 +676,7 @@ + 1 0 1 @@ -643,6 +693,10 @@ Move the selected nets in the right list to the left list + + wxFILTER_NONE + wxDefaultValidator + @@ -679,6 +733,7 @@ + 1 0 1 @@ -695,6 +750,10 @@ Move the selected nets in the left list to the right list + + wxFILTER_NONE + wxDefaultValidator + @@ -731,6 +790,7 @@ + 1 0 1 @@ -747,6 +807,10 @@ Select all nets in the left list + + wxFILTER_NONE + wxDefaultValidator + @@ -783,6 +847,7 @@ + 1 0 1 @@ -799,6 +864,10 @@ Select all nets in the right list + + wxFILTER_NONE + wxDefaultValidator + @@ -847,6 +916,7 @@ + 1 1 @@ -861,6 +931,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -897,6 +971,7 @@ + 1 1 @@ -911,6 +986,10 @@ wxLC_HRULES|wxLC_REPORT|wxLC_VIRTUAL|wxLC_VRULES NETS_LIST_CTRL; dialog_design_rules_aux_helper_class.h + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER @@ -969,10 +1048,11 @@ Global Design Rules - 0 + 1 + 1 1 @@ -986,6 +1066,10 @@ + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER|wxTAB_TRAVERSAL @@ -1046,6 +1130,7 @@ "Through via" "Blind or buried via" + 1 1 @@ -1063,6 +1148,10 @@ wxRA_SPECIFY_COLS Select the current via type. Trough via is the usual selection + + wxFILTER_NONE + wxDefaultValidator + @@ -1115,6 +1204,7 @@ + 1 1 @@ -1130,6 +1220,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1166,6 +1260,7 @@ + 1 1 @@ -1181,6 +1276,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1221,6 +1320,7 @@ + 1 1 @@ -1236,6 +1336,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1272,6 +1376,7 @@ + 1 1 @@ -1287,6 +1392,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1344,6 +1453,7 @@ "Do not allow micro vias" "Allow micro vias" + 1 1 @@ -1361,6 +1471,10 @@ wxRA_SPECIFY_COLS Allows or do not allow use of micro vias They are very small vias only from an external copper layer to its near neightbour + + wxFILTER_NONE + wxDefaultValidator + @@ -1413,6 +1527,7 @@ + 1 1 @@ -1428,6 +1543,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1464,6 +1583,7 @@ + 1 1 @@ -1479,6 +1599,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1519,6 +1643,7 @@ + 1 1 @@ -1534,6 +1659,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1570,6 +1699,7 @@ + 1 1 @@ -1585,6 +1715,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1657,6 +1791,7 @@ + 1 1 @@ -1672,6 +1807,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1708,6 +1847,7 @@ + 1 1 @@ -1723,6 +1863,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1769,6 +1913,7 @@ + 1 1 @@ -1783,6 +1928,10 @@ wxLI_HORIZONTAL + + wxFILTER_NONE + wxDefaultValidator + @@ -1818,6 +1967,7 @@ + 1 1 @@ -1833,6 +1983,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1890,6 +2044,7 @@ + 1 1 @@ -1905,6 +2060,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -1936,7 +2095,7 @@ 5 - wxALL + wxALL|wxEXPAND 0 0 @@ -1954,6 +2113,7 @@ 2 + 1 0 1 0 @@ -1985,6 +2145,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2066,6 +2230,7 @@ + 1 1 @@ -2081,6 +2246,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2112,7 +2281,7 @@ 5 - wxALL + wxALL|wxEXPAND 0 0 @@ -2130,6 +2299,7 @@ 1 + 1 0 1 0 @@ -2161,6 +2331,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2249,6 +2423,7 @@ + 1 1 @@ -2263,6 +2438,10 @@ wxHW_SCROLLBAR_AUTO + + wxFILTER_NONE + wxDefaultValidator + wxSUNKEN_BORDER @@ -2310,6 +2489,7 @@ + 1 1 1 @@ -2326,6 +2506,10 @@ + + wxFILTER_NONE + wxDefaultValidator + @@ -2362,6 +2546,7 @@ + 1 0 1 @@ -2378,6 +2563,10 @@ + + wxFILTER_NONE + wxDefaultValidator + diff --git a/pcbnew/dialogs/dialog_design_rules_base.h b/pcbnew/dialogs/dialog_design_rules_base.h index 07153b5f38..48a36fa5d6 100644 --- a/pcbnew/dialogs/dialog_design_rules_base.h +++ b/pcbnew/dialogs/dialog_design_rules_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) +// C++ code generated with wxFormBuilder (version Sep 8 2010) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -93,22 +93,23 @@ class DIALOG_DESIGN_RULES_BASE : public wxDialog wxButton* m_buttonCancel; // Virtual event handlers, overide them in your derived class - virtual void OnNetClassesNameLeftClick( wxGridEvent& event ){ event.Skip(); } - virtual void OnNetClassesNameRightClick( wxGridEvent& event ){ event.Skip(); } - virtual void OnAddNetclassClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnRemoveNetclassClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnMoveUpSelectedNetClass( wxCommandEvent& event ){ event.Skip(); } - virtual void OnLeftCBSelection( wxCommandEvent& event ){ event.Skip(); } - virtual void OnRightToLeftCopyButton( wxCommandEvent& event ){ event.Skip(); } - virtual void OnLeftToRightCopyButton( wxCommandEvent& event ){ event.Skip(); } - virtual void OnLeftSelectAllButton( wxCommandEvent& event ){ event.Skip(); } - virtual void OnRightSelectAllButton( wxCommandEvent& event ){ event.Skip(); } - virtual void OnRightCBSelection( wxCommandEvent& event ){ event.Skip(); } - virtual void OnOkButtonClick( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnNetClassesNameLeftClick( wxGridEvent& event ) { event.Skip(); } + virtual void OnNetClassesNameRightClick( wxGridEvent& event ) { event.Skip(); } + virtual void OnAddNetclassClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRemoveNetclassClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnMoveUpSelectedNetClass( wxCommandEvent& event ) { event.Skip(); } + virtual void OnLeftCBSelection( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRightToLeftCopyButton( wxCommandEvent& event ) { event.Skip(); } + virtual void OnLeftToRightCopyButton( wxCommandEvent& event ) { event.Skip(); } + virtual void OnLeftSelectAllButton( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRightSelectAllButton( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRightCBSelection( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } public: + DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,640 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_DESIGN_RULES_BASE(); diff --git a/pcbnew/print_board_functions.cpp b/pcbnew/print_board_functions.cpp index 2f0d09aad7..a1e39fdf3c 100644 --- a/pcbnew/print_board_functions.cpp +++ b/pcbnew/print_board_functions.cpp @@ -184,8 +184,8 @@ void WinEDA_PcbFrame::PrintPage( wxDC* aDC, bool nctmp = GetBoard()->IsElementVisible(NO_CONNECTS_VISIBLE); GetBoard()->SetElementVisibility(NO_CONNECTS_VISIBLE, false); DisplayOpt.DisplayPadIsol = false; - DisplayOpt.DisplayModEdge = FILLED; - DisplayOpt.DisplayModText = FILLED; + m_DisplayModEdge = DisplayOpt.DisplayModEdge = FILLED; + m_DisplayModText = DisplayOpt.DisplayModText = FILLED; m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill = FILLED; DisplayOpt.ShowTrackClearanceMode = DO_NOT_SHOW_CLEARANCE; DisplayOpt.DisplayDrawItems = FILLED; @@ -311,6 +311,8 @@ void WinEDA_PcbFrame::PrintPage( wxDC* aDC, m_DisplayPadFill = DisplayOpt.DisplayPadFill; m_DisplayViaFill = DisplayOpt.DisplayViaFill; m_DisplayPadNum = DisplayOpt.DisplayPadNum; + m_DisplayModEdge = DisplayOpt.DisplayModEdge; + m_DisplayModText = DisplayOpt.DisplayModText; GetBoard()->SetElementVisibility(NO_CONNECTS_VISIBLE, nctmp); }