Commit f85ade75 authored by CHARRAS's avatar CHARRAS
Browse files

see changelog

parent ed0265cb
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -3,6 +3,15 @@ Started 2007-June-11

Please add newer entries at the top, list the date and your name with
email address.

2007-Dec-16 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+pcbnew:
	Move Zone outlines added
	Zone outline DRC works (needs improvements)
	some bugs solved, but polyline.cpp still needs work.
	gendrill: code cleaning.

2007-Dec-14 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+pcbnew:

cvpcb/licence.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line
#define MACHINE			 "PC"
#define NB_CLES			 16
#define POSITION_LICENCE 50
#define POSITION_CLE	 250
#define TAILLE_LICENCE	 256
+55 −26
Original line number Diff line number Diff line
@@ -228,25 +228,40 @@ wxString FullFileName, ShortLibName, mask;

	Update();
	mask = wxT("*") + LibExtBuffer;
	FullFileName = EDA_FileSelector( _("Libraries"),
					g_RealLibDirBuffer,		/* Chemin par defaut */
					wxEmptyString,					/* nom fichier par defaut */
					LibExtBuffer,		/* extension par defaut */
					mask,				/* Masque d'affichage */
					this,
					0,
					TRUE				/* ne chage pas de repertoire courant */
					);
	if (FullFileName == wxEmptyString ) return;

	wxFileDialog FilesDialog(this, _("Library Files:"), g_RealLibDirBuffer,
		wxEmptyString, mask,
		wxFD_DEFAULT_STYLE | wxFD_MULTIPLE);

	FilesDialog.ShowModal();
	wxArrayString Filenames;
	FilesDialog.GetFilenames(Filenames);
	
	if ( Filenames.GetCount() == 0 )
		return;

	for ( unsigned jj = 0; jj < Filenames.GetCount(); jj ++ )
	{
		FullFileName = Filenames[jj];
		ShortLibName = MakeReducedFileName(FullFileName,g_RealLibDirBuffer,LibExtBuffer);

	g_LibName_List.Insert(ShortLibName, ii);
		//Add or insert new library name
		if ( g_LibName_List.Index(ShortLibName) == wxNOT_FOUND)
		{
			ListModIsModified = 1;
			g_LibName_List.Insert(ShortLibName, ii++);
		}
		else
		{
			wxString msg;
			msg << wxT("<") << ShortLibName << wxT("> : ") << _("Library already in use");
			DisplayError(this, msg);
		}
	}
	
	g_UserLibDirBuffer = m_LibDirCtrl->GetValue();
	SetRealLibraryPath( wxT("modules") );
	listlib();
	ListModIsModified = 1;

	m_Parent->BuildFootprintListBox();

@@ -282,23 +297,37 @@ wxString FullFileName, ShortLibName, mask;

	Update();
	mask = wxT("*") + g_EquivExtBuffer;
	FullFileName = EDA_FileSelector( _("Equiv"),
					g_RealLibDirBuffer,		/* Chemin par defaut */
					wxEmptyString,					/* nom fichier par defaut */
					g_EquivExtBuffer,		/* extension par defaut */
					mask,				/* Masque d'affichage */
					this,
					0,
					TRUE				/* ne chage pas de repertoire courant */
					);

	if (FullFileName == wxEmptyString ) return;
	wxFileDialog FilesDialog(this, _("Equiv Files:"), g_RealLibDirBuffer,
		wxEmptyString, mask,
		wxFD_DEFAULT_STYLE | wxFD_MULTIPLE);

	FilesDialog.ShowModal();
	wxArrayString Filenames;
	FilesDialog.GetFilenames(Filenames);
	
	if ( Filenames.GetCount() == 0 )
		return;

	for ( unsigned jj = 0; jj < Filenames.GetCount(); jj ++ )
	{
		FullFileName = Filenames[jj];
		ShortLibName = MakeReducedFileName(FullFileName,g_RealLibDirBuffer,g_EquivExtBuffer);

	g_ListName_Equ.Insert(ShortLibName, ii);
		//Add or insert new equiv library name
		if ( g_ListName_Equ.Index(ShortLibName) == wxNOT_FOUND)
		{
			g_ListName_Equ.Insert(ShortLibName, ii++);
		}
		else
		{
			wxString msg;
			msg << wxT("<") << ShortLibName << wxT("> : ") << _("Library already in use");
			DisplayError(this, msg);
		}
	}

	/* Mise a jour de l'affichage */
	/* Update display list */
	g_UserLibDirBuffer = m_LibDirCtrl->GetValue();
	SetRealLibraryPath( wxT("modules") );
	listlib();
+29 −22
Original line number Diff line number Diff line
@@ -364,20 +364,21 @@ wxString FullLibName,ShortLibName, Mask;
	}

	Mask = wxT("*") + g_LibExtBuffer;
	FullLibName = EDA_FileSelector( _("Library files:"),
				g_RealLibDirBuffer,		/* Chemin par defaut */
				wxEmptyString,					/* nom fichier par defaut */
				g_LibExtBuffer,		/* extension par defaut */
				Mask,				/* Masque d'affichage */
				this,
				wxFD_OPEN,
				TRUE
				);

	if ( FullLibName.IsEmpty() ) return;
	
	ShortLibName = MakeReducedFileName(FullLibName,g_RealLibDirBuffer,g_LibExtBuffer);
	wxFileDialog FilesDialog(this, _("Library files:"), g_RealLibDirBuffer,
		wxEmptyString, Mask,
		wxFD_DEFAULT_STYLE | wxFD_MULTIPLE);

	FilesDialog.ShowModal();
	wxArrayString Filenames;
	FilesDialog.GetFilenames(Filenames);
	
	for ( unsigned jj = 0; jj < Filenames.GetCount(); jj ++ )
	{
		FullLibName = Filenames[jj];
		ShortLibName = MakeReducedFileName(FullLibName,g_RealLibDirBuffer,g_LibExtBuffer);
		if ( ShortLibName.IsEmpty() )	//Just in case...
			continue;
		//Add or insert new library name
		if (FindLibrary(ShortLibName) == NULL)
		{
@@ -387,7 +388,13 @@ wxString FullLibName,ShortLibName, Mask;
			m_ListLibr->InsertItems(g_LibName_List, 0);
		}

	else DisplayError(this, _("Library already in use"));
		else
		{
			wxString msg;
			msg << wxT("<") << ShortLibName << wxT("> : ") << _("Library already in use");
			DisplayError(this, msg);
		}
	}

}

+2 −2
Original line number Diff line number Diff line
@@ -561,8 +561,8 @@ enum main_id {
	ID_POPUP_PCB_ZONE_ADD_SIMILAR_ZONE,
	ID_POPUP_PCB_ZONE_ADD_CUTOUT_ZONE,
	ID_POPUP_PCB_DELETE_ZONE_CUTOUT,
	ID_POPUP_ZONE_UNUSED2,
	ID_POPUP_ZONE_UNUSED3,
	ID_POPUP_PCB_MOVE_ZONE_OUTLINES,
	ID_POPUP_PCB_PLACE_ZONE_OUTLINES,
	ID_POPUP_ZONE_UNUSED4,

	ID_POPUP_PCB_DELETE_MARKER,
Loading