Commit c04619bb authored by dickelbeck's avatar dickelbeck

bug fixes

parent c79c0d9c
...@@ -8,9 +8,16 @@ email address. ...@@ -8,9 +8,16 @@ email address.
2008-Feb-18 UPDATE Dick Hollenbeck <dick@softplc.com> 2008-Feb-18 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================ ================================================================================
+pcbnew +pcbnew
Start to use BOARD::GetLayerName() in anticipation of configurable layer * Start to use BOARD::GetLayerName() in anticipation of configurable layer
names per board. Comment out a printf() which will lock up pcbnew when names per board.
* Comment out a printf() which will lock up pcbnew when
it is run under kicad project manager and the interprocess fifo gets filled. it is run under kicad project manager and the interprocess fifo gets filled.
* Cross probe was not showing the not found message properly. wxString was
being used for two purposes, input and Printf() destination.
+gerbview
Now loads all gerber files given on the command line, not just one. The
first file is loaded into layer 1 (index 0), the second one is loaded
into layer 2 (index 1) etc.
2008-Feb-18 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> 2008-Feb-18 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
......
...@@ -107,7 +107,6 @@ void WinEDA_SchematicFrame::SendMessageToPCBNEW( EDA_BaseStruct* objectT ...@@ -107,7 +107,6 @@ void WinEDA_SchematicFrame::SendMessageToPCBNEW( EDA_BaseStruct* objectT
case DRAW_PART_TEXT_STRUCT_TYPE: case DRAW_PART_TEXT_STRUCT_TYPE:
case COMPONENT_FIELD_DRAW_TYPE: case COMPONENT_FIELD_DRAW_TYPE:
{ {
// PartTextStruct* Field = (PartTextStruct*) objectToSync;
if( LibItem == NULL ) if( LibItem == NULL )
break; break;
sprintf( Line, "$PART: %s", CONV_TO_UTF8( LibItem->m_Field[REFERENCE].m_Text ) ); sprintf( Line, "$PART: %s", CONV_TO_UTF8( LibItem->m_Field[REFERENCE].m_Text ) );
...@@ -124,6 +123,7 @@ void WinEDA_SchematicFrame::SendMessageToPCBNEW( EDA_BaseStruct* objectT ...@@ -124,6 +123,7 @@ void WinEDA_SchematicFrame::SendMessageToPCBNEW( EDA_BaseStruct* objectT
case COMPONENT_PIN_DRAW_TYPE: case COMPONENT_PIN_DRAW_TYPE:
if( LibItem == NULL ) if( LibItem == NULL )
break; break;
Pin = (LibDrawPin*) objectToSync; Pin = (LibDrawPin*) objectToSync;
if( Pin->m_PinNum ) if( Pin->m_PinNum )
{ {
......
...@@ -242,11 +242,11 @@ EDA_BaseStruct* WinEDA_SchematicFrame::FindComponentAndItem( ...@@ -242,11 +242,11 @@ EDA_BaseStruct* WinEDA_SchematicFrame::FindComponentAndItem(
{ {
if( !msg_item.IsEmpty() ) if( !msg_item.IsEmpty() )
msg += wxT( " " ) + msg_item; msg += wxT( " " ) + msg_item;
msg += _( " Found" ); msg += _( " found" );
} }
else else
{ {
msg += _( " Found" ); msg += _( " found" );
if( !msg_item.IsEmpty() ) if( !msg_item.IsEmpty() )
{ {
msg += wxT( " but " ) + msg_item + _( " not found" ); msg += wxT( " but " ) + msg_item + _( " not found" );
......
...@@ -30,6 +30,7 @@ void RemoteCommand( const char* cmdline ) ...@@ -30,6 +30,7 @@ void RemoteCommand( const char* cmdline )
{ {
char line[1024]; char line[1024];
wxString msg; wxString msg;
wxString modName;
char* idcmd; char* idcmd;
char* text; char* text;
MODULE* module = 0; MODULE* module = 0;
...@@ -39,17 +40,20 @@ void RemoteCommand( const char* cmdline ) ...@@ -39,17 +40,20 @@ void RemoteCommand( const char* cmdline )
idcmd = strtok( line, " \n\r" ); idcmd = strtok( line, " \n\r" );
text = strtok( NULL, " \n\r" ); text = strtok( NULL, " \n\r" );
if( (idcmd == NULL) || (text == NULL) )
if( !idcmd || !text )
return; return;
if( strcmp( idcmd, "$PART:" ) == 0 ) if( strcmp( idcmd, "$PART:" ) == 0 )
{ {
msg = CONV_FROM_UTF8( text ); modName = CONV_FROM_UTF8( text );
module = ReturnModule( frame->m_Pcb, msg ); module = ReturnModule( frame->m_Pcb, modName );
msg.Printf( _( "Locate module %s %s" ), msg.GetData(), if( module )
module ? wxT( "Ok" ) : wxT( "not found" ) ); msg.Printf( _( "Module %s found" ), modName.GetData() );
else
msg.Printf( _( "Module %s not found"), modName.GetData() );
frame->Affiche_Message( msg ); frame->Affiche_Message( msg );
if( module ) if( module )
...@@ -63,9 +67,9 @@ void RemoteCommand( const char* cmdline ) ...@@ -63,9 +67,9 @@ void RemoteCommand( const char* cmdline )
} }
} }
if( idcmd && strcmp( idcmd, "$PIN:" ) == 0 ) else if( strcmp( idcmd, "$PIN:" ) == 0 )
{ {
wxString pinName, modName; wxString pinName;
D_PAD* pad = NULL; D_PAD* pad = NULL;
int netcode = -1; int netcode = -1;
...@@ -80,6 +84,7 @@ void RemoteCommand( const char* cmdline ) ...@@ -80,6 +84,7 @@ void RemoteCommand( const char* cmdline )
frame->DrawPanel->PrepareGraphicContext( &dc ); frame->DrawPanel->PrepareGraphicContext( &dc );
modName = CONV_FROM_UTF8( text ); modName = CONV_FROM_UTF8( text );
module = ReturnModule( frame->m_Pcb, modName ); module = ReturnModule( frame->m_Pcb, modName );
if( module ) if( module )
pad = ReturnPad( module, pinName ); pad = ReturnPad( module, pinName );
...@@ -101,11 +106,11 @@ void RemoteCommand( const char* cmdline ) ...@@ -101,11 +106,11 @@ void RemoteCommand( const char* cmdline )
} }
if( module == NULL ) if( module == NULL )
msg.Printf( _( "module %s not found" ), text ); msg.Printf( _( "Module %s not found" ), modName.GetData() );
else if( pad == NULL ) else if( pad == NULL )
msg.Printf( _( "Pin %s (module %s) not found" ), pinName.GetData(), modName.GetData() ); msg.Printf( _( "Pin %s (module %s) not found" ), pinName.GetData(), modName.GetData() );
else else
msg.Printf( _( "Locate Pin %s (module %s)" ), pinName.GetData(), modName.GetData() ); msg.Printf( _( "%s pin %s found" ), modName.GetData(), pinName.GetData() );
frame->Affiche_Message( msg ); frame->Affiche_Message( msg );
} }
......
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