Gerbview: display now an error report after loading a gerber file. (0687921f) · Commits · Elphel / kicad-source-mirror

common/dialog_load_error.cpp

+19 −3

Original line number	Original line	Diff line number	Diff line
	@@ -23,13 +23,13 @@ void DIALOG_LOAD_ERROR::ListClear(void)

	/** Function ListSet		/** Function ListSet
	* Add a list of items.		* Add a list of items.
	* @param list = a string containing items. Items are separated by '\n'		* @param aList = a string containing items. Items are separated by '\n'
	*/		*/
	void DIALOG_LOAD_ERROR::ListSet(const wxString &list)		void DIALOG_LOAD_ERROR::ListSet(const wxString &aList)
	{		{
	wxArrayString* wxStringSplit( wxString txt, wxChar splitter );		wxArrayString* wxStringSplit( wxString txt, wxChar splitter );

	wxArrayString* strings_list = wxStringSplit( list, wxChar('\n') );		wxArrayString* strings_list = wxStringSplit( aList, wxChar('\n') );
	m_htmlWindow->AppendToPage(wxT("<ul>") );		m_htmlWindow->AppendToPage(wxT("<ul>") );
	for ( unsigned ii = 0; ii < strings_list->GetCount(); ii ++ )		for ( unsigned ii = 0; ii < strings_list->GetCount(); ii ++ )
	{		{
	@@ -42,6 +42,22 @@ void DIALOG_LOAD_ERROR::ListSet(const wxString &list)
	delete strings_list;		delete strings_list;
	}		}

			/** Function ListSet
			* Add a list of items.
			* @param aList = a wxArrayString containing items
			*/
			void DIALOG_LOAD_ERROR::ListSet(const wxArrayString &aList)
			{
			m_htmlWindow->AppendToPage(wxT("<ul>") );
			for ( unsigned ii = 0; ii < aList.GetCount(); ii ++ )
			{
			m_htmlWindow->AppendToPage(wxT("<li>") );
			m_htmlWindow->AppendToPage( aList.Item(ii) );
			m_htmlWindow->AppendToPage(wxT("</li>") );
			}
			m_htmlWindow->AppendToPage(wxT("</ul>") );
			}

	/** Function MessageSet		/** Function MessageSet
	* Add a message (in bold) to message list.		* Add a message (in bold) to message list.
	* @param message = the message		* @param message = the message

common/gr_basic.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@


	/* Definitions for enabling and disabling debugging features in gr_basic.cpp.		/* Definitions for enabling and disabling debugging features in gr_basic.cpp.
	* Please remember to set these back to 0 before making SVN commits.		* Please remember to set these back to 0 before making LAUNCHPAD commits.
	*/		*/
	#define DEBUG_DUMP_CLIP_ERROR_COORDS 0 // Set to 1 to dump clip algorithm errors.		#define DEBUG_DUMP_CLIP_ERROR_COORDS 0 // Set to 1 to dump clip algorithm errors.
	#define DEBUG_DUMP_CLIP_COORDS 0 // Set to 1 to dump clipped coordinates.		#define DEBUG_DUMP_CLIP_COORDS 0 // Set to 1 to dump clipped coordinates.
	@@ -834,6 +834,8 @@ void GRMixedLine( EDA_Rect* ClipBox,

	/*		/*
	* Draw a mixed line, in screen (Pixels) space.		* Draw a mixed line, in screen (Pixels) space.
			* Currently, draw a line (not a mixed line)
			* Perhaps this function is not very useful.
	*/		*/
	void GRSMixedLine( EDA_Rect* ClipBox,		void GRSMixedLine( EDA_Rect* ClipBox,
	wxDC* DC,		wxDC* DC,

gerbview/class_GERBER.cpp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -182,6 +182,8 @@ void GERBER::InitToolTable()
	m_Aperture_List[count]->m_Num_Dcode = count + FIRST_DCODE;		m_Aperture_List[count]->m_Num_Dcode = count + FIRST_DCODE;
	m_Aperture_List[count]->Clear_D_CODE_Data();		m_Aperture_List[count]->Clear_D_CODE_Data();
	}		}

			m_aperture_macros.clear();
	}		}

	/** function ReportMessage		/** function ReportMessage

gerbview/files.cpp

+4 −12

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,9 @@ static void LoadDCodeFile( WinEDA_GerberFrame* frame,
	const wxString& FullFileName );		const wxString& FullFileName );


			/* Load agerber file selected from history list on current layer
			* Previous data is deleted
			*/
	void WinEDA_GerberFrame::OnFileHistory( wxCommandEvent& event )		void WinEDA_GerberFrame::OnFileHistory( wxCommandEvent& event )
	{		{
	wxString fn;		wxString fn;
	@@ -53,6 +56,7 @@ void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
	if( origLayer < NB_LAYERS )		if( origLayer < NB_LAYERS )
	{		{
	setActiveLayer(origLayer+1);		setActiveLayer(origLayer+1);
			Erase_Current_Layer( false );

	if( !LoadOneGerberFile( wxEmptyString ) )		if( !LoadOneGerberFile( wxEmptyString ) )
	setActiveLayer(origLayer);		setActiveLayer(origLayer);
	@@ -69,10 +73,6 @@ delete an existing layer to load any new layers." ), NB_LAYERS );
	}		}
	break;		break;

	case ID_APPEND_FILE:
	LoadOneGerberFile( wxEmptyString );
	break;

	case ID_NEW_BOARD:		case ID_NEW_BOARD:
	Clear_Pcb( true );		Clear_Pcb( true );
	Zoom_Automatique( false );		Zoom_Automatique( false );
	@@ -87,14 +87,6 @@ delete an existing layer to load any new layers." ), NB_LAYERS );
	LoadDCodeFile( this, wxEmptyString );		LoadDCodeFile( this, wxEmptyString );
	break;		break;

	case ID_SAVE_BOARD:
	SaveGerberFile( GetScreen()->m_FileName );
	break;

	case ID_SAVE_BOARD_AS:
	SaveGerberFile( wxEmptyString );
	break;

	default:		default:
	DisplayError( this, wxT( "File_io Internal Error" ) );		DisplayError( this, wxT( "File_io Internal Error" ) );
	break;		break;

gerbview/gerberframe.cpp

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -32,20 +32,15 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame )
	EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_GerberFrame::OnZoom )		EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_GerberFrame::OnZoom )

	EVT_TOOL( wxID_FILE, WinEDA_GerberFrame::Files_io )		EVT_TOOL( wxID_FILE, WinEDA_GerberFrame::Files_io )
	EVT_TOOL( ID_APPEND_FILE, WinEDA_GerberFrame::Files_io )
	EVT_TOOL( ID_INC_LAYER_AND_APPEND_FILE, WinEDA_GerberFrame::Files_io )		EVT_TOOL( ID_INC_LAYER_AND_APPEND_FILE, WinEDA_GerberFrame::Files_io )
	EVT_TOOL( ID_GERBVIEW_LOAD_DRILL_FILE, WinEDA_GerberFrame::Files_io )		EVT_TOOL( ID_GERBVIEW_LOAD_DRILL_FILE, WinEDA_GerberFrame::Files_io )
	EVT_TOOL( ID_GERBVIEW_LOAD_DCODE_FILE, WinEDA_GerberFrame::Files_io )		EVT_TOOL( ID_GERBVIEW_LOAD_DCODE_FILE, WinEDA_GerberFrame::Files_io )
	EVT_TOOL( ID_NEW_BOARD, WinEDA_GerberFrame::Files_io )		EVT_TOOL( ID_NEW_BOARD, WinEDA_GerberFrame::Files_io )
	EVT_TOOL( ID_SAVE_BOARD, WinEDA_GerberFrame::Files_io )

	// Menu Files:		// Menu Files:
	EVT_MENU( wxID_FILE, WinEDA_GerberFrame::Files_io )		EVT_MENU( wxID_FILE, WinEDA_GerberFrame::Files_io )
	EVT_MENU( ID_APPEND_FILE, WinEDA_GerberFrame::Files_io )
	EVT_MENU( ID_MENU_INC_LAYER_AND_APPEND_FILE, WinEDA_GerberFrame::Files_io )		EVT_MENU( ID_MENU_INC_LAYER_AND_APPEND_FILE, WinEDA_GerberFrame::Files_io )
	EVT_MENU( ID_NEW_BOARD, WinEDA_GerberFrame::Files_io )		EVT_MENU( ID_NEW_BOARD, WinEDA_GerberFrame::Files_io )
	EVT_MENU( ID_SAVE_BOARD, WinEDA_GerberFrame::Files_io )
	EVT_MENU( ID_SAVE_BOARD_AS, WinEDA_GerberFrame::Files_io )
	EVT_MENU( ID_GEN_PLOT, WinEDA_GerberFrame::ToPlotter )		EVT_MENU( ID_GEN_PLOT, WinEDA_GerberFrame::ToPlotter )
	EVT_MENU( ID_GERBVIEW_EXPORT_TO_PCBNEW,		EVT_MENU( ID_GERBVIEW_EXPORT_TO_PCBNEW,
	WinEDA_GerberFrame::ExportDataInPcbnewFormat )		WinEDA_GerberFrame::ExportDataInPcbnewFormat )

Admin message