Gerbview: fix printing issue. (1d2ca601) · Commits · Elphel / kicad-source-mirror

eeschema/edit_component_in_schematic.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -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 );

gerbview/dialogs/dialog_print_using_printer.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -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();

gerbview/dialogs/dialog_print_using_printer_base.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -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;

gerbview/dialogs/dialog_print_using_printer_base.fbp

+0 −59

Original line number	Diff line number	Diff line
		@@ -578,65 +578,6 @@
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxRadioBox" expanded="1">
		<property name="bg"></property>
		<property name="choices">"1 Page per Layer" "Single page"</property>
		<property name="context_help"></property>
		<property name="context_menu">1</property>
		<property name="enabled">1</property>
		<property name="fg"></property>
		<property name="font"></property>
		<property name="hidden">0</property>
		<property name="id">wxID_PAGE_MODE</property>
		<property name="label">Page Print</property>
		<property name="majorDimension">1</property>
		<property name="maximum_size"></property>
		<property name="minimum_size"></property>
		<property name="name">m_PagesOption</property>
		<property name="permission">protected</property>
		<property name="pos"></property>
		<property name="selection">0</property>
		<property name="size"></property>
		<property name="style">wxRA_SPECIFY_COLS</property>
		<property name="subclass"></property>
		<property name="tooltip"></property>
		<property name="validator_data_type"></property>
		<property name="validator_style">wxFILTER_NONE</property>
		<property name="validator_type">wxDefaultValidator</property>
		<property name="validator_variable"></property>
		<property name="window_extra_style"></property>
		<property name="window_name"></property>
		<property name="window_style"></property>
		<event name="OnChar"></event>
		<event name="OnEnterWindow"></event>
		<event name="OnEraseBackground"></event>
		<event name="OnKeyDown"></event>
		<event name="OnKeyUp"></event>
		<event name="OnKillFocus"></event>
		<event name="OnLeaveWindow"></event>
		<event name="OnLeftDClick"></event>
		<event name="OnLeftDown"></event>
		<event name="OnLeftUp"></event>
		<event name="OnMiddleDClick"></event>
		<event name="OnMiddleDown"></event>
		<event name="OnMiddleUp"></event>
		<event name="OnMotion"></event>
		<event name="OnMouseEvents"></event>
		<event name="OnMouseWheel"></event>
		<event name="OnPaint"></event>
		<event name="OnRadioBox"></event>
		<event name="OnRightDClick"></event>
		<event name="OnRightDown"></event>
		<event name="OnRightUp"></event>
		<event name="OnSetFocus"></event>
		<event name="OnSize"></event>
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		</object>
		</object>
		<object class="sizeritem" expanded="1">

gerbview/dialogs/dialog_print_using_printer_base.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;