beautify (71390134) · Commits · Elphel / kicad-source-mirror

eeschema/plotps.cpp

+311 −215

Original line number	Original line	Diff line number	Diff line
	/////////////////////////////////////////////////////////////////////////////		/////////////////////////////////////////////////////////////////////////////

	// Name: plotps.cpp		// Name: plotps.cpp
	// Purpose:		// Purpose:
	// Author: jean-pierre Charras		// Author: jean-pierre Charras
	@@ -69,17 +70,22 @@ static bool Plot_Sheet_Ref = TRUE;
	/***********************************************************/		/***********************************************************/
	void WinEDA_SchematicFrame::ToPlot_PS( wxCommandEvent& event )		void WinEDA_SchematicFrame::ToPlot_PS( wxCommandEvent& event )
	/***********************************************************/		/***********************************************************/

	/* fonction relai de creation de la frame de dialogue pour trace Postscript		/* fonction relai de creation de la frame de dialogue pour trace Postscript
	*/		*/
	{		{
	wxPoint pos;		wxPoint pos;

	pos = GetPosition();		pos = GetPosition();
	pos.x += 10; pos.y += 20;
			pos.x += 10;
			pos.y += 20;

	WinEDA_PlotPSFrame* Ps_frame = new WinEDA_PlotPSFrame( this );		WinEDA_PlotPSFrame* Ps_frame = new WinEDA_PlotPSFrame( this );
	Ps_frame->ShowModal(); Ps_frame->Destroy();
	}

			Ps_frame->ShowModal();
			Ps_frame->Destroy();
			}


	/*!		/*!
	@@ -115,16 +121,28 @@ WinEDA_PlotPSFrame::WinEDA_PlotPSFrame( )
	{		{
	}		}

	WinEDA_PlotPSFrame::WinEDA_PlotPSFrame( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
			WinEDA_PlotPSFrame::WinEDA_PlotPSFrame( wxWindow* parent,
			wxWindowID id,
			const wxString& caption,
			const wxPoint& pos,
			const wxSize& size,
			long style )
	{		{
	Create( parent, id, caption, pos, size, style );		Create( parent, id, caption, pos, size, style );
	}		}


	/*!		/*!
	* WinEDA_PlotPSFrame creator		* WinEDA_PlotPSFrame creator
	*/		*/

	bool WinEDA_PlotPSFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )		bool WinEDA_PlotPSFrame::Create( wxWindow* parent,
			wxWindowID id,
			const wxString& caption,
			const wxPoint& pos,
			const wxSize& size,
			long style )
	{		{
	////@begin WinEDA_PlotPSFrame member initialisation		////@begin WinEDA_PlotPSFrame member initialisation
	m_SizeOption = NULL;		m_SizeOption = NULL;
	@@ -133,6 +151,7 @@ bool WinEDA_PlotPSFrame::Create( wxWindow* parent, wxWindowID id, const wxString
	m_btClose = NULL;		m_btClose = NULL;
	m_DefaultLineSizeCtrlSizer = NULL;		m_DefaultLineSizeCtrlSizer = NULL;
	m_MsgBox = NULL;		m_MsgBox = NULL;

	////@end WinEDA_PlotPSFrame member initialisation		////@end WinEDA_PlotPSFrame member initialisation

	////@begin WinEDA_PlotPSFrame creation		////@begin WinEDA_PlotPSFrame creation
	@@ -145,10 +164,12 @@ bool WinEDA_PlotPSFrame::Create( wxWindow* parent, wxWindowID id, const wxString
	GetSizer()->SetSizeHints( this );		GetSizer()->SetSizeHints( this );
	}		}
	Centre();		Centre();

	////@end WinEDA_PlotPSFrame creation		////@end WinEDA_PlotPSFrame creation
	return true;		return true;
	}		}


	/*!		/*!
	* Control creation for WinEDA_PlotPSFrame		* Control creation for WinEDA_PlotPSFrame
	*/		*/
	@@ -163,75 +184,117 @@ void WinEDA_PlotPSFrame::CreateControls()
	WinEDA_PlotPSFrame* itemDialog1 = this;		WinEDA_PlotPSFrame* itemDialog1 = this;

	wxBoxSizer* itemBoxSizer2 = new wxBoxSizer( wxVERTICAL );		wxBoxSizer* itemBoxSizer2 = new wxBoxSizer( wxVERTICAL );

	itemDialog1->SetSizer( itemBoxSizer2 );		itemDialog1->SetSizer( itemBoxSizer2 );

	wxBoxSizer* itemBoxSizer3 = new wxBoxSizer( wxHORIZONTAL );		wxBoxSizer* itemBoxSizer3 = new wxBoxSizer( wxHORIZONTAL );

	itemBoxSizer2->Add( itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL \| wxALL, 5 );		itemBoxSizer2->Add( itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL \| wxALL, 5 );

	wxArrayString m_SizeOptionStrings;		wxArrayString m_SizeOptionStrings;
	m_SizeOptionStrings.Add( _( "Auto" ) );		m_SizeOptionStrings.Add( _( "Auto" ) );
	m_SizeOptionStrings.Add( _( "Page Size A4" ) );		m_SizeOptionStrings.Add( _( "Page Size A4" ) );
	m_SizeOptionStrings.Add( _( "Page Size A" ) );		m_SizeOptionStrings.Add( _( "Page Size A" ) );
	m_SizeOption = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Plot page size:"), wxDefaultPosition, wxDefaultSize, m_SizeOptionStrings, 1, wxRA_SPECIFY_COLS );		m_SizeOption = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _(
			"Plot page size:" ), wxDefaultPosition, wxDefaultSize,
			m_SizeOptionStrings, 1,
			wxRA_SPECIFY_COLS );

	m_SizeOption->SetSelection( 0 );		m_SizeOption->SetSelection( 0 );
	itemBoxSizer3->Add( m_SizeOption, 0, wxGROW \| wxALL, 5 );		itemBoxSizer3->Add( m_SizeOption, 0, wxGROW \| wxALL, 5 );

	itemBoxSizer3->Add( 5, 5, 0, wxALIGN_CENTER_VERTICAL \| wxALL, 5 );		itemBoxSizer3->Add( 5, 5, 0, wxALIGN_CENTER_VERTICAL \| wxALL, 5 );

	wxStaticBox* itemStaticBoxSizer6Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Plot Options:"));		wxStaticBox* itemStaticBoxSizer6Static = new wxStaticBox( itemDialog1, wxID_ANY, _(
	wxStaticBoxSizer* itemStaticBoxSizer6 = new wxStaticBoxSizer(itemStaticBoxSizer6Static, wxVERTICAL);		"Plot Options:" ) );

			wxStaticBoxSizer* itemStaticBoxSizer6 = new wxStaticBoxSizer(
			itemStaticBoxSizer6Static,
			wxVERTICAL );

	itemBoxSizer3->Add( itemStaticBoxSizer6, 0, wxALIGN_CENTER_VERTICAL \| wxALL, 5 );		itemBoxSizer3->Add( itemStaticBoxSizer6, 0, wxALIGN_CENTER_VERTICAL \| wxALL, 5 );

	wxArrayString m_PlotPSColorOptionStrings;		wxArrayString m_PlotPSColorOptionStrings;
	m_PlotPSColorOptionStrings.Add( _( "B/W" ) );		m_PlotPSColorOptionStrings.Add( _( "B/W" ) );
	m_PlotPSColorOptionStrings.Add( _( "Color" ) );		m_PlotPSColorOptionStrings.Add( _( "Color" ) );
	m_PlotPSColorOption = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Plot Color:"), wxDefaultPosition, wxDefaultSize, m_PlotPSColorOptionStrings, 1, wxRA_SPECIFY_COLS );		m_PlotPSColorOption = new wxRadioBox( itemDialog1, ID_RADIOBOX, _(
			"Plot Color:" ), wxDefaultPosition, wxDefaultSize,
			m_PlotPSColorOptionStrings, 1,
			wxRA_SPECIFY_COLS );

	m_PlotPSColorOption->SetSelection( 0 );		m_PlotPSColorOption->SetSelection( 0 );
	itemStaticBoxSizer6->Add( m_PlotPSColorOption, 0, wxGROW \| wxALL, 5 );		itemStaticBoxSizer6->Add( m_PlotPSColorOption, 0, wxGROW \| wxALL, 5 );

	m_Plot_Sheet_Ref = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Print Sheet Ref"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );		m_Plot_Sheet_Ref = new wxCheckBox( itemDialog1, ID_CHECKBOX, _(
			"Print Sheet Ref" ), wxDefaultPosition,
			wxDefaultSize, wxCHK_2STATE );

	m_Plot_Sheet_Ref->SetValue( false );		m_Plot_Sheet_Ref->SetValue( false );
	itemStaticBoxSizer6->Add( m_Plot_Sheet_Ref, 0, wxGROW \| wxALL, 5 );		itemStaticBoxSizer6->Add( m_Plot_Sheet_Ref, 0, wxGROW \| wxALL, 5 );

	itemBoxSizer3->Add( 5, 5, 0, wxALIGN_CENTER_VERTICAL \| wxALL, 5 );		itemBoxSizer3->Add( 5, 5, 0, wxALIGN_CENTER_VERTICAL \| wxALL, 5 );

	wxBoxSizer* itemBoxSizer10 = new wxBoxSizer( wxVERTICAL );		wxBoxSizer* itemBoxSizer10 = new wxBoxSizer( wxVERTICAL );

	itemBoxSizer3->Add( itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL \| wxALL, 5 );		itemBoxSizer3->Add( itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL \| wxALL, 5 );

	wxButton* itemButton11 = new wxButton( itemDialog1, ID_PLOT_PS_CURRENT_EXECUTE, _("&Plot CURRENT"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton11 = new wxButton( itemDialog1, ID_PLOT_PS_CURRENT_EXECUTE, _(
			"&Plot CURRENT" ), wxDefaultPosition,
			wxDefaultSize, 0 );

	itemButton11->SetForegroundColour( wxColour( 0, 128, 0 ) );		itemButton11->SetForegroundColour( wxColour( 0, 128, 0 ) );
	itemBoxSizer10->Add( itemButton11, 0, wxGROW \| wxALL, 5 );		itemBoxSizer10->Add( itemButton11, 0, wxGROW \| wxALL, 5 );

	wxButton* itemButton12 = new wxButton( itemDialog1, ID_PLOT_PS_ALL_EXECUTE, _("Plot A&LL"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton12 = new wxButton( itemDialog1, ID_PLOT_PS_ALL_EXECUTE, _(
			"Plot A&LL" ), wxDefaultPosition,
			wxDefaultSize, 0 );

	itemButton12->SetForegroundColour( wxColour( 179, 0, 0 ) );		itemButton12->SetForegroundColour( wxColour( 179, 0, 0 ) );
	itemBoxSizer10->Add( itemButton12, 0, wxGROW \| wxALL, 5 );		itemBoxSizer10->Add( itemButton12, 0, wxGROW \| wxALL, 5 );

	m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );		m_btClose = new wxButton( itemDialog1, wxID_CANCEL, _(
			"Close" ), wxDefaultPosition, wxDefaultSize,
			0 );

	m_btClose->SetDefault();		m_btClose->SetDefault();
	m_btClose->SetForegroundColour( wxColour( 0, 0, 255 ) );		m_btClose->SetForegroundColour( wxColour( 0, 0, 255 ) );
	itemBoxSizer10->Add( m_btClose, 0, wxGROW \| wxALL, 5 );		itemBoxSizer10->Add( m_btClose, 0, wxGROW \| wxALL, 5 );

	m_DefaultLineSizeCtrlSizer = new wxBoxSizer( wxVERTICAL );		m_DefaultLineSizeCtrlSizer = new wxBoxSizer( wxVERTICAL );

	itemBoxSizer2->Add( m_DefaultLineSizeCtrlSizer, 0, wxGROW \| wxALL, 5 );		itemBoxSizer2->Add( m_DefaultLineSizeCtrlSizer, 0, wxGROW \| wxALL, 5 );

	wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("Messages :"), wxDefaultPosition, wxDefaultSize, 0 );		wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _(
	itemBoxSizer2->Add(itemStaticText15, 0, wxALIGN_LEFT\|wxLEFT\|wxRIGHT\|wxTOP\|wxADJUST_MINSIZE, 5);		"Messages :" ), wxDefaultPosition,
			wxDefaultSize, 0 );

			itemBoxSizer2->Add( itemStaticText15,
			0,
			wxALIGN_LEFT \| wxLEFT \| wxRIGHT \| wxTOP \| wxADJUST_MINSIZE,
			5 );

			m_MsgBox = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(
			"" ), wxDefaultPosition, wxSize( -1,
			200 ), wxTE_MULTILINE );

	m_MsgBox = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxSize(-1, 200), wxTE_MULTILINE );
	itemBoxSizer2->Add( m_MsgBox, 0, wxGROW \| wxALL \| wxFIXED_MINSIZE, 5 );		itemBoxSizer2->Add( m_MsgBox, 0, wxGROW \| wxALL \| wxFIXED_MINSIZE, 5 );

	// Set validators		// Set validators
	m_SizeOption->SetValidator( wxGenericValidator( &PS_SizeSelect ) );		m_SizeOption->SetValidator( wxGenericValidator( &PS_SizeSelect ) );
	m_PlotPSColorOption->SetValidator( wxGenericValidator( &g_PlotPSColorOpt ) );		m_PlotPSColorOption->SetValidator( wxGenericValidator( &g_PlotPSColorOpt ) );
	m_Plot_Sheet_Ref->SetValidator( wxGenericValidator( &Plot_Sheet_Ref ) );		m_Plot_Sheet_Ref->SetValidator( wxGenericValidator( &Plot_Sheet_Ref ) );

	////@end WinEDA_PlotPSFrame content construction		////@end WinEDA_PlotPSFrame content construction

	m_btClose->SetFocus();		m_btClose->SetFocus();
	m_DefaultLineSizeCtrl = new WinEDA_ValueCtrl(this, _("Default Line Width"), g_PlotPSMinimunLineWidth,		m_DefaultLineSizeCtrl = new WinEDA_ValueCtrl( this, _(
	g_UnitMetric, m_DefaultLineSizeCtrlSizer, EESCHEMA_INTERNAL_UNIT );		"Default Line Width" ),
			g_PlotPSMinimunLineWidth,
			g_UnitMetric, m_DefaultLineSizeCtrlSizer,
			EESCHEMA_INTERNAL_UNIT );
	}		}


	/*!		/*!
	* Should we show tooltips?		* Should we show tooltips?
	*/		*/
	@@ -241,6 +304,7 @@ bool WinEDA_PlotPSFrame::ShowToolTips()
	return true;		return true;
	}		}


	/*!		/*!
	* Get bitmap resources		* Get bitmap resources
	*/		*/
	@@ -251,9 +315,11 @@ wxBitmap WinEDA_PlotPSFrame::GetBitmapResource( const wxString& name )
	////@begin WinEDA_PlotPSFrame bitmap retrieval		////@begin WinEDA_PlotPSFrame bitmap retrieval
	wxUnusedVar( name );		wxUnusedVar( name );
	return wxNullBitmap;		return wxNullBitmap;

	////@end WinEDA_PlotPSFrame bitmap retrieval		////@end WinEDA_PlotPSFrame bitmap retrieval
	}		}


	/*!		/*!
	* Get icon resources		* Get icon resources
	*/		*/
	@@ -264,8 +330,11 @@ wxIcon WinEDA_PlotPSFrame::GetIconResource( const wxString& name )
	////@begin WinEDA_PlotPSFrame icon retrieval		////@begin WinEDA_PlotPSFrame icon retrieval
	wxUnusedVar( name );		wxUnusedVar( name );
	return wxNullIcon;		return wxNullIcon;

	////@end WinEDA_PlotPSFrame icon retrieval		////@end WinEDA_PlotPSFrame icon retrieval
	}		}


	/*!		/*!
	* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON		* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_BUTTON
	*/		*/
	@@ -313,8 +382,8 @@ void WinEDA_PlotPSFrame::InitOptVars()
	g_PlotPSColorOpt = m_PlotPSColorOption->GetSelection();		g_PlotPSColorOpt = m_PlotPSColorOption->GetSelection();
	PS_SizeSelect = m_SizeOption->GetSelection();		PS_SizeSelect = m_SizeOption->GetSelection();
	g_PlotPSMinimunLineWidth = m_DefaultLineSizeCtrl->GetValue();		g_PlotPSMinimunLineWidth = m_DefaultLineSizeCtrl->GetValue();
	if ( g_PlotPSMinimunLineWidth < 1 ) g_PlotPSMinimunLineWidth = 1;		if( g_PlotPSMinimunLineWidth < 1 )
			g_PlotPSMinimunLineWidth = 1;
	}		}


	@@ -333,14 +402,20 @@ wxPoint plot_offset;
	/* Build the screen list */		/* Build the screen list */
	EDA_ScreenList ScreenList;		EDA_ScreenList ScreenList;

	if ( AllPages == TRUE ) screen = ScreenList.GetFirst();		if( AllPages == TRUE )
	else screen = ActiveScreen;		screen = ScreenList.GetFirst();
			else
			screen = ActiveScreen;

	for( ; screen != NULL; screen = ScreenList.GetNext() )		for( ; screen != NULL; screen = ScreenList.GetNext() )
	{		{
	PlotSheet = screen->m_CurrentSheetDesc;		PlotSheet = screen->m_CurrentSheetDesc;
	RealSheet = &g_Sheet_A4;		RealSheet = &g_Sheet_A4;
	if ( pagesize == PAGE_SIZE_AUTO ) RealSheet = PlotSheet;
	else if ( pagesize == PAGE_SIZE_A ) RealSheet = &g_Sheet_A;		if( pagesize == PAGE_SIZE_AUTO )
			RealSheet = PlotSheet;
			else if( pagesize == PAGE_SIZE_A )
			RealSheet = &g_Sheet_A;

	/* Calcul des limites de trace en 1/1000 pouce */		/* Calcul des limites de trace en 1/1000 pouce */
	BBox[0] = BBox[1] = g_PlotMargin; // Plot margin in 1/1000 inch		BBox[0] = BBox[1] = g_PlotMargin; // Plot margin in 1/1000 inch
	@@ -351,6 +426,7 @@ wxPoint plot_offset;
	g_PlotScaleX = SCALE_PS *		g_PlotScaleX = SCALE_PS *
	(float) (BBox[2] - BBox[0]) /		(float) (BBox[2] - BBox[0]) /
	PlotSheet->m_Size.x;		PlotSheet->m_Size.x;

	g_PlotScaleY = SCALE_PS *		g_PlotScaleY = SCALE_PS *
	(float) (BBox[3] - BBox[1]) /		(float) (BBox[3] - BBox[1]) /
	PlotSheet->m_Size.y;		PlotSheet->m_Size.y;
	@@ -360,22 +436,32 @@ wxPoint plot_offset;

	wxSplitPath( screen->m_FileName.GetData(), (wxString*) NULL,		wxSplitPath( screen->m_FileName.GetData(), (wxString*) NULL,
	&ShortFileName, (wxString*) NULL );		&ShortFileName, (wxString*) NULL );

	wxString dirbuf = wxGetCwd() + STRING_DIR_SEP;		wxString dirbuf = wxGetCwd() + STRING_DIR_SEP;

	if( !ShortFileName.IsEmpty() )		if( !ShortFileName.IsEmpty() )
	PlotFileName = MakeFileName( dirbuf, ShortFileName, wxT( ".ps" ) );		PlotFileName = MakeFileName( dirbuf, ShortFileName, wxT( ".ps" ) );
	else PlotFileName = MakeFileName(dirbuf, g_DefaultSchematicFileName, wxT(".ps"));		else
			PlotFileName = MakeFileName( dirbuf, g_DefaultSchematicFileName, wxT( ".ps" ) );

	PlotOneSheetPS( PlotFileName, screen, RealSheet, BBox, plot_offset );		PlotOneSheetPS( PlotFileName, screen, RealSheet, BBox, plot_offset );

	screen = (BASE_SCREEN*) screen->Pnext;		screen = (BASE_SCREEN*) screen->Pnext;
	if (AllPages == FALSE ) break;
			if( AllPages == FALSE )
			break;
	}		}
	}		}


	/*****************************************************************************************/		/*****************************************************************************************/
	void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName,		void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName,
	BASE_SCREEN * screen, Ki_PageDescr * sheet, int BBox[4], wxPoint plot_offset)		BASE_SCREEN* screen,
			Ki_PageDescr* sheet,
			int BBox[4],
			wxPoint plot_offset )
	/*****************************************************************************************/		/*****************************************************************************************/

	/* Trace en format PS. d'une feuille de dessin		/* Trace en format PS. d'une feuille de dessin
	*/		*/
	{		{
	@@ -418,6 +504,7 @@ wxPoint StartPos, EndPos;
	{		{
	Plume( 'U' );		Plume( 'U' );
	layer = LAYER_NOTES;		layer = LAYER_NOTES;

	switch( DrawList->Type() )		switch( DrawList->Type() )
	{		{
	case DRAW_BUSENTRY_STRUCT_TYPE: /* Struct Raccord et Segment sont identiques */		case DRAW_BUSENTRY_STRUCT_TYPE: /* Struct Raccord et Segment sont identiques */
	@@ -426,6 +513,7 @@ wxPoint StartPos, EndPos;
	StartPos = STRUCT->m_Pos;		StartPos = STRUCT->m_Pos;
	EndPos = STRUCT->m_End();		EndPos = STRUCT->m_End();
	layer = STRUCT->GetLayer();		layer = STRUCT->GetLayer();

	case DRAW_SEGMENT_STRUCT_TYPE:		case DRAW_SEGMENT_STRUCT_TYPE:
	#undef STRUCT		#undef STRUCT
	#define STRUCT ( (EDA_DrawLineStruct*) DrawList )		#define STRUCT ( (EDA_DrawLineStruct*) DrawList )
	@@ -437,6 +525,7 @@ wxPoint StartPos, EndPos;
	}		}
	if( g_PlotPSColorOpt )		if( g_PlotPSColorOpt )
	SetColorMapPS( ReturnLayerColor( layer ) );		SetColorMapPS( ReturnLayerColor( layer ) );

	switch( layer )		switch( layer )
	{		{
	case LAYER_NOTES: /* Trace en pointilles */		case LAYER_NOTES: /* Trace en pointilles */
	@@ -462,6 +551,7 @@ wxPoint StartPos, EndPos;
	Move_Plume( EndPos, 'D' );		Move_Plume( EndPos, 'D' );
	break;		break;
	}		}

	break;		break;

	case DRAW_JUNCTION_STRUCT_TYPE:		case DRAW_JUNCTION_STRUCT_TYPE:
	@@ -484,10 +574,17 @@ wxPoint StartPos, EndPos;
	PlotLibPart( DrawLibItem );		PlotLibPart( DrawLibItem );
	break;		break;

	case DRAW_PICK_ITEM_STRUCT_TYPE : break;		case DRAW_PICK_ITEM_STRUCT_TYPE:
	case DRAW_POLYLINE_STRUCT_TYPE : break;		break;
	case DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE: break;
	case DRAW_MARKER_STRUCT_TYPE : break;		case DRAW_POLYLINE_STRUCT_TYPE:
			break;

			case DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE:
			break;

			case DRAW_MARKER_STRUCT_TYPE:
			break;

	case DRAW_SHEET_STRUCT_TYPE:		case DRAW_SHEET_STRUCT_TYPE:
	#undef STRUCT		#undef STRUCT
	@@ -525,13 +622,12 @@ wxPoint StartPos, EndPos;

	void WinEDA_PlotPSFrame::OnInitDialog( wxInitDialogEvent& event )		void WinEDA_PlotPSFrame::OnInitDialog( wxInitDialogEvent& event )
	{		{

	// make the ESC work		// make the ESC work
	m_SizeOption->SetFocus();		m_SizeOption->SetFocus();

	////@begin wxEVT_INIT_DIALOG event handler for ID_DIALOG in WinEDA_PlotPSFrame.		////@begin wxEVT_INIT_DIALOG event handler for ID_DIALOG in WinEDA_PlotPSFrame.
	// Before editing this code, remove the block markers.		// Before editing this code, remove the block markers.
	event.Skip();		event.Skip();

	////@end wxEVT_INIT_DIALOG event handler for ID_DIALOG in WinEDA_PlotPSFrame.		////@end wxEVT_INIT_DIALOG event handler for ID_DIALOG in WinEDA_PlotPSFrame.
	}		}