patch (0f452cc0) · Commits · Elphel / kicad-source-mirror

common/base_screen.cpp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -112,8 +112,7 @@ wxPoint BASE_SCREEN::CursorRealPosition( const wxPoint& ScreenPos )
	{		{
	wxPoint curpos;		wxPoint curpos;

	D(printf("curpos=%d,%d GetZoom=%d, mDrawOrg=%d,%d\n",		// D(printf("curpos=%d,%d GetZoom=%d, mDrawOrg=%d,%d\n", curpos.x, curpos.y, GetZoom(), m_DrawOrg.x, m_DrawOrg.y );)
	curpos.x, curpos.y, GetZoom(), m_DrawOrg.x, m_DrawOrg.y );)

	curpos.x = ScreenPos.x * GetZoom();		curpos.x = ScreenPos.x * GetZoom();
	curpos.y = ScreenPos.y * GetZoom();		curpos.y = ScreenPos.y * GetZoom();

common/confirm.cpp

+89 −78

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ enum id_dialog {
	};		};

	/* Classe d'affichage de messages, identique a wxMessageDialog,		/* Classe d'affichage de messages, identique a wxMessageDialog,
	mais pouvant etre effacee au bout d'un time out donne		* mais pouvant etre effacee au bout d'un time out donne
	*/		*/
	class WinEDA_MessageDialog : public wxMessageDialog		class WinEDA_MessageDialog : public wxMessageDialog
	{		{
	@@ -40,6 +40,7 @@ public:
	~WinEDA_MessageDialog() { };		~WinEDA_MessageDialog() { };

	void OnTimeOut( wxTimerEvent& event );		void OnTimeOut( wxTimerEvent& event );

	DECLARE_EVENT_TABLE()		DECLARE_EVENT_TABLE()
	};		};

	@@ -59,6 +60,7 @@ WinEDA_MessageDialog::WinEDA_MessageDialog(wxWindow * parent, const wxString & m
	m_Timer.Start( 100 * m_LifeTime, wxTIMER_ONE_SHOT ); // m_LifeTime = duree en 0.1 secondes		m_Timer.Start( 100 * m_LifeTime, wxTIMER_ONE_SHOT ); // m_LifeTime = duree en 0.1 secondes
	}		}


	/********************************************************/		/********************************************************/
	void WinEDA_MessageDialog::OnTimeOut( wxTimerEvent& event )		void WinEDA_MessageDialog::OnTimeOut( wxTimerEvent& event )
	/********************************************************/		/********************************************************/
	@@ -66,28 +68,35 @@ void WinEDA_MessageDialog::OnTimeOut(wxTimerEvent& event)
	// TODO : EndModal() request		// TODO : EndModal() request
	}		}


	/*****************************************************************************/		/*****************************************************************************/
	void DisplayError( wxWindow* parent, const wxString& text, int displaytime )		void DisplayError( wxWindow* parent, const wxString& text, int displaytime )
	/*****************************************************************************/		/*****************************************************************************/

	/* Affiche un Message d'Erreur ou d'avertissement.		/* Affiche un Message d'Erreur ou d'avertissement.
	si warn > 0 le dialogue disparait apres warn 0.1 secondes		* si warn > 0 le dialogue disparait apres warn 0.1 secondes
	*/		*/
	{		{
	wxMessageDialog* dialog;		wxMessageDialog* dialog;

	if( displaytime > 0 )		if( displaytime > 0 )
	dialog = new WinEDA_MessageDialog(parent, text, _("Warning"),		dialog = new WinEDA_MessageDialog( parent, text, _(
	wxOK \| wxICON_INFORMATION \| wxSTAY_ON_TOP, displaytime);		"Warning" ),
			wxOK \| wxICON_INFORMATION \| wxSTAY_ON_TOP,
			displaytime );
	else		else
	dialog = new WinEDA_MessageDialog( parent, text, _( "Error" ),		dialog = new WinEDA_MessageDialog( parent, text, _( "Error" ),
	wxOK \| wxICON_EXCLAMATION \| wxSTAY_ON_TOP, 0 );		wxOK \| wxICON_EXCLAMATION \| wxSTAY_ON_TOP, 0 );

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


	/**************************************************************************/		/**************************************************************************/
	void DisplayInfo( wxWindow* parent, const wxString& text, int displaytime )		void DisplayInfo( wxWindow* parent, const wxString& text, int displaytime )
	/**************************************************************************/		/**************************************************************************/

	/* Affiche un Message d'information.		/* Affiche un Message d'information.
	*/		*/

	@@ -106,27 +115,32 @@ bool IsOK(wxWindow * parent, const wxString & text)
	/**************************************************/		/**************************************************/
	{		{
	int ii;		int ii;

	ii = wxMessageBox( text, _( "Confirmation" ), wxYES_NO \| wxCENTRE \| wxICON_HAND, parent );		ii = wxMessageBox( text, _( "Confirmation" ), wxYES_NO \| wxCENTRE \| wxICON_HAND, parent );
	if (ii == wxYES) return TRUE;		if( ii == wxYES )
			return TRUE;
	return FALSE;		return FALSE;
	}		}


	/***********************************************************************/		/***********************************************************************/
	int Get_Message( const wxString& title, wxString& buffer, wxWindow* frame )		int Get_Message( const wxString& title, wxString& buffer, wxWindow* frame )
	/***********************************************************************/		/***********************************************************************/

	/* Get a text from user		/* Get a text from user
	titre = titre a afficher		* titre = titre a afficher
	buffer : text enter by user		* buffer : text enter by user
	leading and trailing spaces are removed		* leading and trailing spaces are removed
	if buffer != "" buffer is displayed		* if buffer != "" buffer is displayed
	return:		* return:
	0 if OK		* 0 if OK
	!= 0 if ESCAPE		* != 0 if ESCAPE
	*/		*/
	{		{
	wxString message, default_text;		wxString message, default_text;

	if ( buffer ) default_text = buffer;		if( buffer )
			default_text = buffer;

	message = wxGetTextFromUser( title, _( "Text:" ),		message = wxGetTextFromUser( title, _( "Text:" ),
	default_text, frame );		default_text, frame );
	@@ -138,8 +152,5 @@ wxString message, default_text;
	return 0;		return 0;
	}		}

	return(1);		return 1;
	}		}

eeschema/eelibs_read_libraryfiles.cpp

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,11 @@ static int AddFootprintFilterList( EDA_LibComponentStruct* LibE
	FILE* f, char* Line, int* LineNum );		FILE* f, char* Line, int* LineNum );



			static wxString currentLibraryName; // If this code was written in C++ then this would not be needed.



	/*************************************************************************************/		/*************************************************************************************/
	LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame,		LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame,
	const wxString& FullLibName, const wxString& LibName )		const wxString& FullLibName, const wxString& LibName )
	@@ -61,6 +66,8 @@ LibraryStruct* LoadLibraryName( WinEDA_DrawFrame* frame,
	return NULL;		return NULL;
	}		}

			currentLibraryName = FullLibName;

	NewLib = new LibraryStruct( LIBRARY_TYPE_EESCHEMA, LibName, FullLibName );		NewLib = new LibraryStruct( LIBRARY_TYPE_EESCHEMA, LibName, FullLibName );

	Entries = LoadLibraryAux( frame, NewLib, f, &NumOfParts );		Entries = LoadLibraryAux( frame, NewLib, f, &NumOfParts );
	@@ -473,7 +480,8 @@ EDA_LibComponentStruct* Read_Component_Definition( WinEDA_DrawFrame* frame, char
	/* End line or block analysis: test for an error */		/* End line or block analysis: test for an error */
	if( !Res )		if( !Res )
	{ /* Something went wrong there. */		{ /* Something went wrong there. */
	Msg.Printf( wxT( " Error Line %d, Library not loaded" ), *LineNum );		Msg.Printf( wxT( " Error at line %d of library \n\"%s\",\nlibrary not loaded" ),
			*LineNum, currentLibraryName.GetData() );
	DisplayError( frame, Msg );		DisplayError( frame, Msg );
	delete LibEntry;		delete LibEntry;
	return NULL;		return NULL;

makefile.gtk

+1 −1

Original line number	Original line	Diff line number	Diff line

	MAKEGTK = $(MAKE) -f makefile.gtk		MAKEGTK = $(MAKE) -f makefile.gtk
	KICAD_SUBDIRS = common 3d-viewer pcbnew #eeschema eeschema/plugins cvpcb kicad gerbview		KICAD_SUBDIRS = common 3d-viewer pcbnew eeschema eeschema/plugins cvpcb kicad gerbview
	KICAD_SUBDIRS_BIN = eeschema eeschema/plugins pcbnew cvpcb kicad gerbview		KICAD_SUBDIRS_BIN = eeschema eeschema/plugins pcbnew cvpcb kicad gerbview
	KICAD_SUBDIRS_RES = internat modules template library		KICAD_SUBDIRS_RES = internat modules template library
	KICAD_SUBDIRS_HELP = help		KICAD_SUBDIRS_HELP = help

pcbnew/dialog_drc.cpp

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -637,7 +637,11 @@ void DrcDialog::OnStartdrcClick( wxCommandEvent& event )
	// run all the tests, with no UI at this time.		// run all the tests, with no UI at this time.
	m_tester->RunTests();		m_tester->RunTests();

			#if wxCHECK_VERSION( 2, 8, 0 )
	m_Notebook->ChangeSelection(0); // display the 1at tab "...Markers ..."		m_Notebook->ChangeSelection(0); // display the 1at tab "...Markers ..."
			#else
			m_Notebook->SetSelection(0); // display the 1at tab "... Markers..."
			#endif


	// Generate the report		// Generate the report
	@@ -712,7 +716,11 @@ void DrcDialog::OnListUnconnectedClick( wxCommandEvent& event )

	m_tester->ListUnconnectedPads();		m_tester->ListUnconnectedPads();

			#if wxCHECK_VERSION( 2, 8, 0 )
	m_Notebook->ChangeSelection(1); // display the 2nd tab "Unconnected..."		m_Notebook->ChangeSelection(1); // display the 2nd tab "Unconnected..."
			#else
			m_Notebook->SetSelection(1); // display the 2nd tab "Unconnected..."
			#endif

	// Generate the report		// Generate the report
	if( !reportName.IsEmpty() )		if( !reportName.IsEmpty() )

Admin message