Skip to content

K
kicad-source-mirror
Commit 2a1b776b authored by CHARRAS's avatar CHARRAS
Browse files
Options

see changelog

parent df7e6f37
Show whitespace changes
Inline Side-by-side
Showing with 11696 additions and 1324 deletions
change_log.txt
View file @ 2a1b776b
...@@ -5,6 +5,23 @@ Started 2007-June-11 ...@@ -5,6 +5,23 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with
email address. email address.
2008-Feb-26 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+eeschema
changed in class DrawSheetStruct m_s member name to m_AssociatedScreen
some others minor problems solved.
some files "uncrustified"
Major problem in undo/redo when a sheet is deleted not yet solved
Only for a complex hierarchy, could lost data.
When a sheet is deleted by block delete. it is put in undo list.
It is really deleted after 10 changes (when the undo list is full).
At this time, the associated data is also deleted.
If an other (not deleted) sheet shares the same data, this data is lost.
Need work to solve this problem and keep the undo/redo feature.
2008-Feb-25 UPDATE Wayne Stambaugh <stambaughw{at}verizon{dot}net> 2008-Feb-25 UPDATE Wayne Stambaugh <stambaughw{at}verizon{dot}net>
================================================================================ ================================================================================
+eeschema +eeschema
......
eeschema/annotate.cpp
View file @ 2a1b776b
...@@ -34,9 +34,6 @@ void ReAnnotatePowerSymbolsOnly( void ) ...@@ -34,9 +34,6 @@ void ReAnnotatePowerSymbolsOnly( void )
/* Build the screen list (screen, not sheet) */ /* Build the screen list (screen, not sheet) */
EDA_SheetList SheetList( NULL ); EDA_SheetList SheetList( NULL );
/* Update the screen number, sheet count and date */
//ScreenList.UpdateScreenNumberAndDate();
DrawSheetList* sheet; DrawSheetList* sheet;
int CmpNumber = 1; int CmpNumber = 1;
...@@ -161,7 +158,7 @@ void DeleteAnnotation( WinEDA_SchematicFrame* parent, bool annotateSchematic ) ...@@ -161,7 +158,7 @@ void DeleteAnnotation( WinEDA_SchematicFrame* parent, bool annotateSchematic )
sheet->DeleteAnnotation( annotateSchematic ); sheet->DeleteAnnotation( annotateSchematic );
g_RootSheet->m_s->SetModify(); g_RootSheet->m_AssociatedScreen->SetModify();
parent->DrawPanel->Refresh( true ); parent->DrawPanel->Refresh( true );
} }
...@@ -192,10 +189,11 @@ void AnnotateComponents( WinEDA_SchematicFrame* parent, ...@@ -192,10 +189,11 @@ void AnnotateComponents( WinEDA_SchematicFrame* parent,
/* Build the sheet list */ /* Build the sheet list */
EDA_SheetList SheetList( g_RootSheet ); EDA_SheetList SheetList( g_RootSheet );
/* Update the sheet number */ /* Update the screen number, sheet count and date */
ii = 0; SheetList.UpdateSheetNumberAndDate();
/* First pass: Component counting */ /* First pass: Component counting */
ii = 0;
sheet = parent->GetSheet(); sheet = parent->GetSheet();
if( annotateSchematic ) if( annotateSchematic )
{ {
...@@ -595,7 +593,7 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool oneSheetOnly ) ...@@ -595,7 +593,7 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool oneSheetOnly )
/* build the screen list */ /* build the screen list */
EDA_SheetList SheetList( NULL ); EDA_SheetList SheetList( NULL );
g_RootSheet->m_s->SetModify(); g_RootSheet->m_AssociatedScreen->SetModify();
ii = 0; ii = 0;
/* first pass : count composents */ /* first pass : count composents */
......
eeschema/annotate_dialog.cpp
View file @ 2a1b776b
...@@ -258,7 +258,7 @@ void WinEDA_AnnotateFrame::OnClear( wxCommandEvent& event ) ...@@ -258,7 +258,7 @@ void WinEDA_AnnotateFrame::OnClear( wxCommandEvent& event )
message += _( "\n\nThis operation will clear the existing annotation " \ message += _( "\n\nThis operation will clear the existing annotation " \
"and cannot be undone." ); "and cannot be undone." );
response = wxMessageBox( message, _( "" ), response = wxMessageBox( message, wxT( "" ),
wxICON_EXCLAMATION | wxOK | wxCANCEL ); wxICON_EXCLAMATION | wxOK | wxCANCEL );
if (response == wxCANCEL) if (response == wxCANCEL)
return; return;
...@@ -283,7 +283,7 @@ void WinEDA_AnnotateFrame::OnApply( wxCommandEvent& event ) ...@@ -283,7 +283,7 @@ void WinEDA_AnnotateFrame::OnApply( wxCommandEvent& event )
message += _( "\n\nThis operation will change the current annotation and " \ message += _( "\n\nThis operation will change the current annotation and " \
"cannot be undone." ); "cannot be undone." );
response = wxMessageBox( message, _( "" ), response = wxMessageBox( message, wxT( "" ),
wxICON_EXCLAMATION | wxOK | wxCANCEL ); wxICON_EXCLAMATION | wxOK | wxCANCEL );
if (response == wxCANCEL) if (response == wxCANCEL)
return; return;
......
eeschema/block.cpp
View file @ 2a1b776b
...@@ -832,12 +832,12 @@ static EDA_BaseStruct* CopyStruct( WinEDA_DrawPanel* panel, wxDC* DC, BASE_SCREE ...@@ -832,12 +832,12 @@ static EDA_BaseStruct* CopyStruct( WinEDA_DrawPanel* panel, wxDC* DC, BASE_SCREE
case DRAW_SHEET_STRUCT_TYPE: case DRAW_SHEET_STRUCT_TYPE:
{ {
//DuplicateStruct calls GenCopy, which should handle //DuplicateStruct calls GenCopy, which should handle
//m_s and m_sRefCount properly. //m_AssociatedScreen and m_sRefCount properly.
DrawSheetStruct* sheet = (DrawSheetStruct*) Struct; DrawSheetStruct* sheet = (DrawSheetStruct*) Struct;
sheet->m_TimeStamp = GetTimeStamp(); sheet->m_TimeStamp = GetTimeStamp();
//sheet->m_s->m_UndoList = NULL; //sheet->m_AssociatedScreen->m_UndoList = NULL;
//sheet->m_s->m_RedoList = NULL; //sheet->m_AssociatedScreen->m_RedoList = NULL;
//keep m_s pointer & associated. //keep m_AssociatedScreen pointer & associated.
//sheet->m_Son = NULL; m_son is involved in undo and redo. //sheet->m_Son = NULL; m_son is involved in undo and redo.
break; break;
} }
......
eeschema/class_drawsheet.cpp
View file @ 2a1b776b
...@@ -43,9 +43,12 @@ DrawSheetStruct::DrawSheetStruct( const wxPoint& pos ) : ...@@ -43,9 +43,12 @@ DrawSheetStruct::DrawSheetStruct( const wxPoint& pos ) :
m_Layer = LAYER_SHEET; m_Layer = LAYER_SHEET;
m_Pos = pos; m_Pos = pos;
m_SheetNameSize = m_FileNameSize = 60; m_SheetNameSize = m_FileNameSize = 60;
m_s = NULL; m_AssociatedScreen = NULL;
m_SheetName = wxT("Root"); m_SheetName = wxT( "Root" );
m_FileName = wxT(" "); m_FileName = wxT( " " );
m_SheetNumber = 1;
m_NumberOfSheets = 1;
} }
...@@ -54,7 +57,9 @@ DrawSheetStruct::~DrawSheetStruct() ...@@ -54,7 +57,9 @@ DrawSheetStruct::~DrawSheetStruct()
/**************************************/ /**************************************/
{ {
DrawSheetLabelStruct* label = m_Label, * next_label; DrawSheetLabelStruct* label = m_Label, * next_label;
while( label ){
while( label )
{
next_label = (DrawSheetLabelStruct*) label->Pnext; next_label = (DrawSheetLabelStruct*) label->Pnext;
delete label; delete label;
label = next_label; label = next_label;
...@@ -62,13 +67,15 @@ DrawSheetStruct::~DrawSheetStruct() ...@@ -62,13 +67,15 @@ DrawSheetStruct::~DrawSheetStruct()
//also, look at the associated sheet & its reference count //also, look at the associated sheet & its reference count
//perhaps it should be deleted also. //perhaps it should be deleted also.
if(m_s){ if( m_AssociatedScreen )
m_s->m_RefCount--; {
if(m_s->m_RefCount == 0) m_AssociatedScreen->m_RefCount--;
delete m_s; if( m_AssociatedScreen->m_RefCount == 0 )
delete m_AssociatedScreen;
} }
} }
/***********************************************/ /***********************************************/
DrawSheetStruct* DrawSheetStruct::GenCopy() DrawSheetStruct* DrawSheetStruct::GenCopy()
/***********************************************/ /***********************************************/
...@@ -91,7 +98,7 @@ DrawSheetStruct* DrawSheetStruct::GenCopy() ...@@ -91,7 +98,7 @@ DrawSheetStruct* DrawSheetStruct::GenCopy()
newitem->m_Label = NULL; newitem->m_Label = NULL;
DrawSheetLabelStruct* Slabel = NULL, *label = m_Label; DrawSheetLabelStruct* Slabel = NULL, * label = m_Label;
if( label ) if( label )
{ {
...@@ -109,9 +116,9 @@ DrawSheetStruct* DrawSheetStruct::GenCopy() ...@@ -109,9 +116,9 @@ DrawSheetStruct* DrawSheetStruct::GenCopy()
} }
/* don't copy screen data - just reference it. */ /* don't copy screen data - just reference it. */
newitem->m_s = m_s; newitem->m_AssociatedScreen = m_AssociatedScreen;
if(m_s) if( m_AssociatedScreen )
m_s->m_RefCount++; m_AssociatedScreen->m_RefCount++;
return newitem; return newitem;
} }
...@@ -120,6 +127,7 @@ DrawSheetStruct* DrawSheetStruct::GenCopy() ...@@ -120,6 +127,7 @@ DrawSheetStruct* DrawSheetStruct::GenCopy()
/**********************************************************/ /**********************************************************/
void DrawSheetStruct::SwapData( DrawSheetStruct* copyitem ) void DrawSheetStruct::SwapData( DrawSheetStruct* copyitem )
/**********************************************************/ /**********************************************************/
/* Used if undo / redo command: /* Used if undo / redo command:
* swap data between this and copyitem * swap data between this and copyitem
*/ */
...@@ -132,6 +140,8 @@ void DrawSheetStruct::SwapData( DrawSheetStruct* copyitem ) ...@@ -132,6 +140,8 @@ void DrawSheetStruct::SwapData( DrawSheetStruct* copyitem )
EXCHG( m_Label, copyitem->m_Label ); EXCHG( m_Label, copyitem->m_Label );
EXCHG( m_NbLabel, copyitem->m_NbLabel ); EXCHG( m_NbLabel, copyitem->m_NbLabel );
} }
/****************************************************************/ /****************************************************************/
void DrawSheetStruct::Place( WinEDA_DrawFrame* frame, wxDC* DC ) void DrawSheetStruct::Place( WinEDA_DrawFrame* frame, wxDC* DC )
/****************************************************************/ /****************************************************************/
...@@ -152,9 +162,12 @@ void DrawSheetStruct::Place( WinEDA_DrawFrame* frame, wxDC* DC ) ...@@ -152,9 +162,12 @@ void DrawSheetStruct::Place( WinEDA_DrawFrame* frame, wxDC* DC )
EDA_BaseStruct::Place( frame, DC ); //puts it on the EEDrawList. EDA_BaseStruct::Place( frame, DC ); //puts it on the EEDrawList.
} }
/********************************************************************/ /********************************************************************/
void DrawSheetStruct::CleanupSheet( WinEDA_SchematicFrame* frame, wxDC* DC ) void DrawSheetStruct::CleanupSheet( WinEDA_SchematicFrame* frame, wxDC* DC )
/********************************************************************/ /********************************************************************/
/* Delete pinsheets which are not corresponding to a hierarchal label /* Delete pinsheets which are not corresponding to a hierarchal label
* if DC != NULL, redraw Sheet * if DC != NULL, redraw Sheet
*/ */
...@@ -169,7 +182,7 @@ void DrawSheetStruct::CleanupSheet( WinEDA_SchematicFrame* frame, wxDC* DC ) ...@@ -169,7 +182,7 @@ void DrawSheetStruct::CleanupSheet( WinEDA_SchematicFrame* frame, wxDC* DC )
{ {
/* Search Hlabel corresponding to this Pinsheet */ /* Search Hlabel corresponding to this Pinsheet */
EDA_BaseStruct* DrawStruct = m_s->EEDrawList; EDA_BaseStruct* DrawStruct = m_AssociatedScreen->EEDrawList;
DrawHierLabelStruct* HLabel = NULL; DrawHierLabelStruct* HLabel = NULL;
for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext ) for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext )
{ {
...@@ -191,6 +204,7 @@ void DrawSheetStruct::CleanupSheet( WinEDA_SchematicFrame* frame, wxDC* DC ) ...@@ -191,6 +204,7 @@ void DrawSheetStruct::CleanupSheet( WinEDA_SchematicFrame* frame, wxDC* DC )
} }
} }
/**************************************************************************************/ /**************************************************************************************/
void DrawSheetStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, void DrawSheetStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
int DrawMode, int Color ) int DrawMode, int Color )
...@@ -247,65 +261,85 @@ void DrawSheetStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& of ...@@ -247,65 +261,85 @@ void DrawSheetStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& of
} }
} }
/**************************************************************************************/ /**************************************************************************************/
void DrawSheetStruct::DeleteAnnotation( bool recurse ) void DrawSheetStruct::DeleteAnnotation( bool recurse )
/**************************************************************************************/ /**************************************************************************************/
{ {
if(recurse && m_s){ if( recurse && m_AssociatedScreen )
EDA_BaseStruct* strct = m_s->EEDrawList; {
for(; strct; strct = strct->Pnext){ EDA_BaseStruct* strct = m_AssociatedScreen->EEDrawList;
if(strct->Type() == DRAW_SHEET_STRUCT_TYPE){ for( ; strct; strct = strct->Pnext )
DrawSheetStruct* sheet = (DrawSheetStruct*)strct; {
sheet->DeleteAnnotation(recurse); if( strct->Type() == DRAW_SHEET_STRUCT_TYPE )
{
DrawSheetStruct* sheet = (DrawSheetStruct*) strct;
sheet->DeleteAnnotation( recurse );
} }
} }
} }
EDA_BaseStruct* comp = m_s->EEDrawList; EDA_BaseStruct* comp = m_AssociatedScreen->EEDrawList;
for( ; comp ; comp = comp->Pnext ){ for( ; comp; comp = comp->Pnext )
if(comp->Type() == DRAW_LIB_ITEM_STRUCT_TYPE ){ {
((EDA_SchComponentStruct*)comp)->ClearAnnotation(); if( comp->Type() == DRAW_LIB_ITEM_STRUCT_TYPE )
{
( (EDA_SchComponentStruct*) comp )->ClearAnnotation();
} }
} }
} }
/*******************************************************************/ /*******************************************************************/
int DrawSheetStruct::ComponentCount( ) int DrawSheetStruct::ComponentCount()
/*******************************************************************/ /*******************************************************************/
{ {
//count our own components, without the power components. //count our own components, without the power components.
/* Routine retournant le nombre de composants dans le schema, /* Routine retournant le nombre de composants dans le schema,
* powers non comprises */ * powers non comprises */
int n = 0; int n = 0;
if(m_s){
if( m_AssociatedScreen )
{
EDA_BaseStruct* bs; EDA_BaseStruct* bs;
for( bs = m_s->EEDrawList; bs != NULL; bs = bs->Pnext ){ for( bs = m_AssociatedScreen->EEDrawList; bs != NULL; bs = bs->Pnext )
if( bs->Type() == DRAW_LIB_ITEM_STRUCT_TYPE ){ {
if( bs->Type() == DRAW_LIB_ITEM_STRUCT_TYPE )
{
DrawPartStruct* Cmp = (DrawPartStruct*) bs; DrawPartStruct* Cmp = (DrawPartStruct*) bs;
if( Cmp->m_Field[VALUE].m_Text.GetChar( 0 ) != '#' ) if( Cmp->m_Field[VALUE].m_Text.GetChar( 0 ) != '#' )
n++; n++;
} }
if(bs->Type() == DRAW_SHEET_STRUCT_TYPE){ if( bs->Type() == DRAW_SHEET_STRUCT_TYPE )
DrawSheetStruct* sheet = (DrawSheetStruct*)bs; {
DrawSheetStruct* sheet = (DrawSheetStruct*) bs;
n += sheet->ComponentCount(); n += sheet->ComponentCount();
} }
} }
} }
return n; return n;
} }
/*******************************************************************************/ /*******************************************************************************/
bool DrawSheetStruct::SearchHierarchy(wxString filename, SCH_SCREEN **screen) bool DrawSheetStruct::SearchHierarchy( wxString filename, SCH_SCREEN** screen )
/*******************************************************************************/ /*******************************************************************************/
{ {
//search the existing hierarchy for an instance of screen "FileName". //search the existing hierarchy for an instance of screen "FileName".
if(m_s){ if( m_AssociatedScreen )
EDA_BaseStruct* strct = m_s->EEDrawList; {
while(strct){ EDA_BaseStruct* strct = m_AssociatedScreen->EEDrawList;
if(strct->Type() == DRAW_SHEET_STRUCT_TYPE){ while( strct )
DrawSheetStruct* ss = (DrawSheetStruct*)strct; {
if(ss->m_s && ss->m_s->m_FileName.CmpNoCase(filename) == 0){ if( strct->Type() == DRAW_SHEET_STRUCT_TYPE )
*screen = ss->m_s; {
DrawSheetStruct* ss = (DrawSheetStruct*) strct;
if( ss->m_AssociatedScreen && ss->m_AssociatedScreen->m_FileName.CmpNoCase( filename ) == 0 )
{
*screen = ss->m_AssociatedScreen;
return true; return true;
} }
if(ss->SearchHierarchy(filename, screen)) if( ss->SearchHierarchy( filename, screen ) )
return true; return true;
} }
strct = strct->Pnext; strct = strct->Pnext;
...@@ -313,8 +347,10 @@ bool DrawSheetStruct::SearchHierarchy(wxString filename, SCH_SCREEN **screen) ...@@ -313,8 +347,10 @@ bool DrawSheetStruct::SearchHierarchy(wxString filename, SCH_SCREEN **screen)
} }
return false; return false;
} }
/*******************************************************************************/ /*******************************************************************************/
bool DrawSheetStruct::LocatePathOfScreen(SCH_SCREEN *screen, DrawSheetList* list) bool DrawSheetStruct::LocatePathOfScreen( SCH_SCREEN* screen, DrawSheetList* list )
/*******************************************************************************/ /*******************************************************************************/
{ {
//search the existing hierarchy for an instance of screen "FileName". //search the existing hierarchy for an instance of screen "FileName".
...@@ -322,45 +358,57 @@ bool DrawSheetStruct::LocatePathOfScreen(SCH_SCREEN *screen, DrawSheetList* list ...@@ -322,45 +358,57 @@ bool DrawSheetStruct::LocatePathOfScreen(SCH_SCREEN *screen, DrawSheetList* list
//no other references to its m_s otherwise there would be loops //no other references to its m_s otherwise there would be loops
//in the heirarchy. //in the heirarchy.
//search the existing hierarchy for an instance of screen "FileName". //search the existing hierarchy for an instance of screen "FileName".
if(m_s){ if( m_AssociatedScreen )
list->Push(this); {
if(m_s == screen) list->Push( this );
if( m_AssociatedScreen == screen )
return true; return true;
EDA_BaseStruct* strct = m_s->EEDrawList; EDA_BaseStruct* strct = m_AssociatedScreen->EEDrawList;
while(strct){ while( strct )
if(strct->Type() == DRAW_SHEET_STRUCT_TYPE){ {
DrawSheetStruct* ss = (DrawSheetStruct*)strct; if( strct->Type() == DRAW_SHEET_STRUCT_TYPE )
if(ss->LocatePathOfScreen(screen, list)) {
DrawSheetStruct* ss = (DrawSheetStruct*) strct;
if( ss->LocatePathOfScreen( screen, list ) )
return true; return true;
} }
strct = strct->Pnext; strct = strct->Pnext;
} }
list->Pop(); list->Pop();
} }
return false; return false;
} }
/*******************************************************************************/ /*******************************************************************************/
bool DrawSheetStruct::Load(WinEDA_SchematicFrame* frame) bool DrawSheetStruct::Load( WinEDA_SchematicFrame* frame )
/*******************************************************************************/ /*******************************************************************************/
{ {
if(!m_s){ if( !m_AssociatedScreen )
{
SCH_SCREEN* screen = NULL; SCH_SCREEN* screen = NULL;
g_RootSheet->SearchHierarchy(m_FileName, &screen); g_RootSheet->SearchHierarchy( m_FileName, &screen );
if(screen){ if( screen )
m_s = screen; {
m_s->m_RefCount++; m_AssociatedScreen = screen;
m_AssociatedScreen->m_RefCount++;
//do not need to load the sub-sheets - this has already been done. //do not need to load the sub-sheets - this has already been done.
}else{ }
m_s = new SCH_SCREEN(SCHEMATIC_FRAME); else
m_s->m_RefCount++; {
if(!frame->LoadOneEEFile(m_s, m_FileName)) m_AssociatedScreen = new SCH_SCREEN( SCHEMATIC_FRAME );
m_AssociatedScreen->m_RefCount++;
if( !frame->LoadOneEEFile( m_AssociatedScreen, m_FileName ) )
return false; return false;
EDA_BaseStruct* bs = m_s->EEDrawList; EDA_BaseStruct* bs = m_AssociatedScreen->EEDrawList;
while(bs){ while( bs )
if(bs->Type() == DRAW_SHEET_STRUCT_TYPE){ {
DrawSheetStruct* ss = (DrawSheetStruct*)bs; if( bs->Type() == DRAW_SHEET_STRUCT_TYPE )
if(!ss->Load(frame)) {
DrawSheetStruct* ss = (DrawSheetStruct*) bs;
if( !ss->Load( frame ) )
return false; return false;
} }
bs = bs->Pnext; bs = bs->Pnext;
...@@ -369,16 +417,22 @@ bool DrawSheetStruct::Load(WinEDA_SchematicFrame* frame) ...@@ -369,16 +417,22 @@ bool DrawSheetStruct::Load(WinEDA_SchematicFrame* frame)
} }
return true; return true;
} }
/*******************************************************************************/ /*******************************************************************************/
int DrawSheetStruct::CountSheets() int DrawSheetStruct::CountSheets()
/*******************************************************************************/ /*******************************************************************************/
{ {
int count = 1; //1 = this!! int count = 1; //1 = this!!
if(m_s){
EDA_BaseStruct* strct = m_s->EEDrawList; if( m_AssociatedScreen )
for(; strct; strct = strct->Pnext){ {
if(strct->Type() == DRAW_SHEET_STRUCT_TYPE){ EDA_BaseStruct* strct = m_AssociatedScreen->EEDrawList;
DrawSheetStruct* ss = (DrawSheetStruct*)strct; for( ; strct; strct = strct->Pnext )
{
if( strct->Type() == DRAW_SHEET_STRUCT_TYPE )
{
DrawSheetStruct* ss = (DrawSheetStruct*) strct;
count += ss->CountSheets(); count += ss->CountSheets();
} }
} }
...@@ -394,8 +448,8 @@ int DrawSheetStruct::CountSheets() ...@@ -394,8 +448,8 @@ int DrawSheetStruct::CountSheets()
/*******************************************************************/ /*******************************************************************/
DrawSheetLabelStruct::DrawSheetLabelStruct( DrawSheetStruct* parent, DrawSheetLabelStruct::DrawSheetLabelStruct( DrawSheetStruct* parent,
const wxPoint& pos, const wxString& text ) : const wxPoint& pos, const wxString& text ) :
EDA_BaseStruct( DRAW_SHEETLABEL_STRUCT_TYPE ), EDA_BaseStruct( DRAW_SHEETLABEL_STRUCT_TYPE )
EDA_TextStruct( text ) , EDA_TextStruct( text )
/*******************************************************************/ /*******************************************************************/
{ {
m_Layer = LAYER_SHEETLABEL; m_Layer = LAYER_SHEETLABEL;
...@@ -511,115 +565,179 @@ void DrawSheetLabelStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoin ...@@ -511,115 +565,179 @@ void DrawSheetLabelStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoin
GRPoly( &panel->m_ClipBox, DC, NbSegm, coord, FillShape, LineWidth, txtcolor, txtcolor ); /* Poly Non rempli */ GRPoly( &panel->m_ClipBox, DC, NbSegm, coord, FillShape, LineWidth, txtcolor, txtcolor ); /* Poly Non rempli */
} }
/**********************************************/ /**********************************************/
/* class to handle a series of sheets *********/ /* class to handle a series of sheets *********/
/* a 'path' so to speak.. *********************/ /* a 'path' so to speak.. *********************/
/**********************************************/ /**********************************************/
DrawSheetList::DrawSheetList(){ DrawSheetList::DrawSheetList()
for(int i=0; i<DSLSZ ; i++) {
for( int i = 0; i<DSLSZ; i++ )
m_sheets[i] = NULL; m_sheets[i] = NULL;
m_numSheets = 0; m_numSheets = 0;
} }
int DrawSheetList::Cmp(DrawSheetList& d){
if(m_numSheets > d.m_numSheets)
int DrawSheetList::Cmp( DrawSheetList& d )
{
if( m_numSheets > d.m_numSheets )
return 1; return 1;
if(m_numSheets < d.m_numSheets) if( m_numSheets < d.m_numSheets )
return -1; return -1;
//otherwise, same number of sheets. //otherwise, same number of sheets.
for(int i=0; i<m_numSheets; i++){ for( int i = 0; i<m_numSheets; i++ )
if(m_sheets[i]->m_TimeStamp > d.m_sheets[i]->m_TimeStamp) {
if( m_sheets[i]->m_TimeStamp > d.m_sheets[i]->m_TimeStamp )
return 1; return 1;
if(m_sheets[i]->m_TimeStamp < d.m_sheets[i]->m_TimeStamp) if( m_sheets[i]->m_TimeStamp < d.m_sheets[i]->m_TimeStamp )
return -1; return -1;
} }
return 0; return 0;
} }
DrawSheetStruct* DrawSheetList::Last(){
if(m_numSheets)
return m_sheets[m_numSheets-1]; DrawSheetStruct* DrawSheetList::Last()
{
if( m_numSheets )
return m_sheets[m_numSheets - 1];
return NULL; return NULL;
} }
SCH_SCREEN* DrawSheetList::LastScreen(){
if(m_numSheets)
return m_sheets[m_numSheets-1]->m_s; SCH_SCREEN* DrawSheetList::LastScreen()
{
if( m_numSheets )
return m_sheets[m_numSheets - 1]->m_AssociatedScreen;
return NULL; return NULL;
} }
EDA_BaseStruct* DrawSheetList::LastDrawList(){
if(m_numSheets && m_sheets[m_numSheets-1]->m_s)
return m_sheets[m_numSheets-1]->m_s->EEDrawList; EDA_BaseStruct* DrawSheetList::LastDrawList()
{
if( m_numSheets && m_sheets[m_numSheets - 1]->m_AssociatedScreen )
return m_sheets[m_numSheets - 1]->m_AssociatedScreen->EEDrawList;
return NULL; return NULL;
} }
void DrawSheetList::Push(DrawSheetStruct* sheet){
if(m_numSheets < DSLSZ){
void DrawSheetList::Push( DrawSheetStruct* sheet )
{
if( m_numSheets < DSLSZ )
{
m_sheets[m_numSheets] = sheet; m_sheets[m_numSheets] = sheet;
m_numSheets++; m_numSheets++;
} }
} }
DrawSheetStruct* DrawSheetList::Pop(){
if(m_numSheets > 0){
m_numSheets --; DrawSheetStruct* DrawSheetList::Pop()
{
if( m_numSheets > 0 )
{
m_numSheets--;
return m_sheets[m_numSheets]; return m_sheets[m_numSheets];
} }
return NULL; return NULL;
} }
wxString DrawSheetList::Path(){
wxString DrawSheetList::Path()
{
wxString s, t; wxString s, t;
s = wxT("/");
s = wxT( "/" );
//start at 1 to avoid the root sheet, //start at 1 to avoid the root sheet,
//which does not need to be added to the path //which does not need to be added to the path
//it's timestamp changes anyway. //it's timestamp changes anyway.
for(int i=1; i< m_numSheets; i++){ for( int i = 1; i< m_numSheets; i++ )
t.Printf(_("%8.8lX/"), m_sheets[i]->m_TimeStamp); {
t.Printf( _( "%8.8lX/" ), m_sheets[i]->m_TimeStamp );
s = s + t; s = s + t;
} }
return s; return s;
} }
wxString DrawSheetList::PathHumanReadable(){
wxString DrawSheetList::PathHumanReadable()
{
wxString s, t; wxString s, t;
s = wxT("/");
s = wxT( "/" );
//start at 1 to avoid the root sheet, as above. //start at 1 to avoid the root sheet, as above.
for(int i=1; i< m_numSheets; i++){ for( int i = 1; i< m_numSheets; i++ )
s = s + m_sheets[i]->m_SheetName + wxT("/"); {
s = s + m_sheets[i]->m_SheetName + wxT( "/" );
} }
return s; return s;
} }
void DrawSheetList::UpdateAllScreenReferences(){
void DrawSheetList::UpdateAllScreenReferences()
{
EDA_BaseStruct* t = LastDrawList(); EDA_BaseStruct* t = LastDrawList();
while(t){
if(t->Type() == DRAW_LIB_ITEM_STRUCT_TYPE){ while( t )
EDA_SchComponentStruct* d = (EDA_SchComponentStruct*)t; {
d->m_Field[REFERENCE].m_Text = d->GetRef(this); if( t->Type() == DRAW_LIB_ITEM_STRUCT_TYPE )
{
EDA_SchComponentStruct* d = (EDA_SchComponentStruct*) t;
d->m_Field[REFERENCE].m_Text = d->GetRef( this );
} }
t = t->Pnext; t = t->Pnext;
} }
printf( "on sheet: %s \n", CONV_TO_UTF8(PathHumanReadable()) );
printf( "on sheet: %s \n", CONV_TO_UTF8( PathHumanReadable() ) );
} }
bool DrawSheetList::operator= (const DrawSheetList& d1){
bool DrawSheetList::operator=( const DrawSheetList& d1 )
{
m_numSheets = d1.m_numSheets; m_numSheets = d1.m_numSheets;
int i; int i;
for(i=0; i<m_numSheets; i++){ for( i = 0; i<m_numSheets; i++ )
{
m_sheets[i] = d1.m_sheets[i]; m_sheets[i] = d1.m_sheets[i];
} }
for(; i<DSLSZ; i++){
for( ; i<DSLSZ; i++ )
{
m_sheets[i] = 0; m_sheets[i] = 0;
} }
return true; return true;
} }
bool DrawSheetList::operator==(const DrawSheetList &d1){
if(m_numSheets != d1.m_numSheets)
bool DrawSheetList::operator==( const DrawSheetList& d1 )
{
if( m_numSheets != d1.m_numSheets )
return false; return false;
for(int i=0; i<m_numSheets; i++){ for( int i = 0; i<m_numSheets; i++ )
if(m_sheets[i] != d1.m_sheets[i]) {
if( m_sheets[i] != d1.m_sheets[i] )
return false; return false;
} }
return true; return true;
} }
bool DrawSheetList::operator!=(const DrawSheetList &d1){
if(m_numSheets != d1.m_numSheets)
bool DrawSheetList::operator!=( const DrawSheetList& d1 )
{
if( m_numSheets != d1.m_numSheets )
return true; return true;
for(int i=0; i<m_numSheets; i++){ for( int i = 0; i<m_numSheets; i++ )
if(m_sheets[i] != d1.m_sheets[i]) {
if( m_sheets[i] != d1.m_sheets[i] )
return true; return true;
} }
return false; return false;
} }
eeschema/class_screen.cpp
View file @ 2a1b776b
...@@ -51,9 +51,9 @@ void EDA_BaseStruct::Place( WinEDA_DrawFrame* frame, wxDC* DC ) ...@@ -51,9 +51,9 @@ void EDA_BaseStruct::Place( WinEDA_DrawFrame* frame, wxDC* DC )
{ {
if( m_Flags & IS_NEW ) if( m_Flags & IS_NEW )
{ {
SCH_SCREEN* screen = (SCH_SCREEN*)frame->GetScreen(); SCH_SCREEN* screen = (SCH_SCREEN*) frame->GetScreen();
if(!screen->CheckIfOnDrawList(this)) //don't want a loop! if( !screen->CheckIfOnDrawList( this ) ) //don't want a loop!
screen->AddToDrawList(this); screen->AddToDrawList( this );
g_ItemToRepeat = this; g_ItemToRepeat = this;
if( frame->m_Ident == SCHEMATIC_FRAME ) if( frame->m_Ident == SCHEMATIC_FRAME )
( (WinEDA_SchematicFrame*) frame )->SaveCopyInUndoList( this, IS_NEW ); ( (WinEDA_SchematicFrame*) frame )->SaveCopyInUndoList( this, IS_NEW );
...@@ -117,8 +117,9 @@ void SCH_SCREEN::FreeDrawList() ...@@ -117,8 +117,9 @@ void SCH_SCREEN::FreeDrawList()
{ {
DrawStruct = EEDrawList; DrawStruct = EEDrawList;
EEDrawList = EEDrawList->Pnext; EEDrawList = EEDrawList->Pnext;
SAFE_DELETE(DrawStruct); SAFE_DELETE( DrawStruct );
} }
EEDrawList = NULL; EEDrawList = NULL;
} }
...@@ -147,18 +148,25 @@ void SCH_SCREEN::RemoveFromDrawList( EDA_BaseStruct* DrawStruct ) ...@@ -147,18 +148,25 @@ void SCH_SCREEN::RemoveFromDrawList( EDA_BaseStruct* DrawStruct )
} }
} }
} }
/**************************************************************/ /**************************************************************/
bool SCH_SCREEN::CheckIfOnDrawList( EDA_BaseStruct* st ) bool SCH_SCREEN::CheckIfOnDrawList( EDA_BaseStruct* st )
/**************************************************************/ /**************************************************************/
{ {
EDA_BaseStruct* DrawList = EEDrawList; EDA_BaseStruct* DrawList = EEDrawList;
while( DrawList ){
if( DrawList == st) while( DrawList )
{
if( DrawList == st )
return true; return true;
DrawList = DrawList->Pnext; DrawList = DrawList->Pnext;
} }
return false; return false;
} }
/**************************************************************/ /**************************************************************/
void SCH_SCREEN::AddToDrawList( EDA_BaseStruct* st ) void SCH_SCREEN::AddToDrawList( EDA_BaseStruct* st )
/**************************************************************/ /**************************************************************/
...@@ -167,6 +175,7 @@ void SCH_SCREEN::AddToDrawList( EDA_BaseStruct* st ) ...@@ -167,6 +175,7 @@ void SCH_SCREEN::AddToDrawList( EDA_BaseStruct* st )
EEDrawList = st; EEDrawList = st;
} }
/*********************************************************************/ /*********************************************************************/
/* Class EDA_ScreenList to handle the list of screens in a hierarchy */ /* Class EDA_ScreenList to handle the list of screens in a hierarchy */
/*********************************************************************/ /*********************************************************************/
...@@ -176,18 +185,19 @@ SCH_SCREEN* EDA_ScreenList::GetFirst() ...@@ -176,18 +185,19 @@ SCH_SCREEN* EDA_ScreenList::GetFirst()
/*****************************************/ /*****************************************/
{ {
m_Index = 0; m_Index = 0;
if(m_List.GetCount() > 0) if( m_List.GetCount() > 0 )
return m_List[0]; return m_List[0];
return NULL; return NULL;
} }
/*****************************************/ /*****************************************/
SCH_SCREEN* EDA_ScreenList::GetNext() SCH_SCREEN* EDA_ScreenList::GetNext()
/*****************************************/ /*****************************************/
{ {
if( m_Index < m_List.GetCount() ) if( m_Index < m_List.GetCount() )
m_Index++; m_Index++;
return GetScreen(m_Index); return GetScreen( m_Index );
} }
...@@ -202,54 +212,55 @@ SCH_SCREEN* EDA_ScreenList::GetScreen( unsigned int index ) ...@@ -202,54 +212,55 @@ SCH_SCREEN* EDA_ScreenList::GetScreen( unsigned int index )
return m_List[index]; return m_List[index];
return NULL; return NULL;
} }
/************************************************/ /************************************************/
void EDA_ScreenList::AddScreenToList( SCH_SCREEN* testscreen ) void EDA_ScreenList::AddScreenToList( SCH_SCREEN* testscreen )
/************************************************/ /************************************************/
{ {
if(testscreen == NULL) return; if( testscreen == NULL )
for(unsigned int i=0; i< m_List.GetCount(); i++){ return;
if(m_List[i] == testscreen) for( unsigned int i = 0; i< m_List.GetCount(); i++ )
{
if( m_List[i] == testscreen )
return; return;
} }
m_List.Add(testscreen);
m_List.Add( testscreen );
#ifdef DEBUG #ifdef DEBUG
printf("EDA_ScreenList::AddScreenToList adding %s\n", (const char*)testscreen->m_FileName.mb_str()); printf( "EDA_ScreenList::AddScreenToList adding %s\n",
(const char*) testscreen->m_FileName.mb_str(
) );
#endif #endif
} }
/************************************************/
void EDA_ScreenList::UpdateScreenNumberAndDate( )
/************************************************/
{
SCH_SCREEN* screen;
wxString date = GenDate();
for(int i=0; i<(int)m_List.GetCount(); i++){
screen = m_List[i];
screen->m_ScreenNumber = i;
screen->m_NumberOfScreen = m_List.GetCount();
screen->m_Date = date;
}
}
/************************************************************************/ /************************************************************************/
void EDA_ScreenList::BuildScreenList(EDA_BaseStruct* s) void EDA_ScreenList::BuildScreenList( EDA_BaseStruct* s )
/************************************************************************/ /************************************************************************/
{ {
if(s && s->Type() == DRAW_SHEET_STRUCT_TYPE){ if( s && s->Type() == DRAW_SHEET_STRUCT_TYPE )
DrawSheetStruct* ds = (DrawSheetStruct*)s; {
s = ds->m_s; DrawSheetStruct* ds = (DrawSheetStruct*) s;
s = ds->m_AssociatedScreen;
} }
if(s && s->Type() == SCREEN_STRUCT_TYPE){ if( s && s->Type() == SCREEN_STRUCT_TYPE )
SCH_SCREEN* screen = (SCH_SCREEN*)s; {
AddScreenToList(screen); SCH_SCREEN* screen = (SCH_SCREEN*) s;
AddScreenToList( screen );
EDA_BaseStruct* strct = screen->EEDrawList; EDA_BaseStruct* strct = screen->EEDrawList;
while(strct){ while( strct )
if(strct->Type() == DRAW_SHEET_STRUCT_TYPE){ {
BuildScreenList(strct); if( strct->Type() == DRAW_SHEET_STRUCT_TYPE )
{
BuildScreenList( strct );
} }
strct = strct->Pnext; strct = strct->Pnext;
} }
} }
} }
/*********************************************************************/ /*********************************************************************/
/* Class EDA_SheetList to handle the list of Sheets in a hierarchy */ /* Class EDA_SheetList to handle the list of Sheets in a hierarchy */
/*********************************************************************/ /*********************************************************************/
...@@ -259,23 +270,26 @@ DrawSheetList* EDA_SheetList::GetFirst() ...@@ -259,23 +270,26 @@ DrawSheetList* EDA_SheetList::GetFirst()
/*****************************************/ /*****************************************/
{ {
m_index = 0; m_index = 0;
if(m_count > 0) if( m_count > 0 )
return &( m_List[0] ); return &( m_List[0] );
return NULL; return NULL;
} }
/*****************************************/ /*****************************************/
DrawSheetList* EDA_SheetList::GetNext() DrawSheetList* EDA_SheetList::GetNext()
/*****************************************/ /*****************************************/
{ {
if( m_index < m_count ) if( m_index < m_count )
m_index++; m_index++;
return GetSheet(m_index); return GetSheet( m_index );
} }
/************************************************/ /************************************************/
DrawSheetList* EDA_SheetList::GetSheet(int index ) DrawSheetList* EDA_SheetList::GetSheet( int index )
/************************************************/ /************************************************/
/* return the m_List[index] item /* return the m_List[index] item
*/ */
{ {
...@@ -284,32 +298,80 @@ DrawSheetList* EDA_SheetList::GetSheet(int index ) ...@@ -284,32 +298,80 @@ DrawSheetList* EDA_SheetList::GetSheet(int index )
return NULL; return NULL;
} }
/************************************************************************/ /************************************************************************/
void EDA_SheetList::BuildSheetList(DrawSheetStruct* sheet) void EDA_SheetList::BuildSheetList( DrawSheetStruct* sheet )
/************************************************************************/ /************************************************************************/
{ {
if(m_List == NULL){ if( m_List == NULL )
{
int count = sheet->CountSheets(); int count = sheet->CountSheets();
m_count = count; m_count = count;
m_index = 0; m_index = 0;
if(m_List) free(m_List); m_List = NULL; if( m_List )
free( m_List );m_List = NULL;
count *= sizeof(DrawSheetList); count *= sizeof(DrawSheetList);
m_List = (DrawSheetList*)MyZMalloc(count); m_List = (DrawSheetList*) MyZMalloc( count );
memset((void*)m_List, 0, count); memset( (void*) m_List, 0, count );
m_currList.Clear(); m_currList.Clear();
} }
m_currList.Push(sheet); m_currList.Push( sheet );
m_List[m_index] = m_currList; m_List[m_index] = m_currList;
m_index++; m_index++;
if(sheet->m_s != NULL){ if( sheet->m_AssociatedScreen != NULL )
{
EDA_BaseStruct* strct = m_currList.LastDrawList(); EDA_BaseStruct* strct = m_currList.LastDrawList();
while(strct){ while( strct )
if(strct->Type() == DRAW_SHEET_STRUCT_TYPE){ {
DrawSheetStruct* sht = (DrawSheetStruct*)strct; if( strct->Type() == DRAW_SHEET_STRUCT_TYPE )
BuildSheetList(sht); {
DrawSheetStruct* sht = (DrawSheetStruct*) strct;
BuildSheetList( sht );
} }
strct = strct->Pnext; strct = strct->Pnext;
} }
} }
m_currList.Pop(); m_currList.Pop();
} }
/************************************************/
void EDA_SheetList::UpdateSheetNumberAndDate()
/************************************************/
/* Set a sheet number, the sheet count for sheets in the whole schematic
* and update the date in all srceens
*/
{
wxString date = GenDate();
int sheet_count = 1, sheet_number = 2; // sheet 1 is the root sheet
for( int ii = 0; ii<(int) m_count; ii++ )
{
DrawSheetList* sheetlist = GetSheet( ii );
sheet_count += sheetlist->m_numSheets;
}
for( int ii = 0; ii<(int) m_count; ii++ )
{
DrawSheetList* sheetlist = GetSheet( ii );
// Read all sheets in path, but not the root sheet (jj = 1)
for( int jj = 1; jj < sheetlist->m_numSheets; jj++ )
{
DrawSheetStruct* sheet = sheetlist->m_sheets[jj];
sheet->m_SheetNumber = sheet_number++;
sheet->m_NumberOfSheets = m_count;
SCH_SCREEN* screen = sheet->m_AssociatedScreen;
if( screen != NULL )
{
screen->m_NumberOfScreen = sheet_count;
screen->m_Date = date;
}
}
}
g_RootSheet->m_AssociatedScreen->m_Date = date;
g_RootSheet->m_AssociatedScreen->m_NumberOfScreen = sheet_count;
g_RootSheet->m_SheetNumber = 1;
g_RootSheet->m_NumberOfSheets = m_count;
}
eeschema/class_screen.h
View file @ 2a1b776b
...@@ -33,13 +33,14 @@ public: ...@@ -33,13 +33,14 @@ public:
virtual wxString GetClass() const virtual wxString GetClass() const
{ {
return wxT("SCH_SCREEN"); return wxT( "SCH_SCREEN" );
} }
void FreeDrawList(); // Free EESchema drawing list (does not delete the sub hierarchies) void FreeDrawList(); // Free EESchema drawing list (does not delete the sub hierarchies)
void Place( WinEDA_DrawFrame* frame, wxDC* DC ) { }; void Place( WinEDA_DrawFrame* frame, wxDC* DC ) { };
void RemoveFromDrawList( EDA_BaseStruct* DrawStruct );/* remove DrawStruct from EEDrawList. */ void RemoveFromDrawList( EDA_BaseStruct* DrawStruct ); /* remove DrawStruct from EEDrawList. */
bool CheckIfOnDrawList( EDA_BaseStruct* st ); bool CheckIfOnDrawList( EDA_BaseStruct* st );
void AddToDrawList( EDA_BaseStruct* DrawStruct ); void AddToDrawList( EDA_BaseStruct* DrawStruct );
void ClearUndoORRedoList( EDA_BaseStruct* List ); void ClearUndoORRedoList( EDA_BaseStruct* List );
...@@ -54,12 +55,13 @@ public: ...@@ -54,12 +55,13 @@ public:
}; };
class DrawSheetLabelStruct : public EDA_BaseStruct, public EDA_TextStruct class DrawSheetLabelStruct : public EDA_BaseStruct
, public EDA_TextStruct
{ {
public: public:
int m_Layer; int m_Layer;
int m_Edge, m_Shape; int m_Edge, m_Shape;
bool m_IsDangling; // TRUE si non connect� bool m_IsDangling; // TRUE non connected
public: public:
DrawSheetLabelStruct( DrawSheetStruct* parent, DrawSheetLabelStruct( DrawSheetStruct* parent,
...@@ -69,9 +71,10 @@ public: ...@@ -69,9 +71,10 @@ public:
~DrawSheetLabelStruct() { } ~DrawSheetLabelStruct() { }
virtual wxString GetClass() const virtual wxString GetClass() const
{ {
return wxT("DrawSheetLabelStruct"); return wxT( "DrawSheetLabelStruct" );
} }
DrawSheetLabelStruct* GenCopy(); DrawSheetLabelStruct* GenCopy();
DrawSheetLabelStruct* Next() DrawSheetLabelStruct* Next()
...@@ -82,7 +85,11 @@ public: ...@@ -82,7 +85,11 @@ public:
int draw_mode, int Color = -1 ); int draw_mode, int Color = -1 );
}; };
WX_DEFINE_ARRAY( DrawSheetStruct*, SheetGrowArray );
/* class DrawSheetStruct
This class is the sheet symbol placed in a schematic, and is the entry point for a sub schematic
*/
WX_DEFINE_ARRAY( DrawSheetStruct *, SheetGrowArray );
class DrawSheetStruct : public EDA_BaseStruct /*public SCH_SCREEN*/ /* Gestion de la hierarchie */ class DrawSheetStruct : public EDA_BaseStruct /*public SCH_SCREEN*/ /* Gestion de la hierarchie */
{ {
...@@ -100,16 +107,21 @@ public: ...@@ -100,16 +107,21 @@ public:
int m_Layer; int m_Layer;
DrawSheetLabelStruct* m_Label; /* Points de connection, linked list.*/ DrawSheetLabelStruct* m_Label; /* Points de connection, linked list.*/
int m_NbLabel; /* Nombre de points de connexion */ int m_NbLabel; /* Nombre de points de connexion */
SCH_SCREEN* m_s; SCH_SCREEN* m_AssociatedScreen; /* Associated Screen which handle the physical data
In complex hierarchies we can have many DrawSheetStruct using the same data
*/
int m_SheetNumber; // sheet number (used for info)
int m_NumberOfSheets; // Sheets count in the whole schematic (used for info)
public: public:
DrawSheetStruct( const wxPoint& pos = wxPoint( 0, 0 ) ); DrawSheetStruct( const wxPoint& pos = wxPoint( 0, 0 ) );
~DrawSheetStruct(); ~DrawSheetStruct();
virtual wxString GetClass() const virtual wxString GetClass() const
{ {
return wxT("DrawSheetStruct"); return wxT( "DrawSheetStruct" );
} }
void Place( WinEDA_DrawFrame* frame, wxDC* DC ); void Place( WinEDA_DrawFrame* frame, wxDC* DC );
DrawSheetStruct* GenCopy(); DrawSheetStruct* GenCopy();
void Display_Infos( WinEDA_DrawFrame* frame ); void Display_Infos( WinEDA_DrawFrame* frame );
...@@ -119,15 +131,21 @@ public: ...@@ -119,15 +131,21 @@ public:
void SwapData( DrawSheetStruct* copyitem ); void SwapData( DrawSheetStruct* copyitem );
void DeleteAnnotation( bool recurse ); void DeleteAnnotation( bool recurse );
int ComponentCount(); int ComponentCount();
bool Load(WinEDA_SchematicFrame* frame); bool Load( WinEDA_SchematicFrame* frame );
bool SearchHierarchy(wxString filename, SCH_SCREEN **screen); bool SearchHierarchy( wxString filename, SCH_SCREEN** screen );
bool LocatePathOfScreen(SCH_SCREEN *screen, DrawSheetList* list); bool LocatePathOfScreen( SCH_SCREEN* screen, DrawSheetList* list );
int CountSheets(); int CountSheets();
//void RemoveSheet(DrawSheetStruct* sheet); //void RemoveSheet(DrawSheetStruct* sheet);
//to remove a sheet, just delete it //to remove a sheet, just delete it
//-- the destructor should take care of everything else. //-- the destructor should take care of everything else.
}; };
/**********************************************/
/* class to handle a series of sheets *********/
/* a 'path' so to speak.. *********************/
/**********************************************/
#define DSLSZ 32 #define DSLSZ 32
class DrawSheetList class DrawSheetList
{ {
...@@ -136,54 +154,78 @@ public: ...@@ -136,54 +154,78 @@ public:
DrawSheetStruct* m_sheets[DSLSZ]; DrawSheetStruct* m_sheets[DSLSZ];
DrawSheetList(); DrawSheetList();
~DrawSheetList(){}; ~DrawSheetList() { };
void Clear(){m_numSheets = 0; } void Clear() { m_numSheets = 0; }
int Cmp(DrawSheetList& d); int Cmp( DrawSheetList& d );
DrawSheetStruct* Last(); DrawSheetStruct* Last();
SCH_SCREEN* LastScreen(); SCH_SCREEN* LastScreen();
EDA_BaseStruct* LastDrawList(); EDA_BaseStruct* LastDrawList();
void Push(DrawSheetStruct* sheet); void Push( DrawSheetStruct* sheet );
DrawSheetStruct* Pop(); DrawSheetStruct* Pop();
wxString Path(); wxString Path();
wxString PathHumanReadable(); wxString PathHumanReadable();
void UpdateAllScreenReferences(); void UpdateAllScreenReferences();
bool operator= (const DrawSheetList& d1);
bool operator==(const DrawSheetList &d1); bool operator =( const DrawSheetList& d1 );
bool operator!=(const DrawSheetList &d1);
bool operator ==( const DrawSheetList& d1 );
bool operator !=( const DrawSheetList& d1 );
}; };
/*******************************************************/
/* Class to handle the list of *Sheets* in a hierarchy */ /* Class to handle the list of *Sheets* in a hierarchy */
/*******************************************************/
// sheets are not unique - can have many sheets with the same // sheets are not unique - can have many sheets with the same
// filename and the same SCH_SHEET reference. // filename and the same SCH_SHEET reference.
class EDA_SheetList class EDA_SheetList
{ {
private: private:
DrawSheetList* m_List; DrawSheetList* m_List;
int m_count; int m_count;
int m_index; int m_index;
DrawSheetList m_currList; DrawSheetList m_currList;
public: public:
EDA_SheetList( DrawSheetStruct* sheet ){ EDA_SheetList( DrawSheetStruct* sheet )
{
m_index = 0; m_index = 0;
m_count = 0; m_count = 0;
m_List = NULL; m_List = NULL;
if(sheet == NULL) if( sheet == NULL )
sheet = g_RootSheet; sheet = g_RootSheet;
BuildSheetList( sheet ); BuildSheetList( sheet );
} }
~EDA_SheetList() {if(m_List){free(m_List);} m_List = NULL;}
~EDA_SheetList()
{
if( m_List )
{
free( m_List );
}
m_List = NULL;
}
int GetCount() { return m_count; } int GetCount() { return m_count; }
DrawSheetList* GetFirst(); DrawSheetList* GetFirst();
DrawSheetList* GetNext(); DrawSheetList* GetNext();
DrawSheetList* GetSheet(int index ); DrawSheetList* GetSheet( int index );
void UpdateSheetNumberAndDate(); // Update the date displayed in the sheet count
private: private:
void BuildSheetList( DrawSheetStruct* sheet ); void BuildSheetList( DrawSheetStruct* sheet );
}; };
/********************************************************/
/* Class to handle the list of *screens* in a hierarchy */ /* Class to handle the list of *screens* in a hierarchy */
/********************************************************/
// screens are unique, and correspond to .sch files. // screens are unique, and correspond to .sch files.
WX_DEFINE_ARRAY( SCH_SCREEN*, ScreenGrowArray ); WX_DEFINE_ARRAY( SCH_SCREEN *, ScreenGrowArray );
class EDA_ScreenList class EDA_ScreenList
{ {
private: private:
...@@ -191,16 +233,18 @@ private: ...@@ -191,16 +233,18 @@ private:
unsigned int m_Index; unsigned int m_Index;
public: public:
EDA_ScreenList(){ EDA_ScreenList()
{
m_Index = 0; m_Index = 0;
BuildScreenList(g_RootSheet); BuildScreenList( g_RootSheet );
} }
~EDA_ScreenList() {}
~EDA_ScreenList() { }
int GetCount() { return m_List.GetCount(); } int GetCount() { return m_List.GetCount(); }
SCH_SCREEN* GetFirst(); SCH_SCREEN* GetFirst();
SCH_SCREEN* GetNext(); SCH_SCREEN* GetNext();
SCH_SCREEN* GetScreen( unsigned int index ); SCH_SCREEN* GetScreen( unsigned int index );
void UpdateScreenNumberAndDate();
private: private:
void AddScreenToList( SCH_SCREEN* testscreen ); void AddScreenToList( SCH_SCREEN* testscreen );
......
eeschema/component_class.cpp
View file @ 2a1b776b
...@@ -140,9 +140,7 @@ void EDA_SchComponentStruct::SetRef( DrawSheetList* sheet, wxString ref ) ...@@ -140,9 +140,7 @@ void EDA_SchComponentStruct::SetRef( DrawSheetList* sheet, wxString ref )
//check to see if it is already there before inserting it //check to see if it is already there before inserting it
wxString path = GetPath( sheet ); wxString path = GetPath( sheet );
printf( "SetRef path: %s ref: %s\n", // printf( "SetRef path: %s ref: %s\n", CONV_TO_UTF8( path ), CONV_TO_UTF8( ref ) ); // Debug
CONV_TO_UTF8( path ),
CONV_TO_UTF8( ref ) );
unsigned int i; unsigned int i;
bool notInArray = true; bool notInArray = true;
for( i = 0; i<m_Paths.GetCount(); i++ ) for( i = 0; i<m_Paths.GetCount(); i++ )
......
eeschema/component_class.h
View file @ 2a1b776b
...@@ -37,7 +37,8 @@ enum NumFieldType { ...@@ -37,7 +37,8 @@ enum NumFieldType {
* component fields are texts attached to the component (not the graphic texts) * component fields are texts attached to the component (not the graphic texts)
* There are 2 major fields : Reference and Value * There are 2 major fields : Reference and Value
*/ */
class PartTextStruct : public EDA_BaseStruct, public EDA_TextStruct class PartTextStruct : public EDA_BaseStruct
, public EDA_TextStruct
{ {
public: public:
int m_Layer; int m_Layer;
...@@ -78,7 +79,7 @@ public: ...@@ -78,7 +79,7 @@ public:
wxPoint m_Pos; /* Exact position of part. */ wxPoint m_Pos; /* Exact position of part. */
public: public:
DrawPartStruct( KICAD_T struct_type, const wxPoint &pos ); DrawPartStruct( KICAD_T struct_type, const wxPoint& pos );
~DrawPartStruct(); ~DrawPartStruct();
virtual wxString GetClass() const virtual wxString GetClass() const
...@@ -87,12 +88,13 @@ public: ...@@ -87,12 +88,13 @@ public:
} }
}; };
WX_DECLARE_OBJARRAY(DrawSheetList, ArrayOfSheetLists); WX_DECLARE_OBJARRAY( DrawSheetList, ArrayOfSheetLists );
/* the class EDA_SchComponentStruct describes a real component */ /* the class EDA_SchComponentStruct describes a real component */
class EDA_SchComponentStruct : public DrawPartStruct class EDA_SchComponentStruct : public DrawPartStruct
{ {
public: public:
int m_Multi; /* In multi unit chip - which unit to draw. */ int m_Multi; /* In multi unit chip - which unit to draw. */
//int m_FlagControlMulti; //int m_FlagControlMulti;
ArrayOfSheetLists m_UsedOnSheets; ArrayOfSheetLists m_UsedOnSheets;
int m_Convert; /* Gestion (management) des mutiples representations (ex: conversion De Morgan) */ int m_Convert; /* Gestion (management) des mutiples representations (ex: conversion De Morgan) */
...@@ -101,9 +103,9 @@ public: ...@@ -101,9 +103,9 @@ public:
wxArrayString m_Paths; // /sheet1/C102, /sh2/sh1/U32 etc. wxArrayString m_Paths; // /sheet1/C102, /sh2/sh1/U32 etc.
wxArrayString m_References; // C102, U32 etc. wxArrayString m_References; // C102, U32 etc.
wxString m_PrefixString; //C, R, U, Q etc - the first character which typically indicates what the component is. wxString m_PrefixString; /*C, R, U, Q etc - the first character which typically indicates what the component is.
//determined, upon placement, from the library component. * determined, upon placement, from the library component.
//determined, upon file load, by the first non-digits in the reference fields. * determined, upon file load, by the first non-digits in the reference fields. */
public: public:
EDA_SchComponentStruct( const wxPoint& pos = wxPoint( 0, 0 ) ); EDA_SchComponentStruct( const wxPoint& pos = wxPoint( 0, 0 ) );
...@@ -146,11 +148,13 @@ public: ...@@ -146,11 +148,13 @@ public:
//returns a unique ID, in the form of a path. //returns a unique ID, in the form of a path.
wxString GetPath( DrawSheetList* sheet); wxString GetPath( DrawSheetList* sheet );
const wxString GetRef( DrawSheetList* sheet ); const wxString GetRef( DrawSheetList* sheet );
void SetRef( DrawSheetList* sheet, wxString ref ); void SetRef( DrawSheetList* sheet, wxString ref );
void ClearRefs(); void ClearRefs();
#if defined(DEBUG)
#if defined (DEBUG)
/** /**
* Function Show * Function Show
* is used to output the object tree, currently for debugging only. * is used to output the object tree, currently for debugging only.
...@@ -159,6 +163,7 @@ public: ...@@ -159,6 +163,7 @@ public:
* @param os The ostream& to output to. * @param os The ostream& to output to.
*/ */
void Show( int nestLevel, std::ostream& os ); void Show( int nestLevel, std::ostream& os );
#endif #endif
}; };
......
eeschema/delsheet.cpp
View file @ 2a1b776b
...@@ -37,20 +37,20 @@ wxString msg; ...@@ -37,20 +37,20 @@ wxString msg;
} }
/* effacement du sous schema correspondant */ /* effacement du sous schema correspondant */
if( FirstSheet->m_s->IsModify() && confirm_deletion ) if( FirstSheet->m_AssociatedScreen->IsModify() && confirm_deletion )
{ {
msg.Printf( _("Sheet %s (file %s) modified. Save it?"), msg.Printf( _("Sheet %s (file %s) modified. Save it?"),
FirstSheet->m_SheetName.GetData(), FirstSheet->m_SheetName.GetData(),
FirstSheet->m_FileName.GetData()); FirstSheet->m_FileName.GetData());
if( IsOK(NULL, msg) ) if( IsOK(NULL, msg) )
{ {
frame->SaveEEFile(FirstSheet->m_s, FILE_SAVE_AS); frame->SaveEEFile(FirstSheet->m_AssociatedScreen, FILE_SAVE_AS);
} }
} }
/* free the sub hierarchy */ /* free the sub hierarchy */
if(FirstSheet->m_s){ if(FirstSheet->m_AssociatedScreen){
EEDrawList = FirstSheet->m_s->EEDrawList; EEDrawList = FirstSheet->m_AssociatedScreen->EEDrawList;
while (EEDrawList != NULL) while (EEDrawList != NULL)
{ {
DrawStruct = EEDrawList; DrawStruct = EEDrawList;
...@@ -61,7 +61,7 @@ wxString msg; ...@@ -61,7 +61,7 @@ wxString msg;
} }
} }
/* Effacement des elements de la feuille courante */ /* Effacement des elements de la feuille courante */
FirstSheet->m_s->FreeDrawList(); FirstSheet->m_AssociatedScreen->FreeDrawList();
} }
} }
......
eeschema/dialog_build_BOM.cpp
View file @ 2a1b776b
...@@ -544,7 +544,7 @@ wxString mask, filename; ...@@ -544,7 +544,7 @@ wxString mask, filename;
else else
s_ExportSeparatorSymbol = s_ExportSeparator[0]; s_ExportSeparatorSymbol = s_ExportSeparator[0];
m_ListFileName = g_RootSheet->m_s->m_FileName; m_ListFileName = g_RootSheet->m_AssociatedScreen->m_FileName;
ChangeFileNameExt(m_ListFileName, EXT_LIST); ChangeFileNameExt(m_ListFileName, EXT_LIST);
//need to get rid of the path. //need to get rid of the path.
m_ListFileName = m_ListFileName.AfterLast('/'); m_ListFileName = m_ListFileName.AfterLast('/');
......
eeschema/eeconfig.cpp
View file @ 2a1b776b
/******************************************************/ /******************************************************/
/** eeconfig.cpp : routines et menus de configuration */ /** eeconfig.cpp : routines et menus de configuration */
/*******************************************************/ /*******************************************************/
#include "fctsys.h" #include "fctsys.h"
#include "common.h" #include "common.h"
...@@ -18,44 +18,45 @@ ...@@ -18,44 +18,45 @@
/* Variables locales */ /* Variables locales */
#define HOTKEY_FILENAME wxT("eeschema") #define HOTKEY_FILENAME wxT( "eeschema" )
/*********************************************************************/ /*********************************************************************/
void WinEDA_SchematicFrame::Process_Config(wxCommandEvent& event) void WinEDA_SchematicFrame::Process_Config( wxCommandEvent& event )
/*********************************************************************/ /*********************************************************************/
{ {
int id = event.GetId(); int id = event.GetId();
wxPoint pos; wxPoint pos;
wxString FullFileName; wxString FullFileName;
wxGetMousePosition(&pos.x, &pos.y); wxGetMousePosition( &pos.x, &pos.y );
pos.y += 5; pos.y += 5;
switch ( id )
switch( id )
{ {
case ID_COLORS_SETUP : case ID_COLORS_SETUP:
DisplayColorSetupFrame(this, pos); DisplayColorSetupFrame( this, pos );
break; break;
case ID_CONFIG_REQ : // Creation de la fenetre de configuration case ID_CONFIG_REQ: // Creation de la fenetre de configuration
InstallConfigFrame(pos); InstallConfigFrame( pos );
break; break;
case ID_OPTIONS_SETUP: case ID_OPTIONS_SETUP:
DisplayOptionFrame(this, pos); DisplayOptionFrame( this, pos );
break; break;
case ID_CONFIG_SAVE: case ID_CONFIG_SAVE:
Save_Config(this); Save_Config( this );
break; break;
case ID_CONFIG_READ: case ID_CONFIG_READ:
{ {
wxString mask( wxT("*") ); mask += g_Prj_Config_Filename_ext; wxString mask( wxT( "*" ) ); mask += g_Prj_Config_Filename_ext;
FullFileName = g_RootSheet->m_s->m_FileName; FullFileName = g_RootSheet->m_AssociatedScreen->m_FileName;
ChangeFileNameExt( FullFileName, g_Prj_Config_Filename_ext ); ChangeFileNameExt( FullFileName, g_Prj_Config_Filename_ext );
FullFileName = EDA_FileSelector(_("Read config file"), FullFileName = EDA_FileSelector( _( "Read config file" ),
wxGetCwd(), /* Chemin par defaut */ wxGetCwd(), /* Chemin par defaut */
FullFileName, /* nom fichier par defaut */ FullFileName, /* nom fichier par defaut */
g_Prj_Config_Filename_ext, /* extension par defaut */ g_Prj_Config_Filename_ext, /* extension par defaut */
...@@ -64,13 +65,14 @@ wxString FullFileName; ...@@ -64,13 +65,14 @@ wxString FullFileName;
wxFD_OPEN, wxFD_OPEN,
TRUE /* ne change pas de repertoire courant */ TRUE /* ne change pas de repertoire courant */
); );
if ( FullFileName.IsEmpty() ) break; if( FullFileName.IsEmpty() )
if ( ! wxFileExists(FullFileName) ) break;
if( !wxFileExists( FullFileName ) )
{ {
wxString msg = _("File ") + FullFileName +_("not found");; wxString msg = _( "File " ) + FullFileName + _( "not found" );;
DisplayError(this, msg); break; DisplayError( this, msg ); break;
} }
Read_Config(FullFileName, TRUE ); Read_Config( FullFileName, TRUE );
} }
break; break;
...@@ -78,11 +80,11 @@ wxString FullFileName; ...@@ -78,11 +80,11 @@ wxString FullFileName;
FullFileName = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice ); FullFileName = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice );
FullFileName += HOTKEY_FILENAME; FullFileName += HOTKEY_FILENAME;
FullFileName += DEFAULT_HOTKEY_FILENAME_EXT; FullFileName += DEFAULT_HOTKEY_FILENAME_EXT;
WriteHotkeyConfigFile(FullFileName, s_Eeschema_Hokeys_Descr, true); WriteHotkeyConfigFile( FullFileName, s_Eeschema_Hokeys_Descr, true );
break; break;
case ID_PREFERENCES_READ_CONFIG_HOTKEYS: case ID_PREFERENCES_READ_CONFIG_HOTKEYS:
Read_Hotkey_Config( this, true); Read_Hotkey_Config( this, true );
break; break;
case ID_PREFERENCES_EDIT_CONFIG_HOTKEYS: case ID_PREFERENCES_EDIT_CONFIG_HOTKEYS:
...@@ -91,8 +93,8 @@ wxString FullFileName; ...@@ -91,8 +93,8 @@ wxString FullFileName;
FullFileName += HOTKEY_FILENAME; FullFileName += HOTKEY_FILENAME;
FullFileName += DEFAULT_HOTKEY_FILENAME_EXT; FullFileName += DEFAULT_HOTKEY_FILENAME_EXT;
wxString editorname = GetEditorName(); wxString editorname = GetEditorName();
if ( !editorname.IsEmpty() ) if( !editorname.IsEmpty() )
ExecuteFile(this, editorname, FullFileName); ExecuteFile( this, editorname, FullFileName );
} }
break; break;
...@@ -106,90 +108,94 @@ wxString FullFileName; ...@@ -106,90 +108,94 @@ wxString FullFileName;
break; break;
default: default:
DisplayError(this, wxT("WinEDA_SchematicFrame::Process_Config internal error") ); DisplayError( this, wxT( "WinEDA_SchematicFrame::Process_Config internal error" ) );
} }
} }
/***************************************************************/ /***************************************************************/
bool Read_Hotkey_Config( WinEDA_DrawFrame * frame, bool verbose ) bool Read_Hotkey_Config( WinEDA_DrawFrame* frame, bool verbose )
/***************************************************************/ /***************************************************************/
/* /*
* Read the hotkey files config for eeschema and libedit * Read the hotkey files config for eeschema and libedit
*/ */
{ {
wxString FullFileName = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice ); wxString FullFileName = ReturnHotkeyConfigFilePath( g_ConfigFileLocationChoice );
FullFileName += HOTKEY_FILENAME; FullFileName += HOTKEY_FILENAME;
FullFileName += DEFAULT_HOTKEY_FILENAME_EXT; FullFileName += DEFAULT_HOTKEY_FILENAME_EXT;
frame->ReadHotkeyConfigFile(FullFileName, s_Eeschema_Hokeys_Descr, verbose); frame->ReadHotkeyConfigFile( FullFileName, s_Eeschema_Hokeys_Descr, verbose );
return TRUE; return TRUE;
} }
/***********************************************************************/ /***********************************************************************/
bool Read_Config( const wxString & CfgFileName, bool ForceRereadConfig ) bool Read_Config( const wxString& CfgFileName, bool ForceRereadConfig )
/***********************************************************************/ /***********************************************************************/
/* lit la configuration, si elle n'a pas deja ete lue
1 - lit <nom fichier root>.pro
2 - si non trouve lit <chemin des binaires>../template/kicad.pro
3 - si non trouve: init des variables aux valeurs par defaut
Retourne TRUE si lu, FALSE si config non lue /* lit la configuration, si elle n'a pas deja ete lue
*/ * 1 - lit <nom fichier root>.pro
* 2 - si non trouve lit <chemin des binaires>../template/kicad.pro
* 3 - si non trouve: init des variables aux valeurs par defaut
*
* Retourne TRUE si lu, FALSE si config non lue
*/
{ {
wxString FullFileName; wxString FullFileName;
bool IsRead = TRUE; bool IsRead = TRUE;
wxArrayString liblist_tmp = g_LibName_List; wxArrayString liblist_tmp = g_LibName_List;
if ( CfgFileName.IsEmpty() ) FullFileName = g_RootSheet->m_s->m_FileName; if( CfgFileName.IsEmpty() )
else FullFileName = CfgFileName; FullFileName = g_RootSheet->m_AssociatedScreen->m_FileName;
else
FullFileName = CfgFileName;
g_LibName_List.Clear(); g_LibName_List.Clear();
if ( ! g_EDA_Appl->ReadProjectConfig(FullFileName, if( !g_EDA_Appl->ReadProjectConfig( FullFileName,
GROUP, ParamCfgList, ForceRereadConfig ? FALSE : TRUE) ) // Config non lue GROUP, ParamCfgList, ForceRereadConfig ? FALSE : TRUE ) ) // Config non lue
{ {
g_LibName_List = liblist_tmp; g_LibName_List = liblist_tmp;
IsRead = FALSE; IsRead = FALSE;
} }
/* Traitement des variables particulieres: */ /* Traitement des variables particulieres: */
SetRealLibraryPath( wxT("library") ); SetRealLibraryPath( wxT( "library" ) );
// If the list is void, load the libraries "power.lib" and "device.lib" // If the list is void, load the libraries "power.lib" and "device.lib"
if ( g_LibName_List.GetCount() == 0 ) if( g_LibName_List.GetCount() == 0 )
{ {
g_LibName_List.Add( wxT("power") ); g_LibName_List.Add( wxT( "power" ) );
g_LibName_List.Add( wxT("device") ); g_LibName_List.Add( wxT( "device" ) );
} }
if ( g_EDA_Appl->m_SchematicFrame ) if( g_EDA_Appl->m_SchematicFrame )
{ {
g_EDA_Appl->m_SchematicFrame->SetDrawBgColor(g_DrawBgColor); g_EDA_Appl->m_SchematicFrame->SetDrawBgColor( g_DrawBgColor );
g_EDA_Appl->m_SchematicFrame->m_Draw_Grid = g_ShowGrid; g_EDA_Appl->m_SchematicFrame->m_Draw_Grid = g_ShowGrid;
} }
LoadLibraries(g_EDA_Appl->m_SchematicFrame); LoadLibraries( g_EDA_Appl->m_SchematicFrame );
return IsRead; return IsRead;
} }
/****************************************************************/ /****************************************************************/
void WinEDA_SchematicFrame::Save_Config(wxWindow * displayframe) void WinEDA_SchematicFrame::Save_Config( wxWindow* displayframe )
/***************************************************************/ /***************************************************************/
{ {
wxString path; wxString path;
wxString FullFileName; wxString FullFileName;
wxString mask( wxT("*") ); wxString mask( wxT( "*" ) );
mask += g_Prj_Config_Filename_ext; mask += g_Prj_Config_Filename_ext;
FullFileName = g_RootSheet->m_s->m_FileName.AfterLast('/') /*ConfigFileName*/; FullFileName = g_RootSheet->m_AssociatedScreen->m_FileName.AfterLast( '/' ) /*ConfigFileName*/;
ChangeFileNameExt( FullFileName, g_Prj_Config_Filename_ext ); ChangeFileNameExt( FullFileName, g_Prj_Config_Filename_ext );
path = wxGetCwd(); path = wxGetCwd();
FullFileName = EDA_FileSelector(_("Save preferences"), FullFileName = EDA_FileSelector( _( "Save preferences" ),
path, /* Chemin par defaut */ path, /* Chemin par defaut */
FullFileName, /* nom fichier par defaut */ FullFileName, /* nom fichier par defaut */
g_Prj_Config_Filename_ext, /* extension par defaut */ g_Prj_Config_Filename_ext, /* extension par defaut */
...@@ -198,9 +204,9 @@ wxString mask( wxT("*") ); ...@@ -198,9 +204,9 @@ wxString mask( wxT("*") );
wxFD_SAVE, wxFD_SAVE,
TRUE TRUE
); );
if ( FullFileName.IsEmpty() ) return; if( FullFileName.IsEmpty() )
return;
/* ecriture de la configuration */ /* ecriture de la configuration */
g_EDA_Appl->WriteProjectConfig(FullFileName, GROUP, ParamCfgList); g_EDA_Appl->WriteProjectConfig( FullFileName, GROUP, ParamCfgList );
} }
eeschema/eeredraw.cpp
View file @ 2a1b776b
...@@ -129,7 +129,7 @@ wxString title; ...@@ -129,7 +129,7 @@ wxString title;
void WinEDA_DrawPanel::PrintPage(wxDC * DC, bool Print_Sheet_Ref, int PrintMask) void WinEDA_DrawPanel::PrintPage(wxDC * DC, bool Print_Sheet_Ref, int PrintMask)
/*******************************************************************************/ /*******************************************************************************/
{ {
BASE_SCREEN * screen; // * oldscreen = m_Parent->GetScreen(); BASE_SCREEN * screen;
wxBeginBusyCursor(); wxBeginBusyCursor();
...@@ -140,7 +140,6 @@ BASE_SCREEN * screen; // * oldscreen = m_Parent->GetScreen(); ...@@ -140,7 +140,6 @@ BASE_SCREEN * screen; // * oldscreen = m_Parent->GetScreen();
if ( Print_Sheet_Ref ) if ( Print_Sheet_Ref )
m_Parent->TraceWorkSheet(DC, screen, g_DrawMinimunLineWidth ); m_Parent->TraceWorkSheet(DC, screen, g_DrawMinimunLineWidth );
//m_Parent->m_CurrentSheet->m_s = oldscreen;
wxEndBusyCursor(); wxEndBusyCursor();
} }
......
eeschema/erc.cpp
View file @ 2a1b776b
...@@ -400,7 +400,7 @@ void WinEDA_ErcFrame::TestErc( wxCommandEvent& event ) ...@@ -400,7 +400,7 @@ void WinEDA_ErcFrame::TestErc( wxCommandEvent& event )
if( WriteFichierERC == TRUE ) if( WriteFichierERC == TRUE )
{ {
wxString ErcFullFileName; wxString ErcFullFileName;
ErcFullFileName = g_RootSheet->m_s->m_FileName; ErcFullFileName = g_RootSheet->m_AssociatedScreen->m_FileName;
ChangeFileNameExt( ErcFullFileName, wxT( ".erc" ) ); ChangeFileNameExt( ErcFullFileName, wxT( ".erc" ) );
ErcFullFileName = EDA_FileSelector( _( "ERC file:" ), ErcFullFileName = EDA_FileSelector( _( "ERC file:" ),
wxEmptyString, /* Chemin par defaut */ wxEmptyString, /* Chemin par defaut */
......
eeschema/files-io.cpp
View file @ 2a1b776b
...@@ -63,7 +63,7 @@ void WinEDA_SchematicFrame::Save_File( wxCommandEvent& event ) ...@@ -63,7 +63,7 @@ void WinEDA_SchematicFrame::Save_File( wxCommandEvent& event )
mask = wxT( "*" ) + g_SchExtBuffer; mask = wxT( "*" ) + g_SchExtBuffer;
FullFileName = EDA_FileSelector( _( "Schematic files:" ), FullFileName = EDA_FileSelector( _( "Schematic files:" ),
wxEmptyString, //default path wxEmptyString, //default path
sheet->m_s->m_FileName,// default filename sheet->m_AssociatedScreen->m_FileName,// default filename
g_SchExtBuffer, // extension par defaut g_SchExtBuffer, // extension par defaut
mask, // Masque d'affichage mask, // Masque d'affichage
this, this,
...@@ -111,8 +111,8 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe ...@@ -111,8 +111,8 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe
{ {
if( !IsOK( this, _( "Clear Schematic Hierarchy (modified!)?" ) ) ) if( !IsOK( this, _( "Clear Schematic Hierarchy (modified!)?" ) ) )
return FALSE; return FALSE;
if( g_RootSheet->m_s->m_FileName != g_DefaultSchematicFileName ) if( g_RootSheet->m_AssociatedScreen->m_FileName != g_DefaultSchematicFileName )
SetLastProject( g_RootSheet->m_s->m_FileName ); SetLastProject( g_RootSheet->m_AssociatedScreen->m_FileName );
} }
FullFileName = FileName; FullFileName = FileName;
...@@ -146,7 +146,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe ...@@ -146,7 +146,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe
memset( &g_EESchemaVar, 0, sizeof(g_EESchemaVar) ); memset( &g_EESchemaVar, 0, sizeof(g_EESchemaVar) );
GetScreen()->ClrModify(); GetScreen()->ClrModify();
//m_CurrentSheet->m_s->Pnext = NULL; should be by default //m_CurrentSheet->m_AssociatedScreen->Pnext = NULL; should be by default
if( IsNew ) if( IsNew )
{ {
...@@ -190,7 +190,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe ...@@ -190,7 +190,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe
// Loading the project library cache // Loading the project library cache
wxString FullLibName; wxString FullLibName;
wxString shortfilename; wxString shortfilename;
wxSplitPath( g_RootSheet->m_s->m_FileName, NULL, &shortfilename, NULL ); wxSplitPath( g_RootSheet->m_AssociatedScreen->m_FileName, NULL, &shortfilename, NULL );
FullLibName << wxT( "." ) << STRING_DIR_SEP << shortfilename << wxT( ".cache" ) << FullLibName << wxT( "." ) << STRING_DIR_SEP << shortfilename << wxT( ".cache" ) <<
g_LibExtBuffer; g_LibExtBuffer;
if( wxFileExists( FullLibName ) ) if( wxFileExists( FullLibName ) )
...@@ -211,16 +211,16 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe ...@@ -211,16 +211,16 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsNe
LibCacheExist = TRUE; LibCacheExist = TRUE;
} }
if( !wxFileExists( g_RootSheet->m_s->m_FileName ) && !LibCacheExist ) // Nouveau projet prpbablement if( !wxFileExists( g_RootSheet->m_AssociatedScreen->m_FileName ) && !LibCacheExist ) // Nouveau projet prpbablement
{ {
msg.Printf( _( "File %s not found (new project ?)" ), msg.Printf( _( "File %s not found (new project ?)" ),
g_RootSheet->m_s->m_FileName.GetData() ); g_RootSheet->m_AssociatedScreen->m_FileName.GetData() );
DisplayInfo( this, msg, 20 ); DisplayInfo( this, msg, 20 );
return -1; return -1;
} }
//load the project. //load the project.
SAFE_DELETE(g_RootSheet->m_s); SAFE_DELETE(g_RootSheet->m_AssociatedScreen);
if(!g_RootSheet->Load(this)) if(!g_RootSheet->Load(this))
return 0; return 0;
......
eeschema/hierarch.cpp
View file @ 2a1b776b
...@@ -273,7 +273,7 @@ void WinEDA_SchematicFrame::InstallNextScreen(DrawSheetStruct * Sheet) ...@@ -273,7 +273,7 @@ void WinEDA_SchematicFrame::InstallNextScreen(DrawSheetStruct * Sheet)
/* Routine d'installation de l'ecran correspondant au symbole Sheet pointe /* Routine d'installation de l'ecran correspondant au symbole Sheet pointe
par la souris par la souris
have to be careful here because the DrawSheetStructs within the EEDrawList have to be careful here because the DrawSheetStructs within the EEDrawList
don't actually have a valid m_s (on purpose -- you need the m_SubSheet hierarchy don't actually have a valid m_AssociatedScreen (on purpose -- you need the m_SubSheet hierarchy
to maintain path info (well, this is but one way to maintain path info..) to maintain path info (well, this is but one way to maintain path info..)
*/ */
{ {
...@@ -297,11 +297,10 @@ static void UpdateScreenFromSheet(WinEDA_SchematicFrame * frame) ...@@ -297,11 +297,10 @@ static void UpdateScreenFromSheet(WinEDA_SchematicFrame * frame)
{ {
SCH_SCREEN * NewScreen; SCH_SCREEN * NewScreen;
//SCH_SCREEN * oldscreen = frame->GetScreen(); what is oldscreen used for?
NewScreen = frame->m_CurrentSheet->LastScreen(); NewScreen = frame->m_CurrentSheet->LastScreen();
if(!NewScreen) if(!NewScreen)
NewScreen = g_RootSheet->m_s; NewScreen = g_RootSheet->m_AssociatedScreen;
// Reinit des parametres d'affichage du nouvel ecran // Reinit des parametres d'affichage du nouvel ecran
// assumes m_CurrentSheet has already been updated. // assumes m_CurrentSheet has already been updated.
......
eeschema/libframe.cpp
View file @ 2a1b776b
...@@ -656,6 +656,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -656,6 +656,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
{ {
EditField( &dc, (LibDrawField*) CurrentDrawItem ); EditField( &dc, (LibDrawField*) CurrentDrawItem );
} }
DrawPanel->MouseToCursorSchema();
DrawPanel->CursorOn( &dc ); DrawPanel->CursorOn( &dc );
break; break;
...@@ -725,7 +726,6 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -725,7 +726,6 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
break; break;
} }
DrawPanel->MouseToCursorSchema();
DrawPanel->m_IgnoreMouseEvents = FALSE; DrawPanel->m_IgnoreMouseEvents = FALSE;
if( m_ID_current_state == 0 ) if( m_ID_current_state == 0 )
......
eeschema/makefile.include
View file @ 2a1b776b
...@@ -65,7 +65,9 @@ OBJECTS = eeschema.o\ ...@@ -65,7 +65,9 @@ OBJECTS = eeschema.o\
savelib.o symbtext.o \ savelib.o symbtext.o \
symbdraw.o \ symbdraw.o \
hierarch.o files-io.o \ hierarch.o files-io.o \
annotate.o plothpgl.o \ annotate.o\
annotate_dialog.o\
plothpgl.o \
plot.o libalias.o \ plot.o libalias.o \
plotps.o netform.o \ plotps.o netform.o \
delsheet.o \ delsheet.o \
...@@ -110,7 +112,9 @@ find.o:find.cpp dialog_find.cpp dialog_find.h $(DEPEND) ...@@ -110,7 +112,9 @@ find.o:find.cpp dialog_find.cpp dialog_find.h $(DEPEND)
eeconfig.o: eeconfig.cpp eeconfig.h $(DEPEND) eeconfig.o: eeconfig.cpp eeconfig.h $(DEPEND)
annotate.o: annotate.cpp annotate_dialog.cpp annotate_dialog.h $(DEPEND) netlist.h annotate.o: annotate.cpp annotate_dialog.h $(DEPEND) netlist.h
annotate_dialog.o: annotate_dialog.cpp annotate_dialog.h $(DEPEND) netlist.h
netlist.o: netlist.cpp $(DEPEND) netlist.h netlist.o: netlist.cpp $(DEPEND) netlist.h
......
eeschema/netlist.cpp
View file @ 2a1b776b
...@@ -170,7 +170,7 @@ void* WinEDA_SchematicFrame::BuildNetListBase() ...@@ -170,7 +170,7 @@ void* WinEDA_SchematicFrame::BuildNetListBase()
g_TabObjNet = NULL; /* Init pour le 1er passage dans ListeObjetConnection */ g_TabObjNet = NULL; /* Init pour le 1er passage dans ListeObjetConnection */
/* count nelist items */ /* count nelist items */
g_RootSheet->m_s->SetModify(); g_RootSheet->m_AssociatedScreen->SetModify();
for( sheet = SheetListList.GetFirst(); sheet != NULL; sheet = SheetListList.GetNext() ) for( sheet = SheetListList.GetFirst(); sheet != NULL; sheet = SheetListList.GetNext() )
{ {
......
eeschema/netlist_control.cpp
View file @ 2a1b776b
...@@ -539,7 +539,7 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event ) ...@@ -539,7 +539,7 @@ void WinEDA_NetlistFrame::GenNetlist( wxCommandEvent& event )
g_NetFormat = CurrPage->m_IdNetType; g_NetFormat = CurrPage->m_IdNetType;
/* Calculate the netlist filename */ /* Calculate the netlist filename */
FullFileName = g_RootSheet->m_s->m_FileName; FullFileName = g_RootSheet->m_AssociatedScreen->m_FileName;
switch( g_NetFormat ) switch( g_NetFormat )
{ {
...@@ -649,7 +649,7 @@ void WinEDA_NetlistFrame::RunSimulator( wxCommandEvent& event ) ...@@ -649,7 +649,7 @@ void WinEDA_NetlistFrame::RunSimulator( wxCommandEvent& event )
CommandLine = g_SimulatorCommandLine.AfterFirst( ' ' ); CommandLine = g_SimulatorCommandLine.AfterFirst( ' ' );
/* Calculate the netlist filename */ /* Calculate the netlist filename */
NetlistFullFileName = g_RootSheet->m_s->m_FileName; NetlistFullFileName = g_RootSheet->m_AssociatedScreen->m_FileName;
ChangeFileNameExt( NetlistFullFileName, wxT( ".cir" ) ); ChangeFileNameExt( NetlistFullFileName, wxT( ".cir" ) );
AddDelimiterString( NetlistFullFileName ); AddDelimiterString( NetlistFullFileName );
CommandLine += wxT( " " ) + NetlistFullFileName; CommandLine += wxT( " " ) + NetlistFullFileName;
......
eeschema/schedit.cpp
View file @ 2a1b776b
...@@ -209,7 +209,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -209,7 +209,7 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_TO_PCB: case ID_TO_PCB:
{ {
wxString Line; wxString Line;
if( g_RootSheet->m_s->m_FileName != wxEmptyString ) if( g_RootSheet->m_AssociatedScreen->m_FileName != wxEmptyString )
{ {
Line = GetScreen()->m_FileName; Line = GetScreen()->m_FileName;
AddDelimiterString( Line ); AddDelimiterString( Line );
...@@ -224,9 +224,9 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -224,9 +224,9 @@ void WinEDA_SchematicFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_TO_CVPCB: case ID_TO_CVPCB:
{ {
wxString Line; wxString Line;
if( g_RootSheet->m_s->m_FileName != wxEmptyString ) if( g_RootSheet->m_AssociatedScreen->m_FileName != wxEmptyString )
{ {
Line = g_RootSheet->m_s->m_FileName; Line = g_RootSheet->m_AssociatedScreen->m_FileName;
AddDelimiterString( Line ); AddDelimiterString( Line );
ChangeFileNameExt( Line, wxEmptyString ); ChangeFileNameExt( Line, wxEmptyString );
ExecuteFile( this, CVPCB_EXE, Line ); ExecuteFile( this, CVPCB_EXE, Line );
......
eeschema/schematic_undo_redo.cpp
View file @ 2a1b776b
...@@ -286,7 +286,7 @@ void WinEDA_SchematicFrame::SaveCopyInUndoList( EDA_BaseStruct* ItemToCopy, ...@@ -286,7 +286,7 @@ void WinEDA_SchematicFrame::SaveCopyInUndoList( EDA_BaseStruct* ItemToCopy,
GetScreen()->AddItemToUndoList( NewList ); GetScreen()->AddItemToUndoList( NewList );
/* Clear redo list, because after new save there is no redo to do */ /* Clear redo list, because after new save there is no redo to do */
((SCH_SCREEN*)GetScreen())->ClearUndoORRedoList( GetScreen()->m_RedoList ); ( (SCH_SCREEN*) GetScreen() )->ClearUndoORRedoList( GetScreen()->m_RedoList );
GetScreen()->m_RedoList = NULL; GetScreen()->m_RedoList = NULL;
} }
...@@ -362,7 +362,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List ) ...@@ -362,7 +362,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
while( PickedList ) while( PickedList )
{ {
item = PickedList->m_Image; item = PickedList->m_Image;
((SCH_SCREEN*)GetScreen())->RemoveFromDrawList( item ); ( (SCH_SCREEN*) GetScreen() )->RemoveFromDrawList( item );
item->m_Flags = IS_DELETED; item->m_Flags = IS_DELETED;
PickedList->m_PickedStruct = item; PickedList->m_PickedStruct = item;
PickedList->m_Flags = IS_DELETED; PickedList->m_Flags = IS_DELETED;
...@@ -372,7 +372,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List ) ...@@ -372,7 +372,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
else else
{ {
FirstItem = List->m_Image; FirstItem = List->m_Image;
((SCH_SCREEN*)GetScreen())->RemoveFromDrawList( FirstItem ); ( (SCH_SCREEN*) GetScreen() )->RemoveFromDrawList( FirstItem );
FirstItem->m_Flags = IS_DELETED; FirstItem->m_Flags = IS_DELETED;
List->m_Son = FirstItem; List->m_Son = FirstItem;
} }
...@@ -407,7 +407,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List ) ...@@ -407,7 +407,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
case IS_WIRE_IMAGE: case IS_WIRE_IMAGE:
/* Exchange the current wires and the oild wires */ /* Exchange the current wires and the oild wires */
List->m_Son = ((SCH_SCREEN*)GetScreen())->ExtractWires( FALSE ); List->m_Son = ( (SCH_SCREEN*) GetScreen() )->ExtractWires( FALSE );
while( FirstItem ) while( FirstItem )
{ {
EDA_BaseStruct* nextitem = FirstItem->Pnext; EDA_BaseStruct* nextitem = FirstItem->Pnext;
...@@ -437,7 +437,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List ) ...@@ -437,7 +437,7 @@ void WinEDA_SchematicFrame::PutDataInPreviousState( DrawPickedStruct* List )
case IS_NEW: case IS_NEW:
item = PickedList->m_Image; item = PickedList->m_Image;
((SCH_SCREEN*)GetScreen())->RemoveFromDrawList( item ); ( (SCH_SCREEN*) GetScreen() )->RemoveFromDrawList( item );
item->m_Flags = IS_DELETED; item->m_Flags = IS_DELETED;
PickedList->m_PickedStruct = item; PickedList->m_PickedStruct = item;
PickedList->m_Flags = IS_DELETED; PickedList->m_Flags = IS_DELETED;
...@@ -542,16 +542,19 @@ void SCH_SCREEN::ClearUndoORRedoList( EDA_BaseStruct* List ) ...@@ -542,16 +542,19 @@ void SCH_SCREEN::ClearUndoORRedoList( EDA_BaseStruct* List )
{ {
if( (item->m_Flags & IS_NEW) == 0 ) if( (item->m_Flags & IS_NEW) == 0 )
{ {
printf("schematic undo_redo.cpp: undo_redo with a DRAW_SHEET_STRUCT_TYPE, checkme!!\n"); printf(
"schematic undo_redo.cpp: undo_redo with a DRAW_SHEET_STRUCT_TYPE, checkme!!\n" );
/* /*
sheet->EEDrawList = NULL; * sheet->EEDrawList = NULL;
sheet->m_UndoList = NULL; * sheet->m_UndoList = NULL;
sheet->m_RedoList = NULL; * sheet->m_RedoList = NULL;
*/ */
} }
} }
} }
if( (item->m_Flags & IS_NEW) == 0 ){ if( (item->m_Flags & IS_NEW) == 0 )
{
SAFE_DELETE( item ); SAFE_DELETE( item );
} }
} }
...@@ -583,16 +586,19 @@ void SCH_SCREEN::ClearUndoORRedoList( EDA_BaseStruct* List ) ...@@ -583,16 +586,19 @@ void SCH_SCREEN::ClearUndoORRedoList( EDA_BaseStruct* List )
{ {
if( (FirstItem->m_Flags & IS_NEW) == 0 ) if( (FirstItem->m_Flags & IS_NEW) == 0 )
{ {
printf("schematic undo_redo.cpp undo_redo with a DRAW_SHEET_STRUCT_TYPE, checkme!!\n"); printf(
"schematic undo_redo.cpp undo_redo with a DRAW_SHEET_STRUCT_TYPE, checkme!!\n" );
/* /*
sheet->EEDrawList = NULL; * sheet->EEDrawList = NULL;
sheet->m_UndoList = NULL; * sheet->m_UndoList = NULL;
sheet->m_RedoList = NULL; * sheet->m_RedoList = NULL;
*/ */
} }
} }
} }
if( (FirstItem->m_Flags & IS_NEW) == 0 ){ if( (FirstItem->m_Flags & IS_NEW) == 0 )
{
SAFE_DELETE( FirstItem ); SAFE_DELETE( FirstItem );
} }
} }
......
eeschema/schframe.cpp
View file @ 2a1b776b
...@@ -215,22 +215,22 @@ wxString WinEDA_SchematicFrame::GetScreenDesc() ...@@ -215,22 +215,22 @@ wxString WinEDA_SchematicFrame::GetScreenDesc()
} }
/******************************/ /*******************************************/
void WinEDA_SchematicFrame::CreateScreens() void WinEDA_SchematicFrame::CreateScreens()
/******************************/ /*******************************************/
{ {
/* creation des ecrans Sch , Lib */ /* creation des ecrans Sch , Lib */
if( g_RootSheet == NULL ) if( g_RootSheet == NULL )
{ {
g_RootSheet = new DrawSheetStruct(); g_RootSheet = new DrawSheetStruct();
} }
if( g_RootSheet->m_s == NULL ) if( g_RootSheet->m_AssociatedScreen == NULL )
{ {
g_RootSheet->m_s = new SCH_SCREEN( SCHEMATIC_FRAME ); g_RootSheet->m_AssociatedScreen = new SCH_SCREEN( SCHEMATIC_FRAME );
g_RootSheet->m_s->m_RefCount++; g_RootSheet->m_AssociatedScreen->m_RefCount++;
} }
g_RootSheet->m_s->m_FileName = g_DefaultSchematicFileName; g_RootSheet->m_AssociatedScreen->m_FileName = g_DefaultSchematicFileName;
g_RootSheet->m_s->m_Date = GenDate(); g_RootSheet->m_AssociatedScreen->m_Date = GenDate();
m_CurrentSheet->Clear(); m_CurrentSheet->Clear();
m_CurrentSheet->Push( g_RootSheet ); m_CurrentSheet->Push( g_RootSheet );
...@@ -294,10 +294,11 @@ void WinEDA_SchematicFrame::OnCloseWindow( wxCloseEvent& Event ) ...@@ -294,10 +294,11 @@ void WinEDA_SchematicFrame::OnCloseWindow( wxCloseEvent& Event )
} }
} }
if( !GetScreen()->m_FileName.IsEmpty() && (GetScreen()->EEDrawList != NULL) ) if( !g_RootSheet->m_AssociatedScreen->m_FileName.IsEmpty() &&
SetLastProject( GetScreen()->m_FileName ); (g_RootSheet->m_AssociatedScreen->EEDrawList != NULL) )
SetLastProject( g_RootSheet->m_AssociatedScreen->m_FileName );
ClearProjectDrawList( g_RootSheet->m_s, TRUE ); ClearProjectDrawList( g_RootSheet->m_AssociatedScreen, TRUE );
/* allof sub sheets are deleted, only the main sheet is useable */ /* allof sub sheets are deleted, only the main sheet is useable */
m_CurrentSheet->Clear(); m_CurrentSheet->Clear();
......
eeschema/sheet.cpp
View file @ 2a1b776b
...@@ -159,7 +159,8 @@ void WinEDA_SheetPropertiesFrame::CreateControls() ...@@ -159,7 +159,8 @@ void WinEDA_SheetPropertiesFrame::CreateControls()
itemBoxSizer3->Add( itemBoxSizer4, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 ); itemBoxSizer3->Add( itemBoxSizer4, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _( wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _(
"Filename (will be created upon save if it does not already exist):" ), wxDefaultPosition, "Filename (will be created upon save if it does not already exist):" ),
wxDefaultPosition,
wxDefaultSize, 0 ); wxDefaultSize, 0 );
itemBoxSizer4->Add( itemStaticText5, itemBoxSizer4->Add( itemStaticText5,
0, 0,
...@@ -292,25 +293,31 @@ void WinEDA_SheetPropertiesFrame::SheetPropertiesAccept( wxCommandEvent& event ) ...@@ -292,25 +293,31 @@ void WinEDA_SheetPropertiesFrame::SheetPropertiesAccept( wxCommandEvent& event )
{ {
m_CurrentSheet->m_FileName = FileName; m_CurrentSheet->m_FileName = FileName;
if( wxFileExists( FileName ) )//do we reload the data from the existing file if( wxFileExists( FileName ) ) //do we reload the data from the existing file
{ {
msg.Printf( _( "A file named %s exists, load it (otherwise overwrite it)?" ), FileName.GetData() ); msg.Printf( _(
"A file named %s exists, load it (otherwise overwrite it)?" ),
FileName.GetData() );
if( IsOK( this, msg ) ) if( IsOK( this, msg ) )
{ {
if( m_CurrentSheet->m_s ){ if( m_CurrentSheet->m_AssociatedScreen )
m_CurrentSheet->m_s->m_RefCount--; {
if( m_CurrentSheet->m_s->m_RefCount == 0) m_CurrentSheet->m_AssociatedScreen->m_RefCount--;
SAFE_DELETE(m_CurrentSheet->m_s); if( m_CurrentSheet->m_AssociatedScreen->m_RefCount == 0 )
SAFE_DELETE( m_CurrentSheet->m_AssociatedScreen );
}
m_CurrentSheet->m_AssociatedScreen = NULL; //so that we reload..
m_CurrentSheet->Load( m_Parent );
} }
m_CurrentSheet->m_s = NULL; //so that we reload..
m_CurrentSheet->Load(m_Parent);
} }
}else{ else
{
//just make a new screen if needed. //just make a new screen if needed.
if( !m_CurrentSheet->m_s ){ if( !m_CurrentSheet->m_AssociatedScreen )
m_CurrentSheet->m_s = new SCH_SCREEN(SCHEMATIC_FRAME); {
m_CurrentSheet->m_s->m_RefCount++; //be careful with these m_CurrentSheet->m_AssociatedScreen = new SCH_SCREEN( SCHEMATIC_FRAME );
m_CurrentSheet->m_s->m_FileName = FileName; m_CurrentSheet->m_AssociatedScreen->m_RefCount++; //be careful with these
m_CurrentSheet->m_AssociatedScreen->m_FileName = FileName;
} }
} }
} }
...@@ -373,7 +380,7 @@ DrawSheetStruct* WinEDA_SchematicFrame::CreateSheet( wxDC* DC ) ...@@ -373,7 +380,7 @@ DrawSheetStruct* WinEDA_SchematicFrame::CreateSheet( wxDC* DC )
Sheet->m_Flags = IS_NEW | IS_RESIZED; Sheet->m_Flags = IS_NEW | IS_RESIZED;
Sheet->m_TimeStamp = GetTimeStamp(); Sheet->m_TimeStamp = GetTimeStamp();
Sheet->m_Parent = GetScreen(); Sheet->m_Parent = GetScreen();
Sheet->m_s = NULL; Sheet->m_AssociatedScreen = NULL;
s_SheetMindx = SHEET_MIN_WIDTH; s_SheetMindx = SHEET_MIN_WIDTH;
s_SheetMindy = SHEET_MIN_HEIGHT; s_SheetMindy = SHEET_MIN_HEIGHT;
...@@ -496,7 +503,6 @@ static void DeplaceSheet( WinEDA_DrawPanel* panel, wxDC* DC, bool erase ) ...@@ -496,7 +503,6 @@ static void DeplaceSheet( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
} }
/****************************************/ /****************************************/
/* Routine de sortie du Menu de Sheet */ /* Routine de sortie du Menu de Sheet */
/****************************************/ /****************************************/
...@@ -514,7 +520,7 @@ static void ExitSheet( WinEDA_DrawPanel* Panel, wxDC* DC ) ...@@ -514,7 +520,7 @@ static void ExitSheet( WinEDA_DrawPanel* Panel, wxDC* DC )
RedrawOneStruct( Panel, DC, Sheet, g_XorMode ); RedrawOneStruct( Panel, DC, Sheet, g_XorMode );
SAFE_DELETE( Sheet ); SAFE_DELETE( Sheet );
} }
else if( Sheet->m_Flags & IS_RESIZED )/* resize en cours: on l'annule */ else if( Sheet->m_Flags & IS_RESIZED ) /* resize en cours: on l'annule */
{ {
RedrawOneStruct( Panel, DC, Sheet, g_XorMode ); RedrawOneStruct( Panel, DC, Sheet, g_XorMode );
Sheet->m_Size.x = s_OldPos.x; Sheet->m_Size.x = s_OldPos.x;
...@@ -522,7 +528,7 @@ static void ExitSheet( WinEDA_DrawPanel* Panel, wxDC* DC ) ...@@ -522,7 +528,7 @@ static void ExitSheet( WinEDA_DrawPanel* Panel, wxDC* DC )
RedrawOneStruct( Panel, DC, Sheet, GR_DEFAULT_DRAWMODE ); RedrawOneStruct( Panel, DC, Sheet, GR_DEFAULT_DRAWMODE );
Sheet->m_Flags = 0; Sheet->m_Flags = 0;
} }
else if( Sheet->m_Flags & IS_MOVED )/* move en cours: on l'annule */ else if( Sheet->m_Flags & IS_MOVED ) /* move en cours: on l'annule */
{ {
wxPoint curspos = Screen->m_Curseur; wxPoint curspos = Screen->m_Curseur;
Panel->m_Parent->GetScreen()->m_Curseur = s_OldPos; Panel->m_Parent->GetScreen()->m_Curseur = s_OldPos;
...@@ -540,7 +546,6 @@ static void ExitSheet( WinEDA_DrawPanel* Panel, wxDC* DC ) ...@@ -540,7 +546,6 @@ static void ExitSheet( WinEDA_DrawPanel* Panel, wxDC* DC )
} }
/*! /*!
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
*/ */
......
eeschema/sheetlab.cpp
View file @ 2a1b776b
...@@ -358,8 +358,8 @@ DrawSheetLabelStruct* WinEDA_SchematicFrame::Import_PinSheet( DrawSheetStruct* S ...@@ -358,8 +358,8 @@ DrawSheetLabelStruct* WinEDA_SchematicFrame::Import_PinSheet( DrawSheetStruct* S
DrawSheetLabelStruct* NewSheetLabel, * SheetLabel = NULL; DrawSheetLabelStruct* NewSheetLabel, * SheetLabel = NULL;
DrawHierLabelStruct* HLabel = NULL; DrawHierLabelStruct* HLabel = NULL;
if(!Sheet->m_s) return NULL; if(!Sheet->m_AssociatedScreen) return NULL;
DrawStruct = Sheet->m_s->EEDrawList; DrawStruct = Sheet->m_AssociatedScreen->EEDrawList;
HLabel = NULL; HLabel = NULL;
for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext ) for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext )
{ {
......
internat/fr/kicad.mo
View file @ 2a1b776b
No preview for this file type
internat/fr/kicad.po
View file @ 2a1b776b
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kicad\n" "Project-Id-Version: kicad\n"
"POT-Creation-Date: \n" "POT-Creation-Date: \n"
"PO-Revision-Date: 2008-02-21 07:51+0100\n" "PO-Revision-Date: 2008-02-26 12:12+0100\n"
"Last-Translator: \n" "Last-Translator: jp charras <jean-pierre.charras@inpg.fr>\n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n" "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
...@@ -267,7 +267,6 @@ msgstr "&OK" ...@@ -267,7 +267,6 @@ msgstr "&OK"
#: pcbnew/dialog_zones_by_polygon.cpp:205 #: pcbnew/dialog_zones_by_polygon.cpp:205
#: eeschema/plothpgl.cpp:274 #: eeschema/plothpgl.cpp:274
#: eeschema/symbtext.cpp:178 #: eeschema/symbtext.cpp:178
#: eeschema/annotate_dialog.cpp:154
#: eeschema/dialog_options.cpp:278 #: eeschema/dialog_options.cpp:278
#: eeschema/dialog_build_BOM.cpp:342 #: eeschema/dialog_build_BOM.cpp:342
#: eeschema/dialog_erc.cpp:218 #: eeschema/dialog_erc.cpp:218
...@@ -1033,6 +1032,7 @@ msgstr "Origine des coord de trac ...@@ -1033,6 +1032,7 @@ msgstr "Origine des coord de trac
#: pcbnew/pcbplot.cpp:214 #: pcbnew/pcbplot.cpp:214
#: pcbnew/xchgmod.cpp:137 #: pcbnew/xchgmod.cpp:137
#: eeschema/annotate_dialog.cpp:197
#: share/zoom.cpp:448 #: share/zoom.cpp:448
msgid "Close" msgid "Close"
msgstr "Fermer" msgstr "Fermer"
...@@ -1252,8 +1252,8 @@ msgid "Ref." ...@@ -1252,8 +1252,8 @@ msgid "Ref."
msgstr "Ref." msgstr "Ref."
#: pcbnew/class_text_mod.cpp:345 #: pcbnew/class_text_mod.cpp:345
#: pcbnew/class_board_item.cpp:79
#: pcbnew/class_edge_mod.cpp:290 #: pcbnew/class_edge_mod.cpp:290
#: pcbnew/class_board_item.cpp:79
#: eeschema/edit_component_in_schematic.cpp:789 #: eeschema/edit_component_in_schematic.cpp:789
#: eeschema/component_class.cpp:56 #: eeschema/component_class.cpp:56
#: eeschema/eelayer.h:158 #: eeschema/eelayer.h:158
...@@ -1267,17 +1267,17 @@ msgid "Text" ...@@ -1267,17 +1267,17 @@ msgid "Text"
msgstr "Texte" msgstr "Texte"
#: pcbnew/class_text_mod.cpp:350 #: pcbnew/class_text_mod.cpp:350
#: pcbnew/class_edge_mod.cpp:289
#: pcbnew/class_pad.cpp:881 #: pcbnew/class_pad.cpp:881
#: pcbnew/class_module.cpp:1107 #: pcbnew/class_module.cpp:1107
#: pcbnew/class_edge_mod.cpp:289
#: cvpcb/setvisu.cpp:31 #: cvpcb/setvisu.cpp:31
msgid "Module" msgid "Module"
msgstr "Module" msgstr "Module"
#: pcbnew/class_text_mod.cpp:359 #: pcbnew/class_text_mod.cpp:359
#: pcbnew/class_marker.cpp:133
#: pcbnew/class_track.cpp:779 #: pcbnew/class_track.cpp:779
#: pcbnew/class_drawsegment.cpp:159 #: pcbnew/class_drawsegment.cpp:159
#: pcbnew/class_marker.cpp:133
#: pcbnew/class_zone.cpp:526 #: pcbnew/class_zone.cpp:526
#: gerbview/affiche.cpp:94 #: gerbview/affiche.cpp:94
msgid "Type" msgid "Type"
...@@ -1312,11 +1312,11 @@ msgstr "Miroir" ...@@ -1312,11 +1312,11 @@ msgstr "Miroir"
#: pcbnew/class_text_mod.cpp:386 #: pcbnew/class_text_mod.cpp:386
#: pcbnew/class_pcb_text.cpp:191 #: pcbnew/class_pcb_text.cpp:191
#: pcbnew/dialog_edit_mod_text.cpp:204 #: pcbnew/dialog_edit_mod_text.cpp:204
#: pcbnew/class_edge_mod.cpp:300
#: pcbnew/cotation.cpp:129 #: pcbnew/cotation.cpp:129
#: pcbnew/mirepcb.cpp:113 #: pcbnew/mirepcb.cpp:113
#: pcbnew/pcbtexte.cpp:130 #: pcbnew/pcbtexte.cpp:130
#: pcbnew/class_track.cpp:859 #: pcbnew/class_track.cpp:859
#: pcbnew/class_edge_mod.cpp:300
#: pcbnew/class_drawsegment.cpp:179 #: pcbnew/class_drawsegment.cpp:179
#: eeschema/affiche.cpp:188 #: eeschema/affiche.cpp:188
#: eeschema/dialog_cmp_graphic_properties.cpp:188 #: eeschema/dialog_cmp_graphic_properties.cpp:188
...@@ -1419,52 +1419,19 @@ msgstr "Max" ...@@ -1419,52 +1419,19 @@ msgstr "Max"
msgid "Segm" msgid "Segm"
msgstr "Segm" msgstr "Segm"
#: pcbnew/gendrill.cpp:308
msgid "Drill file"
msgstr "Fichier de percage"
#: pcbnew/gendrill.cpp:323
#: pcbnew/gendrill.cpp:789
#: pcbnew/plotps.cpp:51
#: pcbnew/xchgmod.cpp:643
msgid "Unable to create file "
msgstr "Impossible de crer le fichier "
#: pcbnew/gendrill.cpp:378
#: pcbnew/dialog_gendrill.cpp:180
msgid "2:3"
msgstr "2:3"
#: pcbnew/gendrill.cpp:379
#: pcbnew/dialog_gendrill.cpp:181
msgid "2:4"
msgstr "2:4"
#: pcbnew/gendrill.cpp:384
msgid "3:2"
msgstr "3:2"
#: pcbnew/gendrill.cpp:385
msgid "3:3"
msgstr "3:3"
#: pcbnew/gendrill.cpp:728
msgid "Drill Map file"
msgstr "Fichier Plan de perage"
#: pcbnew/gendrill.cpp:743
msgid "Unable to create file"
msgstr "Impossible de crer le fichier "
#: pcbnew/gendrill.cpp:774
msgid "Drill Report file"
msgstr "Fichier rapport de perage:"
#: pcbnew/controle.cpp:172 #: pcbnew/controle.cpp:172
#: pcbnew/modedit.cpp:77 #: pcbnew/modedit.cpp:77
msgid "Selection Clarification" msgid "Selection Clarification"
msgstr "Clarification de la Slection" msgstr "Clarification de la Slection"
#: pcbnew/surbrill.cpp:37
msgid "Filter for net names:"
msgstr "Filtre pour nets:"
#: pcbnew/surbrill.cpp:41
msgid "List Nets"
msgstr "Liste quipots"
#: pcbnew/dialog_graphic_items_options.cpp:194 #: pcbnew/dialog_graphic_items_options.cpp:194
msgid "Graphics:" msgid "Graphics:"
msgstr "Elments graphiques;" msgstr "Elments graphiques;"
...@@ -1955,7 +1922,7 @@ msgid "Pad Settings" ...@@ -1955,7 +1922,7 @@ msgid "Pad Settings"
msgstr "Caract pads" msgstr "Caract pads"
#: pcbnew/modedit.cpp:406 #: pcbnew/modedit.cpp:406
#: eeschema/schedit.cpp:300 #: eeschema/schedit.cpp:303
msgid "Add Drawing" msgid "Add Drawing"
msgstr "Ajout d'lments graphiques" msgstr "Ajout d'lments graphiques"
...@@ -1966,8 +1933,8 @@ msgstr "Place Ancre" ...@@ -1966,8 +1933,8 @@ msgstr "Place Ancre"
#: pcbnew/modedit.cpp:424 #: pcbnew/modedit.cpp:424
#: pcbnew/edit.cpp:552 #: pcbnew/edit.cpp:552
#: eeschema/schedit.cpp:458
#: eeschema/libframe.cpp:579 #: eeschema/libframe.cpp:579
#: eeschema/schedit.cpp:470
msgid "Delete item" msgid "Delete item"
msgstr "Suppression d'lments" msgstr "Suppression d'lments"
...@@ -1982,7 +1949,7 @@ msgstr "Fin Outil" ...@@ -1982,7 +1949,7 @@ msgstr "Fin Outil"
#: pcbnew/modedit_onclick.cpp:216 #: pcbnew/modedit_onclick.cpp:216
#: pcbnew/onrightclick.cpp:484 #: pcbnew/onrightclick.cpp:484
#: eeschema/libedit_onrightclick.cpp:237 #: eeschema/libedit_onrightclick.cpp:237
#: eeschema/onrightclick.cpp:614 #: eeschema/onrightclick.cpp:622
#: gerbview/onrightclick.cpp:51 #: gerbview/onrightclick.cpp:51
msgid "Cancel Block" msgid "Cancel Block"
msgstr "Annuler Bloc" msgstr "Annuler Bloc"
...@@ -1996,7 +1963,7 @@ msgstr "Zoom Bloc (drag+bouton milieu)" ...@@ -1996,7 +1963,7 @@ msgstr "Zoom Bloc (drag+bouton milieu)"
#: pcbnew/modedit_onclick.cpp:221 #: pcbnew/modedit_onclick.cpp:221
#: pcbnew/onrightclick.cpp:489 #: pcbnew/onrightclick.cpp:489
#: eeschema/libedit_onrightclick.cpp:245 #: eeschema/libedit_onrightclick.cpp:245
#: eeschema/onrightclick.cpp:622 #: eeschema/onrightclick.cpp:630
#: gerbview/onrightclick.cpp:54 #: gerbview/onrightclick.cpp:54
msgid "Place Block" msgid "Place Block"
msgstr "Place Bloc" msgstr "Place Bloc"
...@@ -2004,7 +1971,7 @@ msgstr "Place Bloc" ...@@ -2004,7 +1971,7 @@ msgstr "Place Bloc"
#: pcbnew/modedit_onclick.cpp:223 #: pcbnew/modedit_onclick.cpp:223
#: pcbnew/onrightclick.cpp:491 #: pcbnew/onrightclick.cpp:491
#: eeschema/libedit_onrightclick.cpp:251 #: eeschema/libedit_onrightclick.cpp:251
#: eeschema/onrightclick.cpp:631 #: eeschema/onrightclick.cpp:639
msgid "Copy Block (shift + drag mouse)" msgid "Copy Block (shift + drag mouse)"
msgstr "Copie Bloc (shift + drag mouse)" msgstr "Copie Bloc (shift + drag mouse)"
...@@ -2132,14 +2099,6 @@ msgstr "Effacement contour" ...@@ -2132,14 +2099,6 @@ msgstr "Effacement contour"
msgid "Set Width" msgid "Set Width"
msgstr "Ajuste Epaiss" msgstr "Ajuste Epaiss"
#: pcbnew/surbrill.cpp:37
msgid "Filter for net names:"
msgstr "Filtre pour nets:"
#: pcbnew/surbrill.cpp:41
msgid "List Nets"
msgstr "Liste quipots"
#: pcbnew/plotgerb.cpp:72 #: pcbnew/plotgerb.cpp:72
msgid "unable to create file " msgid "unable to create file "
msgstr "Impossible de crer fichier " msgstr "Impossible de crer fichier "
...@@ -2589,6 +2548,13 @@ msgstr "Autoroute Pad" ...@@ -2589,6 +2548,13 @@ msgstr "Autoroute Pad"
msgid "Autoroute Net" msgid "Autoroute Net"
msgstr "Autoroute Net" msgstr "Autoroute Net"
#: pcbnew/plotps.cpp:51
#: pcbnew/gendrill.cpp:323
#: pcbnew/gendrill.cpp:789
#: pcbnew/xchgmod.cpp:643
msgid "Unable to create file "
msgstr "Impossible de crer le fichier "
#: pcbnew/plotps.cpp:361 #: pcbnew/plotps.cpp:361
#: pcbnew/affiche.cpp:63 #: pcbnew/affiche.cpp:63
#: pcbnew/class_board.cpp:444 #: pcbnew/class_board.cpp:444
...@@ -2913,8 +2879,8 @@ msgstr "Addition ...@@ -2913,8 +2879,8 @@ msgstr "Addition
#: pcbnew/edit.cpp:290 #: pcbnew/edit.cpp:290
#: pcbnew/tool_modedit.cpp:180 #: pcbnew/tool_modedit.cpp:180
#: eeschema/schedit.cpp:320
#: eeschema/libframe.cpp:503 #: eeschema/libframe.cpp:503
#: eeschema/schedit.cpp:323
#: gerbview/tool_gerber.cpp:385 #: gerbview/tool_gerber.cpp:385
msgid "Add Text" msgid "Add Text"
msgstr "Ajout de Texte" msgstr "Ajout de Texte"
...@@ -2935,12 +2901,28 @@ msgstr "Surbrillance des ...@@ -2935,12 +2901,28 @@ msgstr "Surbrillance des
msgid "Local Ratsnest" msgid "Local Ratsnest"
msgstr "Monter le chevelu gnral" msgstr "Monter le chevelu gnral"
#: pcbnew/class_edge_mod.cpp:287
msgid "Seg"
msgstr "Seg"
#: pcbnew/class_edge_mod.cpp:293
msgid "TimeStamp"
msgstr "TimeStamp"
#: pcbnew/class_edge_mod.cpp:295
msgid "Mod Layer"
msgstr "Couche Mod."
#: pcbnew/class_edge_mod.cpp:297
msgid "Seg Layer"
msgstr "Couche Seg."
#: pcbnew/pcbframe.cpp:272 #: pcbnew/pcbframe.cpp:272
msgid "Board modified, Save before exit ?" msgid "Board modified, Save before exit ?"
msgstr "Circuit Imprim modifie, Sauver avant de quitter ?" msgstr "Circuit Imprim modifie, Sauver avant de quitter ?"
#: pcbnew/pcbframe.cpp:273 #: pcbnew/pcbframe.cpp:273
#: eeschema/schframe.cpp:238 #: eeschema/schframe.cpp:269
#: cvpcb/cvframe.cpp:178 #: cvpcb/cvframe.cpp:178
#: common/confirm.cpp:119 #: common/confirm.cpp:119
msgid "Confirmation" msgid "Confirmation"
...@@ -2963,12 +2945,12 @@ msgid "Display Polar Coords" ...@@ -2963,12 +2945,12 @@ msgid "Display Polar Coords"
msgstr "Affichage coord Polaires" msgstr "Affichage coord Polaires"
#: pcbnew/pcbframe.cpp:391 #: pcbnew/pcbframe.cpp:391
#: eeschema/schframe.cpp:328 #: eeschema/schframe.cpp:368
msgid "Grid not show" msgid "Grid not show"
msgstr "Grille non montre" msgstr "Grille non montre"
#: pcbnew/pcbframe.cpp:391 #: pcbnew/pcbframe.cpp:391
#: eeschema/schframe.cpp:328 #: eeschema/schframe.cpp:368
msgid "Show Grid" msgid "Show Grid"
msgstr "Afficher grille" msgstr "Afficher grille"
...@@ -3406,14 +3388,26 @@ msgstr "Grille perso" ...@@ -3406,14 +3388,26 @@ msgstr "Grille perso"
msgid "+/- to switch" msgid "+/- to switch"
msgstr "+/- pour commuter" msgstr "+/- pour commuter"
#: pcbnew/class_marker.cpp:133 #: pcbnew/cross-probing.cpp:54
#: pcbnew/class_board_item.cpp:232 #, c-format
msgid "Marker" msgid "%s found"
msgstr "Marqueur" msgstr "%s trouv"
#: pcbnew/class_marker.cpp:137 #: pcbnew/cross-probing.cpp:56
msgid "ErrType" #: pcbnew/cross-probing.cpp:110
msgstr "Type Err" #, c-format
msgid "%s not found"
msgstr "%s non trouv"
#: pcbnew/cross-probing.cpp:113
#, c-format
msgid "%s pin %s not found"
msgstr "%s pin %s non trouve"
#: pcbnew/cross-probing.cpp:118
#, c-format
msgid "%s pin %s found"
msgstr "%s pin %s trouve"
#: pcbnew/cotation.cpp:85 #: pcbnew/cotation.cpp:85
msgid "Dimension properties" msgid "Dimension properties"
...@@ -3462,6 +3456,40 @@ msgstr "Segment en cours d' ...@@ -3462,6 +3456,40 @@ msgstr "Segment en cours d'
msgid "Delete Layer " msgid "Delete Layer "
msgstr "Effacer Couche" msgstr "Effacer Couche"
#: pcbnew/gendrill.cpp:308
msgid "Drill file"
msgstr "Fichier de percage"
#: pcbnew/gendrill.cpp:378
#: pcbnew/dialog_gendrill.cpp:180
msgid "2:3"
msgstr "2:3"
#: pcbnew/gendrill.cpp:379
#: pcbnew/dialog_gendrill.cpp:181
msgid "2:4"
msgstr "2:4"
#: pcbnew/gendrill.cpp:384
msgid "3:2"
msgstr "3:2"
#: pcbnew/gendrill.cpp:385
msgid "3:3"
msgstr "3:3"
#: pcbnew/gendrill.cpp:728
msgid "Drill Map file"
msgstr "Fichier Plan de perage"
#: pcbnew/gendrill.cpp:743
msgid "Unable to create file"
msgstr "Impossible de crer le fichier "
#: pcbnew/gendrill.cpp:774
msgid "Drill Report file"
msgstr "Fichier rapport de perage:"
#: pcbnew/export_gencad.cpp:69 #: pcbnew/export_gencad.cpp:69
msgid "GenCAD file:" msgid "GenCAD file:"
msgstr "Fichier GenCAD:" msgstr "Fichier GenCAD:"
...@@ -3632,70 +3660,6 @@ msgstr "N'affiche pas les couches cuivre" ...@@ -3632,70 +3660,6 @@ msgstr "N'affiche pas les couches cuivre"
msgid "Apply" msgid "Apply"
msgstr "Appliquer" msgstr "Appliquer"
#: pcbnew/specctra_import.cpp:74
msgid "Merge Specctra Session file:"
msgstr "Fichier Specctra Session Fusionner:"
#: pcbnew/specctra_import.cpp:100
msgid "BOARD may be corrupted, do not save it."
msgstr "Le PCB peut tre corrompu. Ne pas le sauver"
#: pcbnew/specctra_import.cpp:102
msgid "Fix problem and try again."
msgstr "Fixer le problme et recommencer."
#: pcbnew/specctra_import.cpp:116
msgid "Session file imported and merged OK."
msgstr "Fichier Session import et fusionn correctement."
#: pcbnew/specctra_import.cpp:182
#: pcbnew/specctra_import.cpp:290
#, c-format
msgid "Session file uses invalid layer id \"%s\""
msgstr "Le Fichier Session utilise une couche invalide n \"%s\""
#: pcbnew/specctra_import.cpp:232
msgid "Session via padstack has no shapes"
msgstr ""
#: pcbnew/specctra_import.cpp:239
#: pcbnew/specctra_import.cpp:257
#: pcbnew/specctra_import.cpp:281
#, c-format
msgid "Unsupported via shape: \"%s\""
msgstr "Forme via inconnue: \"%s\""
#: pcbnew/specctra_import.cpp:338
msgid "Session file is missing the \"session\" section"
msgstr ""
#: pcbnew/specctra_import.cpp:341
msgid "Session file is missing the \"placement\" section"
msgstr ""
#: pcbnew/specctra_import.cpp:344
msgid "Session file is missing the \"routes\" section"
msgstr ""
#: pcbnew/specctra_import.cpp:347
msgid "Session file is missing the \"library_out\" section"
msgstr ""
#: pcbnew/specctra_import.cpp:374
#, c-format
msgid "Session file has 'reference' to non-existent component \"%s\""
msgstr ""
#: pcbnew/specctra_import.cpp:446
#, c-format
msgid "Unsupported wire shape: \"%s\" for net: \"%s\""
msgstr "Forme de connexion inconnue: \"%s\" pour net: \"%s\""
#: pcbnew/specctra_import.cpp:489
#, c-format
msgid "A wire_via references a missing padstack \"%s\""
msgstr ""
#: pcbnew/pcbtexte.cpp:88 #: pcbnew/pcbtexte.cpp:88
msgid "TextPCB properties" msgid "TextPCB properties"
msgstr "Proprits des textes PCB" msgstr "Proprits des textes PCB"
...@@ -4360,6 +4324,11 @@ msgstr "Borgne/Aveugle" ...@@ -4360,6 +4324,11 @@ msgstr "Borgne/Aveugle"
msgid "Micro Via" msgid "Micro Via"
msgstr "Micro Via" msgstr "Micro Via"
#: pcbnew/class_board_item.cpp:232
#: pcbnew/class_marker.cpp:133
msgid "Marker"
msgstr "Marqueur"
#: pcbnew/class_board_item.cpp:237 #: pcbnew/class_board_item.cpp:237
msgid "Dimension" msgid "Dimension"
msgstr "Dimension" msgstr "Dimension"
...@@ -4407,6 +4376,28 @@ msgstr "Erreur DRC: la fermeture de cette zone cr ...@@ -4407,6 +4376,28 @@ msgstr "Erreur DRC: la fermeture de cette zone cr
msgid "No Net" msgid "No Net"
msgstr "No Net" msgstr "No Net"
#: pcbnew/specctra_export.cpp:64
msgid "Specctra DSN file:"
msgstr "Fichier Specctra DSN"
#: pcbnew/specctra_export.cpp:118
msgid "BOARD exported OK."
msgstr "PCB export Ok."
#: pcbnew/specctra_export.cpp:123
msgid "Unable to export, please fix and try again."
msgstr "Impossible d'exporter, fixer le problme et recommencer"
#: pcbnew/specctra_export.cpp:783
#, c-format
msgid "Component with value of \"%s\" has empty reference id."
msgstr "Le composant avec valeur \"%s\" a une rfrence vide."
#: pcbnew/specctra_export.cpp:791
#, c-format
msgid "Multiple components have identical reference IDs of \"%s\"."
msgstr "Multiple composants ont une reference identique \"%s\"."
#: pcbnew/class_board.cpp:447 #: pcbnew/class_board.cpp:447
msgid "Nodes" msgid "Nodes"
msgstr "Nodes" msgstr "Nodes"
...@@ -4480,10 +4471,17 @@ msgstr "Couche Inf." ...@@ -4480,10 +4471,17 @@ msgstr "Couche Inf."
msgid "The Top Layer and Bottom Layer must differ" msgid "The Top Layer and Bottom Layer must differ"
msgstr "Les couches dessus et dessous doivent diffrer" msgstr "Les couches dessus et dessous doivent diffrer"
#: pcbnew/move-drag_pads.cpp:251 #: pcbnew/onleftclick.cpp:176
#, c-format msgid "Graphic not authorized on Copper layers"
msgid "Delete Pad (module %s %s) " msgstr "Graphique non autoris sur Couches Cuivre"
msgstr "Effacer Pad (module %s %s) "
#: pcbnew/onleftclick.cpp:199
msgid "Tracks on Copper layers only "
msgstr "Pistes sur couches cuivre seulement"
#: pcbnew/onleftclick.cpp:281
msgid "Cotation not authorized on Copper layers"
msgstr "Cotation non autorise sur Couches Cuivre"
#: pcbnew/globaleditpad.cpp:76 #: pcbnew/globaleditpad.cpp:76
msgid "Pads Global Edit" msgid "Pads Global Edit"
...@@ -4545,64 +4543,74 @@ msgstr "Pas de pads ou de points de d ...@@ -4545,64 +4543,74 @@ msgstr "Pas de pads ou de points de d
msgid "Ok" msgid "Ok"
msgstr "Ok" msgstr "Ok"
#: pcbnew/class_edge_mod.cpp:287 #: pcbnew/move-drag_pads.cpp:268
msgid "Seg" #, c-format
msgstr "Seg" msgid "Delete Pad (module %s %s) "
msgstr "Effacer Pad (module %s %s) "
#: pcbnew/class_edge_mod.cpp:293 #: pcbnew/specctra_import.cpp:74
msgid "TimeStamp" msgid "Merge Specctra Session file:"
msgstr "TimeStamp" msgstr "Fichier Specctra Session Fusionner:"
#: pcbnew/class_edge_mod.cpp:295 #: pcbnew/specctra_import.cpp:101
msgid "Mod Layer" msgid "BOARD may be corrupted, do not save it."
msgstr "Couche Mod." msgstr "Le PCB peut tre corrompu. Ne pas le sauver"
#: pcbnew/class_edge_mod.cpp:297 #: pcbnew/specctra_import.cpp:103
msgid "Seg Layer" msgid "Fix problem and try again."
msgstr "Couche Seg." msgstr "Fixer le problme et recommencer."
#: pcbnew/cross-probing.cpp:54 #: pcbnew/specctra_import.cpp:117
#, c-format msgid "Session file imported and merged OK."
msgid "%s found" msgstr "Fichier Session import et fusionn correctement."
msgstr "%s trouv"
#: pcbnew/cross-probing.cpp:56 #: pcbnew/specctra_import.cpp:183
#: pcbnew/cross-probing.cpp:109 #: pcbnew/specctra_import.cpp:291
#, c-format #, c-format
msgid "%s not found" msgid "Session file uses invalid layer id \"%s\""
msgstr "%s non trouv" msgstr "Le Fichier Session utilise une couche invalide n \"%s\""
#: pcbnew/cross-probing.cpp:111 #: pcbnew/specctra_import.cpp:233
#, c-format msgid "Session via padstack has no shapes"
msgid "%s pin %s not found" msgstr ""
msgstr "%s pin %s non trouve"
#: pcbnew/cross-probing.cpp:113 #: pcbnew/specctra_import.cpp:240
#: pcbnew/specctra_import.cpp:258
#: pcbnew/specctra_import.cpp:282
#, c-format #, c-format
msgid "%s pin %s found" msgid "Unsupported via shape: \"%s\""
msgstr "%s pin %s trouve" msgstr "Forme via inconnue: \"%s\""
#: pcbnew/specctra_export.cpp:64 #: pcbnew/specctra_import.cpp:339
msgid "Specctra DSN file:" msgid "Session file is missing the \"session\" section"
msgstr "Fichier Specctra DSN" msgstr ""
#: pcbnew/specctra_export.cpp:118 #: pcbnew/specctra_import.cpp:342
msgid "BOARD exported OK." msgid "Session file is missing the \"placement\" section"
msgstr "PCB export Ok." msgstr ""
#: pcbnew/specctra_export.cpp:123 #: pcbnew/specctra_import.cpp:345
msgid "Unable to export, please fix and try again." msgid "Session file is missing the \"routes\" section"
msgstr ""
#: pcbnew/specctra_import.cpp:348
msgid "Session file is missing the \"library_out\" section"
msgstr "" msgstr ""
#: pcbnew/specctra_export.cpp:720 #: pcbnew/specctra_import.cpp:375
#, c-format #, c-format
msgid "Component with value of \"%s\" has empty reference id." msgid "Session file has 'reference' to non-existent component \"%s\""
msgstr "Le composant avec valeur \"%s\" a une rfrence vide." msgstr ""
#: pcbnew/specctra_export.cpp:728 #: pcbnew/specctra_import.cpp:447
#, c-format #, c-format
msgid "Multiple components have identical reference IDs of \"%s\"." msgid "Unsupported wire shape: \"%s\" for net: \"%s\""
msgstr "Multiple composants ont une reference identique \"%s\"." msgstr "Forme de connexion inconnue: \"%s\" pour net: \"%s\""
#: pcbnew/specctra_import.cpp:490
#, c-format
msgid "A wire_via references a missing padstack \"%s\""
msgstr ""
#: pcbnew/class_drawsegment.cpp:161 #: pcbnew/class_drawsegment.cpp:161
msgid "Shape" msgid "Shape"
...@@ -4680,18 +4688,6 @@ msgstr "Isolation" ...@@ -4680,18 +4688,6 @@ msgstr "Isolation"
msgid "Mask clearance" msgid "Mask clearance"
msgstr "Retrait Masque" msgstr "Retrait Masque"
#: pcbnew/onleftclick.cpp:176
msgid "Graphic not authorized on Copper layers"
msgstr "Graphique non autoris sur Couches Cuivre"
#: pcbnew/onleftclick.cpp:199
msgid "Tracks on Copper layers only "
msgstr "Pistes sur couches cuivre seulement"
#: pcbnew/onleftclick.cpp:281
msgid "Cotation not authorized on Copper layers"
msgstr "Cotation non autorise sur Couches Cuivre"
#: pcbnew/dialog_drc.cpp:430 #: pcbnew/dialog_drc.cpp:430
#: eeschema/dialog_erc.cpp:237 #: eeschema/dialog_erc.cpp:237
#: eeschema/dialog_edit_component_in_lib.cpp:166 #: eeschema/dialog_edit_component_in_lib.cpp:166
...@@ -4816,6 +4812,10 @@ msgstr "Fichier rapport termin ...@@ -4816,6 +4812,10 @@ msgstr "Fichier rapport termin
msgid "DRC Report file" msgid "DRC Report file"
msgstr "Fichier rapport de contrle DRC:" msgstr "Fichier rapport de contrle DRC:"
#: pcbnew/class_marker.cpp:137
msgid "ErrType"
msgstr "Type Err"
#: pcbnew/cleaningoptions_dialog.cpp:146 #: pcbnew/cleaningoptions_dialog.cpp:146
msgid "Static" msgid "Static"
msgstr "Static" msgstr "Static"
...@@ -5302,7 +5302,7 @@ msgid "Pin Num Size to others" ...@@ -5302,7 +5302,7 @@ msgid "Pin Num Size to others"
msgstr "Change taille Num pin autres pins" msgstr "Change taille Num pin autres pins"
#: eeschema/libedit_onrightclick.cpp:241 #: eeschema/libedit_onrightclick.cpp:241
#: eeschema/onrightclick.cpp:620 #: eeschema/onrightclick.cpp:628
msgid "Win. Zoom (Midd butt drag mouse)" msgid "Win. Zoom (Midd butt drag mouse)"
msgstr "Win. Zoom (Midd butt drag mouse)" msgstr "Win. Zoom (Midd butt drag mouse)"
...@@ -5315,72 +5315,10 @@ msgid "Mirror Block (ctrl + drag mouse)" ...@@ -5315,72 +5315,10 @@ msgid "Mirror Block (ctrl + drag mouse)"
msgstr "Bloc Miroir (ctrl + drag mouse)" msgstr "Bloc Miroir (ctrl + drag mouse)"
#: eeschema/libedit_onrightclick.cpp:254 #: eeschema/libedit_onrightclick.cpp:254
#: eeschema/onrightclick.cpp:635 #: eeschema/onrightclick.cpp:643
msgid "Del. Block (shift+ctrl + drag mouse)" msgid "Del. Block (shift+ctrl + drag mouse)"
msgstr "Effacement Bloc (shift+ctrl + drag mouse)" msgstr "Effacement Bloc (shift+ctrl + drag mouse)"
#: eeschema/schedit.cpp:284
msgid "Push/Pop Hierarchy"
msgstr "Naviger dans Hirarchie"
#: eeschema/schedit.cpp:288
msgid "Add NoConnect Flag"
msgstr "Ajoutde symboles de non connexion"
#: eeschema/schedit.cpp:292
#: eeschema/hotkeys.cpp:271
msgid "Add Wire"
msgstr "Ajouter Fils"
#: eeschema/schedit.cpp:296
msgid "Add Bus"
msgstr "Addition de Bus"
#: eeschema/schedit.cpp:304
msgid "Add Junction"
msgstr "Ajout jonctions"
#: eeschema/schedit.cpp:308
msgid "Add Label"
msgstr "Ajout Label"
#: eeschema/schedit.cpp:312
msgid "Add Global label"
msgstr "Ajout de labels globaux"
#: eeschema/schedit.cpp:316
msgid "Add Hierarchal label"
msgstr "Ajouter Label Hirarchique"
#: eeschema/schedit.cpp:324
msgid "Add Wire to Bus Entry"
msgstr "Addition d'entres de bus (type fil vers bus)"
#: eeschema/schedit.cpp:328
msgid "Add Bus to Bus entry"
msgstr "Addition d'entres de bus (type bus vers bus)"
#: eeschema/schedit.cpp:332
msgid "Add Sheet"
msgstr "Ajout de Feuille"
#: eeschema/schedit.cpp:336
msgid "Add PinSheet"
msgstr "Ajout Conn. hirar."
#: eeschema/schedit.cpp:340
msgid "Import PinSheet"
msgstr "Importer Connecteur de hirarchie"
#: eeschema/schedit.cpp:344
#: eeschema/hotkeys.cpp:249
msgid "Add Component"
msgstr "Ajout Composant"
#: eeschema/schedit.cpp:348
msgid "Add Power"
msgstr "Add Alims"
#: eeschema/tool_lib.cpp:48 #: eeschema/tool_lib.cpp:48
msgid "deselect current tool" msgid "deselect current tool"
msgstr "Dslection outil courant" msgstr "Dslection outil courant"
...@@ -5741,50 +5679,6 @@ msgstr "Commun a converti" ...@@ -5741,50 +5679,6 @@ msgstr "Commun a converti"
msgid "Vertical" msgid "Vertical"
msgstr "Vertical" msgstr "Vertical"
#: eeschema/annotate_dialog.cpp:122
msgid "Hierarchy"
msgstr "Hirarchie"
#: eeschema/annotate_dialog.cpp:123
msgid "Current sheet"
msgstr "Feuille active"
#: eeschema/annotate_dialog.cpp:124
msgid "annotate:"
msgstr "Numrotation:"
#: eeschema/annotate_dialog.cpp:129
msgid "all components"
msgstr "Tous les composants"
#: eeschema/annotate_dialog.cpp:130
msgid "new components only"
msgstr "Nouveaux composants seulement"
#: eeschema/annotate_dialog.cpp:131
msgid "select items:"
msgstr "Slection:"
#: eeschema/annotate_dialog.cpp:136
msgid "by position"
msgstr "par position"
#: eeschema/annotate_dialog.cpp:137
msgid "by value"
msgstr "par valeur"
#: eeschema/annotate_dialog.cpp:138
msgid "sorting:"
msgstr "Tri:"
#: eeschema/annotate_dialog.cpp:145
msgid "&Annotate"
msgstr "Numrot&ation"
#: eeschema/annotate_dialog.cpp:150
msgid "&Del Annotate"
msgstr "&Dnumrotation"
#: eeschema/load_one_schematic_file.cpp:103 #: eeschema/load_one_schematic_file.cpp:103
msgid "Failed to open " msgid "Failed to open "
msgstr "Erreur ouverture " msgstr "Erreur ouverture "
...@@ -5799,9 +5693,8 @@ msgid " is NOT EESchema file" ...@@ -5799,9 +5693,8 @@ msgid " is NOT EESchema file"
msgstr " n'est PAS un fichier EESchema" msgstr " n'est PAS un fichier EESchema"
#: eeschema/load_one_schematic_file.cpp:471 #: eeschema/load_one_schematic_file.cpp:471
#, fuzzy
msgid "Done Loading " msgid "Done Loading "
msgstr "Chargement " msgstr "Chargement termin"
#: eeschema/getpart.cpp:106 #: eeschema/getpart.cpp:106
#, c-format #, c-format
...@@ -6098,7 +5991,6 @@ msgid " (with SubCmp)" ...@@ -6098,7 +5991,6 @@ msgid " (with SubCmp)"
msgstr "avec sub-composants" msgstr "avec sub-composants"
#: eeschema/dialog_build_BOM.cpp:1207 #: eeschema/dialog_build_BOM.cpp:1207
#: eeschema/component_class.cpp:345
msgid "?" msgid "?"
msgstr "?" msgstr "?"
...@@ -6470,196 +6362,206 @@ msgid "Delete Glabel" ...@@ -6470,196 +6362,206 @@ msgid "Delete Glabel"
msgstr "Supprimer Label Global" msgstr "Supprimer Label Global"
#: eeschema/onrightclick.cpp:380 #: eeschema/onrightclick.cpp:380
#: eeschema/onrightclick.cpp:402 #: eeschema/onrightclick.cpp:431
#: eeschema/onrightclick.cpp:452 #: eeschema/onrightclick.cpp:460
msgid "Change to Label" msgid "Change to Hierarchical Label"
msgstr "Change en Label" msgstr "Chnager en Label Hirarchique"
#: eeschema/onrightclick.cpp:382 #: eeschema/onrightclick.cpp:382
#: eeschema/onrightclick.cpp:404 #: eeschema/onrightclick.cpp:404
#: eeschema/onrightclick.cpp:429 #: eeschema/onrightclick.cpp:458
msgid "Change to Text" msgid "Change to Label"
msgstr "Change en Texte" msgstr "Change en Label"
#: eeschema/onrightclick.cpp:384 #: eeschema/onrightclick.cpp:384
#: eeschema/onrightclick.cpp:406 #: eeschema/onrightclick.cpp:406
#: eeschema/onrightclick.cpp:431 #: eeschema/onrightclick.cpp:433
#: eeschema/onrightclick.cpp:456 msgid "Change to Text"
msgstr "Change en Texte"
#: eeschema/onrightclick.cpp:386
#: eeschema/onrightclick.cpp:410
#: eeschema/onrightclick.cpp:437
#: eeschema/onrightclick.cpp:464
msgid "Change Type" msgid "Change Type"
msgstr "Change Type" msgstr "Change Type"
#: eeschema/onrightclick.cpp:395 #: eeschema/onrightclick.cpp:397
msgid "Move Hlabel" msgid "Move Hlabel"
msgstr "Dplacer Label Hirarchique" msgstr "Dplacer Label Hirarchique"
#: eeschema/onrightclick.cpp:396 #: eeschema/onrightclick.cpp:398
msgid "Rotate HLabel (R)" msgid "Rotate HLabel (R)"
msgstr "Rot. Label Hirarchique (R)" msgstr "Rot. Label Hirarchique (R)"
#: eeschema/onrightclick.cpp:397 #: eeschema/onrightclick.cpp:399
msgid "Edit HLabel" msgid "Edit HLabel"
msgstr "Editer Label Hirarchique" msgstr "Editer Label Hirarchique"
#: eeschema/onrightclick.cpp:398 #: eeschema/onrightclick.cpp:400
msgid "Delete Hlabel" msgid "Delete Hlabel"
msgstr "Supprimer Label Hirarchique" msgstr "Supprimer Label Hirarchique"
#: eeschema/onrightclick.cpp:420 #: eeschema/onrightclick.cpp:408
#: eeschema/onrightclick.cpp:435
msgid "Change to Global label"
msgstr "Change en Label Global"
#: eeschema/onrightclick.cpp:424
msgid "Move Label" msgid "Move Label"
msgstr "Dplace Label" msgstr "Dplace Label"
#: eeschema/onrightclick.cpp:421 #: eeschema/onrightclick.cpp:425
msgid "Rotate Label (R)" msgid "Rotate Label (R)"
msgstr "Rot. Label (R)" msgstr "Rot. Label (R)"
#: eeschema/onrightclick.cpp:422 #: eeschema/onrightclick.cpp:426
msgid "Edit Label" msgid "Edit Label"
msgstr "Editer Label" msgstr "Editer Label"
#: eeschema/onrightclick.cpp:423 #: eeschema/onrightclick.cpp:427
msgid "Delete Label" msgid "Delete Label"
msgstr "Supprimer Label:" msgstr "Supprimer Label:"
#: eeschema/onrightclick.cpp:427 #: eeschema/onrightclick.cpp:451
#: eeschema/onrightclick.cpp:454
msgid "Change to Glabel"
msgstr "Change en Label Global"
#: eeschema/onrightclick.cpp:445
msgid "Move Text" msgid "Move Text"
msgstr "Dplacer Texte" msgstr "Dplacer Texte"
#: eeschema/onrightclick.cpp:446 #: eeschema/onrightclick.cpp:452
msgid "Rotate Text (R)" msgid "Rotate Text (R)"
msgstr "Rot. Texte (R)" msgstr "Rot. Texte (R)"
#: eeschema/onrightclick.cpp:447 #: eeschema/onrightclick.cpp:453
msgid "Edit Text" msgid "Edit Text"
msgstr "Editer Texte" msgstr "Editer Texte"
#: eeschema/onrightclick.cpp:448 #: eeschema/onrightclick.cpp:454
msgid "Delete Text" msgid "Delete Text"
msgstr "Supprimer Texte" msgstr "Supprimer Texte"
#: eeschema/onrightclick.cpp:474 #: eeschema/onrightclick.cpp:462
#: eeschema/onrightclick.cpp:514 msgid "Change to Glabel"
msgstr "Change en Label Global"
#: eeschema/onrightclick.cpp:482
#: eeschema/onrightclick.cpp:522
msgid "Break Wire" msgid "Break Wire"
msgstr "Briser fil" msgstr "Briser fil"
#: eeschema/onrightclick.cpp:477 #: eeschema/onrightclick.cpp:485
msgid "delete junction" msgid "delete junction"
msgstr "Supprimer jonction" msgstr "Supprimer jonction"
#: eeschema/onrightclick.cpp:482 #: eeschema/onrightclick.cpp:490
#: eeschema/onrightclick.cpp:508 #: eeschema/onrightclick.cpp:516
msgid "Delete node" msgid "Delete node"
msgstr "Supprimer Noeud" msgstr "Supprimer Noeud"
#: eeschema/onrightclick.cpp:484 #: eeschema/onrightclick.cpp:492
#: eeschema/onrightclick.cpp:510 #: eeschema/onrightclick.cpp:518
msgid "Delete connection" msgid "Delete connection"
msgstr "Supprimer connexion" msgstr "Supprimer connexion"
#: eeschema/onrightclick.cpp:501 #: eeschema/onrightclick.cpp:509
msgid "End Wire" msgid "End Wire"
msgstr "Fin Fil" msgstr "Fin Fil"
#: eeschema/onrightclick.cpp:503 #: eeschema/onrightclick.cpp:511
msgid "Delete Wire" msgid "Delete Wire"
msgstr "Supprimer Fil" msgstr "Supprimer Fil"
#: eeschema/onrightclick.cpp:518 #: eeschema/onrightclick.cpp:526
#: eeschema/onrightclick.cpp:550 #: eeschema/onrightclick.cpp:558
msgid "Add junction" msgid "Add junction"
msgstr "Addition de jonctions" msgstr "Addition de jonctions"
#: eeschema/onrightclick.cpp:519 #: eeschema/onrightclick.cpp:527
#: eeschema/onrightclick.cpp:551 #: eeschema/onrightclick.cpp:559
msgid "Add label" msgid "Add label"
msgstr "Ajout Label" msgstr "Ajout Label"
#: eeschema/onrightclick.cpp:524 #: eeschema/onrightclick.cpp:532
#: eeschema/onrightclick.cpp:556 #: eeschema/onrightclick.cpp:564
msgid "Add global label" msgid "Add global label"
msgstr "Addition de labels globaux" msgstr "Addition de labels globaux"
#: eeschema/onrightclick.cpp:540 #: eeschema/onrightclick.cpp:548
msgid "End Bus" msgid "End Bus"
msgstr "Fin Bus" msgstr "Fin Bus"
#: eeschema/onrightclick.cpp:543 #: eeschema/onrightclick.cpp:551
msgid "Delete Bus" msgid "Delete Bus"
msgstr "Supprimer Bus" msgstr "Supprimer Bus"
#: eeschema/onrightclick.cpp:547 #: eeschema/onrightclick.cpp:555
msgid "Break Bus" msgid "Break Bus"
msgstr "Briser Bus" msgstr "Briser Bus"
#: eeschema/onrightclick.cpp:569 #: eeschema/onrightclick.cpp:577
msgid "Enter Sheet" msgid "Enter Sheet"
msgstr "Enter dans Feuille" msgstr "Enter dans Feuille"
#: eeschema/onrightclick.cpp:571 #: eeschema/onrightclick.cpp:579
msgid "Move Sheet" msgid "Move Sheet"
msgstr "Dplace Feuille" msgstr "Dplace Feuille"
#: eeschema/onrightclick.cpp:576 #: eeschema/onrightclick.cpp:584
msgid "Place Sheet" msgid "Place Sheet"
msgstr "Place Feuille" msgstr "Place Feuille"
#: eeschema/onrightclick.cpp:580 #: eeschema/onrightclick.cpp:588
msgid "Edit Sheet" msgid "Edit Sheet"
msgstr "Edite Feuille" msgstr "Edite Feuille"
#: eeschema/onrightclick.cpp:581 #: eeschema/onrightclick.cpp:589
msgid "Resize Sheet" msgid "Resize Sheet"
msgstr "Redimensionne feuille" msgstr "Redimensionne feuille"
#: eeschema/onrightclick.cpp:584 #: eeschema/onrightclick.cpp:592
msgid "Cleanup PinSheets" msgid "Cleanup PinSheets"
msgstr "Nettoyage de la feuille" msgstr "Nettoyage de la feuille"
#: eeschema/onrightclick.cpp:585 #: eeschema/onrightclick.cpp:593
msgid "Delete Sheet" msgid "Delete Sheet"
msgstr "Supprimer Feuille" msgstr "Supprimer Feuille"
#: eeschema/onrightclick.cpp:598 #: eeschema/onrightclick.cpp:606
msgid "Move PinSheet" msgid "Move PinSheet"
msgstr "Dplace Connecteur de hirarchie" msgstr "Dplace Connecteur de hirarchie"
#: eeschema/onrightclick.cpp:600 #: eeschema/onrightclick.cpp:608
msgid "Edit PinSheet" msgid "Edit PinSheet"
msgstr "Edit Connecteur de hirarchie" msgstr "Edit Connecteur de hirarchie"
#: eeschema/onrightclick.cpp:603 #: eeschema/onrightclick.cpp:611
msgid "Delete PinSheet" msgid "Delete PinSheet"
msgstr "Supprimer Connecteur de hirarchie" msgstr "Supprimer Connecteur de hirarchie"
#: eeschema/onrightclick.cpp:628 #: eeschema/onrightclick.cpp:636
msgid "Other block commands" msgid "Other block commands"
msgstr "Autres commandes de bloc" msgstr "Autres commandes de bloc"
#: eeschema/onrightclick.cpp:629 #: eeschema/onrightclick.cpp:637
msgid "Save Block" msgid "Save Block"
msgstr "Sauver Bloc" msgstr "Sauver Bloc"
#: eeschema/onrightclick.cpp:633 #: eeschema/onrightclick.cpp:641
msgid "Drag Block (ctrl + drag mouse)" msgid "Drag Block (ctrl + drag mouse)"
msgstr "Drag Bloc (ctrl + drag mouse)" msgstr "Drag Bloc (ctrl + drag mouse)"
#: eeschema/onrightclick.cpp:637 #: eeschema/onrightclick.cpp:645
msgid "Mirror Block ||" msgid "Mirror Block ||"
msgstr "Miroir Bloc ||" msgstr "Miroir Bloc ||"
#: eeschema/onrightclick.cpp:641 #: eeschema/onrightclick.cpp:649
msgid "Copy to Clipboard" msgid "Copy to Clipboard"
msgstr "Copie dans Presse papier" msgstr "Copie dans Presse papier"
#: eeschema/class_drawsheet.cpp:164 #: eeschema/class_drawsheet.cpp:174
msgid "Ok to cleanup this sheet" msgid "Ok to cleanup this sheet"
msgstr "Ok pour nettoyer cette feuille" msgstr "Ok pour nettoyer cette feuille"
#: eeschema/class_drawsheet.cpp:572 #: eeschema/class_drawsheet.cpp:655
#, c-format #, c-format
msgid "%8.8lX/" msgid "%8.8lX/"
msgstr "%8.8lX/" msgstr "%8.8lX/"
...@@ -6757,47 +6659,6 @@ msgstr "Forme Label:" ...@@ -6757,47 +6659,6 @@ msgstr "Forme Label:"
msgid "Size " msgid "Size "
msgstr "Taille " msgstr "Taille "
#: eeschema/annotate.cpp:188
msgid "Previous Annotation will be deleted. Continue ?"
msgstr "La numrotation existante va tre dtruite, continuer?"
#: eeschema/annotate.cpp:679
#, c-format
msgid "item not annotated: %s%s"
msgstr "item non numrot: %s%s"
#: eeschema/annotate.cpp:683
#, c-format
msgid "( unit %d)"
msgstr "( Unit %d)"
#: eeschema/annotate.cpp:699
#, c-format
msgid "Error item %s%s"
msgstr "Erreur item %s%s"
#: eeschema/annotate.cpp:701
#, c-format
msgid " unit %d and no more than %d parts"
msgstr " unit %d et plus que %d parts"
#: eeschema/annotate.cpp:734
#: eeschema/annotate.cpp:757
#, c-format
msgid "Multiple item %s%s"
msgstr "Multiplelment %s%s"
#: eeschema/annotate.cpp:739
#: eeschema/annotate.cpp:761
#, c-format
msgid " (unit %d)"
msgstr " ( Unit %d)"
#: eeschema/annotate.cpp:777
#, c-format
msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)"
msgstr "Valeurs diffrentes pour %s%d%c (%s) et %s%d%c (%s)"
#: eeschema/plotps.cpp:179 #: eeschema/plotps.cpp:179
msgid "Plot Options:" msgid "Plot Options:"
msgstr "Options de trac:" msgstr "Options de trac:"
...@@ -6895,27 +6756,6 @@ msgstr "Examen Fichiers de Doc" ...@@ -6895,27 +6756,6 @@ msgstr "Examen Fichiers de Doc"
msgid "Alias" msgid "Alias"
msgstr "Alias" msgstr "Alias"
#: eeschema/schframe.cpp:237
msgid "Schematic modified, Save before exit ?"
msgstr "Schematique modifie, Sauver avant de quitter ?"
#: eeschema/schframe.cpp:338
msgid "No show Hidden Pins"
msgstr "N'affichage pas les pins invisibles"
#: eeschema/schframe.cpp:338
#: eeschema/tool_sch.cpp:274
msgid "Show Hidden Pins"
msgstr "Force affichage des pins invisibles"
#: eeschema/schframe.cpp:341
msgid "Draw lines at any direction"
msgstr "Tracer traits de direction quelconque"
#: eeschema/schframe.cpp:342
msgid "Draw lines H, V or 45 deg only"
msgstr "Tracer traits H, V ou 45 deg seulement"
#: eeschema/menubar.cpp:41 #: eeschema/menubar.cpp:41
#: gerbview/tool_gerber.cpp:63 #: gerbview/tool_gerber.cpp:63
msgid "&New" msgid "&New"
...@@ -7074,26 +6914,22 @@ msgid "Place the bus" ...@@ -7074,26 +6914,22 @@ msgid "Place the bus"
msgstr "Placer le Bus" msgstr "Placer le Bus"
#: eeschema/menubar.cpp:234 #: eeschema/menubar.cpp:234
#, fuzzy
msgid "W&ire to bus entry" msgid "W&ire to bus entry"
msgstr "Addition d'entres de bus (type fil vers bus)" msgstr "Entres de bus (type fil vers bus)"
#: eeschema/menubar.cpp:235 #: eeschema/menubar.cpp:235
#: eeschema/tool_sch.cpp:180 #: eeschema/tool_sch.cpp:180
#, fuzzy
msgid "Place the wire to bus entry" msgid "Place the wire to bus entry"
msgstr "Addition d'entres de bus (type fil vers bus)" msgstr "Placer des entres de bus (type fil vers bus)"
#: eeschema/menubar.cpp:244 #: eeschema/menubar.cpp:244
#, fuzzy
msgid "B&us to bus entry" msgid "B&us to bus entry"
msgstr "Addition d'entres de bus (type bus vers bus)" msgstr "Entres de bus (type bus vers bus)"
#: eeschema/menubar.cpp:245 #: eeschema/menubar.cpp:245
#: eeschema/tool_sch.cpp:184 #: eeschema/tool_sch.cpp:184
#, fuzzy
msgid "Place the bus to bus entry" msgid "Place the bus to bus entry"
msgstr "Addition d'entres de bus (type bus vers bus)" msgstr "Placer des entres de bus (type bus vers bus)"
#: eeschema/menubar.cpp:254 #: eeschema/menubar.cpp:254
msgid "No connect flag" msgid "No connect flag"
...@@ -7151,12 +6987,12 @@ msgstr "Placer la Feuille Hi ...@@ -7151,12 +6987,12 @@ msgstr "Placer la Feuille Hi
#: eeschema/menubar.cpp:314 #: eeschema/menubar.cpp:314
msgid "Imported hierarchical label" msgid "Imported hierarchical label"
msgstr "" msgstr "Importer label hirarchique"
#: eeschema/menubar.cpp:315 #: eeschema/menubar.cpp:315
#: eeschema/tool_sch.cpp:216 #: eeschema/tool_sch.cpp:216
msgid "Place the pin sheet (imported hierarchical label from sheet)" msgid "Place the pin sheet (imported hierarchical label from sheet)"
msgstr "" msgstr "Placer la pin hirarchique ( Importer un label hirarchique vers la feuille)"
#: eeschema/menubar.cpp:324 #: eeschema/menubar.cpp:324
#, fuzzy #, fuzzy
...@@ -7164,18 +7000,16 @@ msgid "Hierarchical pin to sheet" ...@@ -7164,18 +7000,16 @@ msgid "Hierarchical pin to sheet"
msgstr "Addition de pins de hierarchie dans les symboles de hierarchie" msgstr "Addition de pins de hierarchie dans les symboles de hierarchie"
#: eeschema/menubar.cpp:325 #: eeschema/menubar.cpp:325
#, fuzzy
msgid "Place the hierarchical pin to sheet" msgid "Place the hierarchical pin to sheet"
msgstr "Addition de pins de hierarchie dans les symboles de hierarchie" msgstr "Addition de pins de hierarchie dans les feuilles symboles de hierarchie"
#: eeschema/menubar.cpp:336 #: eeschema/menubar.cpp:336
msgid "Graphic line or poligon" msgid "Graphic line or poligon"
msgstr "Ligne ou polygone graphique" msgstr "Ligne ou polygone graphique"
#: eeschema/menubar.cpp:337 #: eeschema/menubar.cpp:337
#, fuzzy
msgid "Place the graphic line or poligon" msgid "Place the graphic line or poligon"
msgstr "Addition de lignes ou polygones graphiques" msgstr "Placer des lignes ou polygones graphiques"
#: eeschema/menubar.cpp:346 #: eeschema/menubar.cpp:346
msgid "Graphic text (comment)" msgid "Graphic text (comment)"
...@@ -7221,7 +7055,7 @@ msgid "Name" ...@@ -7221,7 +7055,7 @@ msgid "Name"
msgstr "Nom" msgstr "Nom"
#: eeschema/dialog_create_component.cpp:168 #: eeschema/dialog_create_component.cpp:168
#: eeschema/component_class.cpp:213 #: eeschema/component_class.cpp:229
msgid "U" msgid "U"
msgstr "U" msgstr "U"
...@@ -7413,6 +7247,16 @@ msgstr "Ancre" ...@@ -7413,6 +7247,16 @@ msgstr "Ancre"
msgid "Export" msgid "Export"
msgstr "Exporter" msgstr "Exporter"
#: eeschema/hotkeys.cpp:249
#: eeschema/schedit.cpp:347
msgid "Add Component"
msgstr "Ajout Composant"
#: eeschema/hotkeys.cpp:271
#: eeschema/schedit.cpp:295
msgid "Add Wire"
msgstr "Ajouter Fils"
#: eeschema/netlist_control.cpp:231 #: eeschema/netlist_control.cpp:231
#: eeschema/netlist_control.cpp:348 #: eeschema/netlist_control.cpp:348
#: gerbview/options.cpp:201 #: gerbview/options.cpp:201
...@@ -8233,6 +8077,8 @@ msgid "" ...@@ -8233,6 +8077,8 @@ msgid ""
"Place the global label.\n" "Place the global label.\n"
"Warning: all global labels with the same name are connected in whole hierarchy" "Warning: all global labels with the same name are connected in whole hierarchy"
msgstr "" msgstr ""
"Placer le label global.\n"
"Attention: tous les labels globaux de mme nom sont connect dans toute la hirarchie"
#: eeschema/tool_sch.cpp:221 #: eeschema/tool_sch.cpp:221
#, fuzzy #, fuzzy
...@@ -8243,6 +8089,11 @@ msgstr "Addition de pins de hierarchie dans les symboles de hierarchie" ...@@ -8243,6 +8089,11 @@ msgstr "Addition de pins de hierarchie dans les symboles de hierarchie"
msgid "Place the graphic line or polygon" msgid "Place the graphic line or polygon"
msgstr "Placer la ligne ou le polygones graphique" msgstr "Placer la ligne ou le polygones graphique"
#: eeschema/tool_sch.cpp:274
#: eeschema/schframe.cpp:379
msgid "Show Hidden Pins"
msgstr "Force affichage des pins invisibles"
#: eeschema/tool_sch.cpp:279 #: eeschema/tool_sch.cpp:279
msgid "HV orientation for Wires and Bus" msgid "HV orientation for Wires and Bus"
msgstr "Force direction H, V et X pour les fils et bus" msgstr "Force direction H, V et X pour les fils et bus"
...@@ -8366,10 +8217,186 @@ msgstr "Valeur NECESSAIRE: changement refus ...@@ -8366,10 +8217,186 @@ msgstr "Valeur NECESSAIRE: changement refus
msgid "Sheet" msgid "Sheet"
msgstr "Feuille" msgstr "Feuille"
#: eeschema/component_class.cpp:97 #: eeschema/annotate_dialog.cpp:153
msgid "Scope"
msgstr "Slection"
#: eeschema/annotate_dialog.cpp:159
msgid "Annotate the entire schematic"
msgstr "Annoter la schmatique complte"
#: eeschema/annotate_dialog.cpp:163
msgid "Annotate the current page only"
msgstr "Annoter la feuille active uniquement"
#: eeschema/annotate_dialog.cpp:166
msgid "Reset existing annotation"
msgstr "Supprimer l'annotation existante"
#: eeschema/annotate_dialog.cpp:177
msgid "Order"
msgstr "Ordre"
#: eeschema/annotate_dialog.cpp:183
msgid "Sort components by position"
msgstr "Trier les composants par position"
#: eeschema/annotate_dialog.cpp:189
msgid "Sort components by value"
msgstr "Trier ls Composants par valeur"
#: eeschema/annotate_dialog.cpp:253
msgid "Clear the existing annotation for "
msgstr "Supprimer l'annotation existante pour "
#: eeschema/annotate_dialog.cpp:255
msgid "the entire schematic?"
msgstr "la schmatique entire?"
#: eeschema/annotate_dialog.cpp:257
msgid "the current sheet?"
msgstr "La feuille courante?"
#: eeschema/annotate_dialog.cpp:259
msgid ""
"\n"
"\n"
"This operation will clear the existing annotation and cannot be undone."
msgstr ""
"\n"
"\n"
"Cette opration supprimera l'annotation existante et ne peut tre annule."
#: eeschema/annotate_dialog.cpp:276
msgid "Clear and annotate all of the components "
msgstr "Reinitialisation et rannotation de tous les composants "
#: eeschema/annotate_dialog.cpp:278
msgid "Annotate only the unannotated components "
msgstr "Annoter seulement les composants non dj annots "
#: eeschema/annotate_dialog.cpp:280
msgid "on the entire schematic?"
msgstr "pour la schematique complte?"
#: eeschema/annotate_dialog.cpp:282
msgid "on the current sheet?"
msgstr "pourr la feuille courante?"
#: eeschema/annotate_dialog.cpp:284
msgid ""
"\n"
"\n"
"This operation will change the current annotation and cannot be undone."
msgstr ""
"\n"
"\n"
"Cette opration changera l'annotation actuelle et ne pourra tre annule."
#: eeschema/schedit.cpp:287
msgid "Push/Pop Hierarchy"
msgstr "Naviger dans Hirarchie"
#: eeschema/schedit.cpp:291
msgid "Add NoConnect Flag"
msgstr "Ajoutde symboles de non connexion"
#: eeschema/schedit.cpp:299
msgid "Add Bus"
msgstr "Addition de Bus"
#: eeschema/schedit.cpp:307
msgid "Add Junction"
msgstr "Ajout jonctions"
#: eeschema/schedit.cpp:311
msgid "Add Label"
msgstr "Ajout Label"
#: eeschema/schedit.cpp:315
msgid "Add Global label"
msgstr "Ajout de labels globaux"
#: eeschema/schedit.cpp:319
msgid "Add Hierarchal label"
msgstr "Ajouter Label Hirarchique"
#: eeschema/schedit.cpp:327
msgid "Add Wire to Bus Entry"
msgstr "Addition d'entres de bus (type fil vers bus)"
#: eeschema/schedit.cpp:331
msgid "Add Bus to Bus entry"
msgstr "Addition d'entres de bus (type bus vers bus)"
#: eeschema/schedit.cpp:335
msgid "Add Sheet"
msgstr "Ajout de Feuille"
#: eeschema/schedit.cpp:339
msgid "Add PinSheet"
msgstr "Ajout Conn. hirar."
#: eeschema/schedit.cpp:343
msgid "Import PinSheet"
msgstr "Importer Connecteur de hirarchie"
#: eeschema/schedit.cpp:351
msgid "Add Power"
msgstr "Add Alims"
#: eeschema/annotate.cpp:658
#, c-format
msgid "item not annotated: %s%s"
msgstr "item non numrot: %s%s"
#: eeschema/annotate.cpp:663
#, c-format
msgid "( unit %d)"
msgstr "( Unit %d)"
#: eeschema/annotate.cpp:680
#, c-format
msgid "Error item %s%s"
msgstr "Erreur item %s%s"
#: eeschema/annotate.cpp:683
#, c-format
msgid " unit %d and no more than %d parts"
msgstr " unit %d et plus que %d parts"
#: eeschema/annotate.cpp:717
#: eeschema/annotate.cpp:740
#, c-format #, c-format
msgid "%8.8lX" msgid "Multiple item %s%s"
msgstr "%8.8lX" msgstr "Multiplelment %s%s"
#: eeschema/annotate.cpp:722
#: eeschema/annotate.cpp:745
#, c-format
msgid " (unit %d)"
msgstr " ( Unit %d)"
#: eeschema/annotate.cpp:762
#, c-format
msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)"
msgstr "Valeurs diffrentes pour %s%d%c (%s) et %s%d%c (%s)"
#: eeschema/schframe.cpp:268
msgid "Schematic modified, Save before exit ?"
msgstr "Schematique modifie, Sauver avant de quitter ?"
#: eeschema/schframe.cpp:379
msgid "No show Hidden Pins"
msgstr "N'affichage pas les pins invisibles"
#: eeschema/schframe.cpp:383
msgid "Draw lines at any direction"
msgstr "Tracer traits de direction quelconque"
#: eeschema/schframe.cpp:384
msgid "Draw lines H, V or 45 deg only"
msgstr "Tracer traits H, V ou 45 deg seulement"
#: cvpcb/dialog_display_options.cpp:147 #: cvpcb/dialog_display_options.cpp:147
#: cvpcb/dialog_display_options.cpp:155 #: cvpcb/dialog_display_options.cpp:155
...@@ -8725,7 +8752,7 @@ msgid "You must choose a PDF viewer before use this option" ...@@ -8725,7 +8752,7 @@ msgid "You must choose a PDF viewer before use this option"
msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option" msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option"
#: kicad/preferences.cpp:97 #: kicad/preferences.cpp:97
#: common/gestfich.cpp:627 #: common/gestfich.cpp:639
msgid "Prefered Editor:" msgid "Prefered Editor:"
msgstr "Editeur prfr:" msgstr "Editeur prfr:"
...@@ -9185,16 +9212,6 @@ msgstr "????" ...@@ -9185,16 +9212,6 @@ msgstr "????"
msgid "No layer selected" msgid "No layer selected"
msgstr "Pas de couche slectionne" msgstr "Pas de couche slectionne"
#: gerbview/readgerb.cpp:251
#, c-format
msgid "%d errors while reading Gerber file [%s]"
msgstr "%d erreurs pendant lecture fichier gerber [%s]"
#: gerbview/readgerb.cpp:271
#: gerbview/files.cpp:183
msgid "D codes files:"
msgstr "Fichiers D-Codes:"
#: gerbview/block.cpp:267 #: gerbview/block.cpp:267
msgid "Ok to delete block ?" msgid "Ok to delete block ?"
msgstr "Ok pour effacer le bloc" msgstr "Ok pour effacer le bloc"
...@@ -9286,19 +9303,29 @@ msgstr "Affiche toutes les couches Gerber" ...@@ -9286,19 +9303,29 @@ msgstr "Affiche toutes les couches Gerber"
msgid "Switch off all of the Gerber layers" msgid "Switch off all of the Gerber layers"
msgstr "N'affiche pas les couches Gerber" msgstr "N'affiche pas les couches Gerber"
#: gerbview/gerbview.cpp:37
msgid "GerbView is already running. Continue?"
msgstr "Gerbview est est cours d'excution. Continuer ?"
#: gerbview/files.cpp:83 #: gerbview/files.cpp:83
msgid "Not yet available..." msgid "Not yet available..."
msgstr "non encore disponible" msgstr "non encore disponible"
#: gerbview/files.cpp:131 #: gerbview/files.cpp:131
#: gerbview/files.cpp:216 #: gerbview/files.cpp:217
msgid "Gerber files:" msgid "Gerber files:"
msgstr "Fichiers Gerber:" msgstr "Fichiers Gerber:"
#: gerbview/files.cpp:184
#: gerbview/readgerb.cpp:273
msgid "D codes files:"
msgstr "Fichiers D-Codes:"
#: gerbview/gerbview.cpp:37
msgid "GerbView is already running. Continue?"
msgstr "Gerbview est est cours d'excution. Continuer ?"
#: gerbview/readgerb.cpp:253
#, c-format
msgid "%d errors while reading Gerber file [%s]"
msgstr "%d erreurs pendant lecture fichier gerber [%s]"
#: gerbview/tool_gerber.cpp:37 #: gerbview/tool_gerber.cpp:37
msgid "Clear and Load Gerber file" msgid "Clear and Load Gerber file"
msgstr "Effacer et charger fichier Gerber" msgstr "Effacer et charger fichier Gerber"
...@@ -9852,6 +9879,10 @@ msgstr "Inversion Bloc" ...@@ -9852,6 +9879,10 @@ msgstr "Inversion Bloc"
msgid "Block Mirror" msgid "Block Mirror"
msgstr "Bloc Miroir" msgstr "Bloc Miroir"
#: common/gestfich.cpp:633
msgid "No default editor found, you must choose it"
msgstr "Pas d'diteur par dfaut trouv, vous devez en choisir un"
#: common/infospgm.cpp:34 #: common/infospgm.cpp:34
msgid "Build Version:" msgid "Build Version:"
msgstr "Build Version:" msgstr "Build Version:"
...@@ -9894,10 +9925,6 @@ msgstr "" ...@@ -9894,10 +9925,6 @@ msgstr ""
"\n" "\n"
"International wiki:\n" "International wiki:\n"
#: common/gestfich.cpp:621
msgid "No default editor found, you must choose it"
msgstr "Pas d'diteur par dfaut trouv, vous devez en choisir un"
#: common/basicframe.cpp:219 #: common/basicframe.cpp:219
#, c-format #, c-format
msgid "Help file %s not found" msgid "Help file %s not found"
...@@ -10415,6 +10442,16 @@ msgstr "Via Aveugle/Enterr ...@@ -10415,6 +10442,16 @@ msgstr "Via Aveugle/Enterr
msgid "General Options" msgid "General Options"
msgstr "Options gnrales" msgstr "Options gnrales"
#: pcbnew/drc_stuff.h:147
#, c-format
msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
msgstr "Type Err(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
#: pcbnew/drc_stuff.h:155
#, c-format
msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
msgstr "ErrType(%d): <b>%s</b><ul><li> %s: %s </li></ul>"
#: pcbnew/set_color.h:38 #: pcbnew/set_color.h:38
msgid "Pcbnew Layer Colors:" msgid "Pcbnew Layer Colors:"
msgstr "Pcbnew: Couleur desCouches" msgstr "Pcbnew: Couleur desCouches"
...@@ -10483,11 +10520,6 @@ msgstr "Options de remplissage de Zone" ...@@ -10483,11 +10520,6 @@ msgstr "Options de remplissage de Zone"
msgid "WinEDA_DrillFrame" msgid "WinEDA_DrillFrame"
msgstr "WinEDA_DrillFrame" msgstr "WinEDA_DrillFrame"
#: pcbnew/drc_stuff.h:142
#, c-format
msgid "ErrType(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
msgstr "Type Err(%d): <b>%s</b><ul><li> %s: %s </li><li> %s: %s </li></ul>"
#: eeschema/symbtext.h:42 #: eeschema/symbtext.h:42
msgid "Graphic text properties" msgid "Graphic text properties"
msgstr "Proprits du texte" msgstr "Proprits du texte"
...@@ -10549,9 +10581,8 @@ msgid "SheetName" ...@@ -10549,9 +10581,8 @@ msgid "SheetName"
msgstr "Nom feuille" msgstr "Nom feuille"
#: eeschema/eelayer.h:189 #: eeschema/eelayer.h:189
#, fuzzy
msgid "SheetLabel (Pin Sheet)" msgid "SheetLabel (Pin Sheet)"
msgstr "Supprimer Connecteur de hirarchie" msgstr "Label de feuille ( Pin de Feuille)"
#: eeschema/eelayer.h:195 #: eeschema/eelayer.h:195
msgid "Hierarchical Label" msgid "Hierarchical Label"
...@@ -10613,10 +10644,6 @@ msgstr "Propri ...@@ -10613,10 +10644,6 @@ msgstr "Propri
msgid "EESchema Locate" msgid "EESchema Locate"
msgstr "Recherche" msgstr "Recherche"
#: eeschema/annotate_dialog.h:53
msgid "EESchema Annotation"
msgstr "Numrotation des composants"
#: eeschema/dialog_erc.h:57 #: eeschema/dialog_erc.h:57
msgid "EESchema Erc" msgid "EESchema Erc"
msgstr "EESchema Erc" msgstr "EESchema Erc"
...@@ -10625,6 +10652,10 @@ msgstr "EESchema Erc" ...@@ -10625,6 +10652,10 @@ msgstr "EESchema Erc"
msgid "Sheet properties" msgid "Sheet properties"
msgstr "Proprits de la feuille" msgstr "Proprits de la feuille"
#: eeschema/annotate_dialog.h:45
msgid "Annotate"
msgstr "Annotation"
#: cvpcb/dialog_cvpcb_config.h:50 #: cvpcb/dialog_cvpcb_config.h:50
msgid "Cvpcb Configuration" msgid "Cvpcb Configuration"
msgstr "Configuration de Cvpcb" msgstr "Configuration de Cvpcb"
......
internat/sv/kicad.po 0 → 100644
View file @ 2a1b776b
This source diff could not be displayed because it is too large. You can view the blob instead.
pcbnew/gendrill.cpp
View file @ 2a1b776b
...@@ -63,9 +63,9 @@ static std::vector<HOLE_INFO> s_HoleListBuffer; ...@@ -63,9 +63,9 @@ static std::vector<HOLE_INFO> s_HoleListBuffer;
#include "dialog_gendrill.cpp" // Dialog box for drill file generation #include "dialog_gendrill.cpp" // Dialog box for drill file generation
/**********************************************/ /************************************************/
void WinEDA_DrillFrame::InitDisplayParams( void ) void WinEDA_DrillFrame::InitDisplayParams( void )
/**********************************************/ /************************************************/
/* some param values initialisation before display dialog window /* some param values initialisation before display dialog window
*/ */
...@@ -121,8 +121,6 @@ void WinEDA_DrillFrame::InitDisplayParams( void ) ...@@ -121,8 +121,6 @@ void WinEDA_DrillFrame::InitDisplayParams( void )
m_MicroViasDrillSizer->Enable( m_MicroViasCount ); m_MicroViasDrillSizer->Enable( m_MicroViasCount );
m_MicroViaDrillValue->Enable( m_MicroViasCount ); m_MicroViaDrillValue->Enable( m_MicroViasCount );
/* Display statistics */
// Pads holes cound: // Pads holes cound:
m_PadsHoleCount = 0; m_PadsHoleCount = 0;
for( MODULE* module = m_Parent->m_Pcb->m_Modules; module != NULL; module = module->Next() ) for( MODULE* module = m_Parent->m_Pcb->m_Modules; module != NULL; module = module->Next() )
...@@ -133,12 +131,12 @@ void WinEDA_DrillFrame::InitDisplayParams( void ) ...@@ -133,12 +131,12 @@ void WinEDA_DrillFrame::InitDisplayParams( void )
{ {
if( pad->m_Drill.x != 0 ) if( pad->m_Drill.x != 0 )
m_PadsHoleCount++; m_PadsHoleCount++;
}
else else
if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 ) if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 )
m_PadsHoleCount++; m_PadsHoleCount++;
} }
} }
}
msg = m_PadsCountInfoMsg->GetLabel(); msg = m_PadsCountInfoMsg->GetLabel();
msg << wxT( " " ) << m_PadsHoleCount; msg << wxT( " " ) << m_PadsHoleCount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment