haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcbnew: solved a bug which crashes pcbnew when creating a new module with no reference.

This commit is contained in:
charras 2008-11-10 20:45:24 +00:00
parent 5234049705
commit ae3c3b6c99
4 changed files with 2988 additions and 2382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
internat/fr/kicad.mo
View File

Binary file not shown.

5332
internat/fr/kicad.po
View File

File diff suppressed because it is too large Load Diff

25
pcbnew/librairi.cpp
View File

@ -706,10 +706,10 @@ int WinEDA_BasePcbFrame::Save_1_Module( const wxString& LibName,
MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_name )
/************************************************************************************/
/* Creation d'un module : On place d'office les 2ers textes :
* 1er = type REF: nom du module
* 2eme = type VALEUR: "VAL**"
* Le module est insere en debut de liste des modules
/* Create a new module or footprint : A new module is tartted with 2 texts :
* First = REFERENCE
* Second = VALUE: "VAL**"
* the new module is added on begining of the linked list of modules
*/
{
@ -717,7 +717,7 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_n
wxString Line;
wxPoint newpos;
/* Demande du nom du nouveau module */
/* Ask fo the new module reference */
if( module_name.IsEmpty() )
{
if( Get_Message( _( "Module Reference:" ), _("Create module"), Line, this ) != 0 )
@ -728,6 +728,7 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_n
Line.Trim( TRUE );
Line.Trim( FALSE );
// Creates the new module and add it to te bigenning of the linked list of modules
Module = new MODULE( m_Pcb );
Module->Pnext = m_Pcb->m_Modules;
@ -738,28 +739,26 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_n
}
m_Pcb->m_Modules = Module;
/* Creation du module : On place d'office les 2 textes ref et val :
* 1er = type REF: nom du module
* 2eme = type VALEUR: "VAL**" */
/* Mise a jour des caract du nouveau module */
/* Update parameters: position, timestamp ... */
newpos = GetScreen()->m_Curseur;
Module->SetPosition( newpos );
Module->m_LastEdit_Time = time( NULL );
/* Mise a jour du nom de Librairie (reference libr) */
/* Update its name in lib */
Module->m_LibRef = Line;
/* Mise a jour de la reference: */
/* Update reference: */
Module->m_Reference->m_Text = Line;
Module->m_Reference->SetWidth( ModuleTextWidth );
Module->m_Reference->m_Size = ModuleTextSize;
/* mise a jour de la valeurs */
/* Set the value field to a default value */
Module->m_Value->m_Text = wxT( "VAL**" );
Module->m_Value->SetWidth( ModuleTextWidth );
Module->m_Value->m_Size = ModuleTextSize;
Module->SetPosition( wxPoint(0, 0) );
Module->Display_Infos( this );
return Module;
}

13
pcbnew/modedit.cpp
View File

@ -215,12 +215,13 @@ void WinEDA_ModuleEditFrame::Process_Special_Functions( wxCommandEvent& event )
GetScreen()->m_Curseur = wxPoint( 0, 0 );
MODULE* module = Create_1_Module( &dc, wxEmptyString );
wxASSERT( module );
module->SetPosition( wxPoint(0, 0) );
if( m_Pcb->m_Modules )
m_Pcb->m_Modules->m_Flags = 0;
Zoom_Automatique( TRUE );
if ( module ) // i.e. if create module command not aborted
{
module->SetPosition( wxPoint(0, 0) );
if( m_Pcb->m_Modules )
m_Pcb->m_Modules->m_Flags = 0;
Zoom_Automatique( TRUE );
}
}
break;