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

Code clarification about 3 confusing functions to display info: DisplayInfo (displaying a message info) and class members DisplayInfo and Display_Infos doing the same thing (see changelog)

This commit is contained in:
charras 2009-04-17 08:51:02 +00:00
parent 760c92e5ee
commit 9edace2f5f
85 changed files with 168 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_canvas.cpp
View File

@ -489,9 +489,9 @@ void Pcb3D_GLCanvas::OnPaint( wxPaintEvent& event )
} }
/**********************************************/ /*****************************************************/
void Pcb3D_GLCanvas::OnSize( wxSizeEvent& event ) void Pcb3D_GLCanvas::OnSize( wxSizeEvent& event )
/**********************************************/ /*****************************************************/
{ {
int w, h; int w, h;
// set GL viewport (not called by wxGLCanvas::OnSize on all platforms...) // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)

12
CHANGELOG.txt
View File

@ -4,6 +4,18 @@ KiCad ChangeLog 2009
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.
2009-apr-17 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================
++ALL:
Code clarification: There were 3 functions to display info:
- DisplayInfo (displaying a message info)
- class members DisplayInfo and Display_Infos doing the same thing
(and sometimes these 2 functions were existing in some classes)
This was *very* confusing and created minor bugs
(info in eeschema was not always displayed, because the "bad" function was used)
Now DisplayInfo is renamed DisplayInfoMessage
Ann class member DisplayInfo is used in all classes ( replaces all Display_Infos instances)
2009-apr-12 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> 2009-apr-12 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================ ================================================================================
++eeschema: ++eeschema:

2
common/confirm.cpp
View File

@ -93,7 +93,7 @@ void DisplayError( wxWindow* parent, const wxString& text, int displaytime )
/**************************************************************************/ /**************************************************************************/
void DisplayInfo( wxWindow* parent, const wxString& text, int displaytime ) void DisplayInfoMessage( wxWindow* parent, const wxString& text, int displaytime )
/**************************************************************************/ /**************************************************************************/
/* Affiche un Message d'information. /* Affiche un Message d'information.

2
common/gestfich.cpp
View File

@ -541,7 +541,7 @@ wxString& WinEDA_App::GetEditorName()
} }
if( editorname.IsEmpty() ) // We must get a prefered editor name if( editorname.IsEmpty() ) // We must get a prefered editor name
{ {
DisplayInfo( NULL, _( "No default editor found, you must choose it" ) ); DisplayInfoMessage( NULL, _( "No default editor found, you must choose it" ) );
wxString mask( wxT( "*" ) ); wxString mask( wxT( "*" ) );
#ifdef __WINDOWS__ #ifdef __WINDOWS__

2
common/hotkeys_basic.cpp
View File

@ -332,7 +332,7 @@ void DisplayHotkeyList( WinEDA_DrawFrame* frame, struct Ki_HotkeyInfoSectionDesc
} }
} }
DisplayInfo( frame, msg ); DisplayInfoMessage( frame, msg );
} }

2
cvpcb/displayframe.cpp
View File

@ -317,7 +317,7 @@ void WinEDA_DisplayFrame::Show3D_Frame( wxCommandEvent& event )
{ {
if( m_Draw3DFrame ) if( m_Draw3DFrame )
{ {
DisplayInfo( this, _( "3D Frame already opened" ) ); DisplayInfoMessage( this, _( "3D Frame already opened" ) );
return; return;
} }

2
cvpcb/setvisu.cpp
View File

@ -95,7 +95,7 @@ void WinEDA_DisplayFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
MODULE* Module = GetBoard()->m_Modules; MODULE* Module = GetBoard()->m_Modules;
if ( Module ) if ( Module )
Module->Display_Infos( this ); Module->DisplayInfo( this );
UpdateStatusBar(); UpdateStatusBar();
DrawPanel->Trace_Curseur( DC ); DrawPanel->Trace_Curseur( DC );
} }

4
eeschema/class_drawsheet.cpp
View File

@ -611,7 +611,7 @@ bool DrawSheetStruct::ChangeFileName( WinEDA_SchematicFrame* aFrame,
aFileName.GetData() ); aFileName.GetData() );
if( !IsOK( NULL, msg ) ) if( !IsOK( NULL, msg ) )
{ {
DisplayInfo( NULL, _( "Sheet Filename Renaming Aborted" ) ); DisplayInfoMessage( (wxWindow*)NULL, _( "Sheet Filename Renaming Aborted" ) );
return false; return false;
} }
} }
@ -687,7 +687,7 @@ bool DrawSheetStruct::ChangeFileName( WinEDA_SchematicFrame* aFrame,
/***********************************************************/ /***********************************************************/
void DrawSheetStruct::Display_Infos( WinEDA_DrawFrame* frame ) void DrawSheetStruct::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
frame->MsgPanel->EraseMsgBox(); frame->MsgPanel->EraseMsgBox();
Affiche_1_Parametre( frame, 1, _( "Name" ), m_SheetName, CYAN ); Affiche_1_Parametre( frame, 1, _( "Name" ), m_SheetName, CYAN );

2
eeschema/class_drawsheet.h
View File

@ -105,7 +105,7 @@ public:
void Place( WinEDA_SchematicFrame* frame, wxDC* DC ); void Place( WinEDA_SchematicFrame* frame, wxDC* DC );
DrawSheetStruct* GenCopy(); DrawSheetStruct* GenCopy();
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** Function CleanupSheet /** Function CleanupSheet
* Delete pinsheets which are not corresponding to a hierarchal label * Delete pinsheets which are not corresponding to a hierarchal label

1
eeschema/class_pin.cpp
View File

@ -1037,7 +1037,6 @@ void LibDrawPin::DisplayInfo( WinEDA_DrawFrame* frame )
} }
frame->MsgPanel->Affiche_1_Parametre( 62, _( "Orient" ), Text, MAGENTA ); frame->MsgPanel->Affiche_1_Parametre( 62, _( "Orient" ), Text, MAGENTA );
wxMessageBox(wxT("Pin!"));
} }

4
eeschema/component_class.cpp
View File

@ -836,7 +836,7 @@ int SCH_COMPONENT::GetRotationMiroir()
int type_rotate = CMP_ORIENT_0; int type_rotate = CMP_ORIENT_0;
int ComponentMatOrient[2][2]; int ComponentMatOrient[2][2];
int ii; int ii;
#define ROTATE_VALUES_COUNT 12 #define ROTATE_VALUES_COUNT 12
int rotate_value[ROTATE_VALUES_COUNT] = // list of all possibilities, but only the first 8 are actually used int rotate_value[ROTATE_VALUES_COUNT] = // list of all possibilities, but only the first 8 are actually used
{ {
@ -1046,7 +1046,7 @@ EDA_Rect SCH_COMPONENT::GetBoundingBox()
} }
void SCH_COMPONENT::Display_Infos( WinEDA_DrawFrame* frame ) void SCH_COMPONENT::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
EDA_LibComponentStruct* Entry = FindLibPart( m_ChipName.GetData(), EDA_LibComponentStruct* Entry = FindLibPart( m_ChipName.GetData(),
wxEmptyString, FIND_ROOT ); wxEmptyString, FIND_ROOT );

2
eeschema/component_class.h
View File

@ -184,7 +184,7 @@ public:
int GetRotationMiroir(); int GetRotationMiroir();
wxPoint GetScreenCoord( const wxPoint& coord ); wxPoint GetScreenCoord( const wxPoint& coord );
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**
* Suppress annotation ( i.i IC23 changed to IC? and part reset to 1) * Suppress annotation ( i.i IC23 changed to IC? and part reset to 1)

13
eeschema/controle.cpp
View File

@ -77,9 +77,8 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( bool Include
if( Pin ) if( Pin )
{ {
/* Force display pin infos (the previous display could be a component info) */ /* Force display pin infos (the previous display could be a component info) */
Pin->Display_Infos( this ); Pin->DisplayInfo( this );
if( LibItem ) if( LibItem )
Affiche_1_Parametre( this, 1, Affiche_1_Parametre( this, 1,
LibItem->GetRef( GetSheet() ), LibItem->GetRef( GetSheet() ),
@ -156,7 +155,7 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
Pin = LocateAnyPin( (SCH_ITEM*) m_CurrentSheet->LastDrawList(), refpoint, &LibItem ); Pin = LocateAnyPin( (SCH_ITEM*) m_CurrentSheet->LastDrawList(), refpoint, &LibItem );
if( Pin ) if( Pin )
{ {
Pin->Display_Infos( this ); Pin->DisplayInfo( this );
if( LibItem ) if( LibItem )
Affiche_1_Parametre( this, 1, Affiche_1_Parametre( this, 1,
LibItem->GetRef( GetSheet() ), LibItem->GetRef( GetSheet() ),
@ -173,7 +172,7 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
{ {
SCH_CMP_FIELD* Field = (SCH_CMP_FIELD*) DrawStruct; SCH_CMP_FIELD* Field = (SCH_CMP_FIELD*) DrawStruct;
LibItem = (SCH_COMPONENT*) Field->GetParent(); LibItem = (SCH_COMPONENT*) Field->GetParent();
LibItem->Display_Infos( this ); LibItem->DisplayInfo( this );
return DrawStruct; return DrawStruct;
} }
@ -182,7 +181,7 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
Pin = LocateAnyPin( (SCH_ITEM*) m_CurrentSheet->LastDrawList(), refpoint, &LibItem ); Pin = LocateAnyPin( (SCH_ITEM*) m_CurrentSheet->LastDrawList(), refpoint, &LibItem );
if( Pin ) if( Pin )
{ {
Pin->Display_Infos( this ); Pin->DisplayInfo( this );
if( LibItem ) if( LibItem )
Affiche_1_Parametre( this, 1, Affiche_1_Parametre( this, 1,
LibItem->GetRef( GetSheet() ), LibItem->GetRef( GetSheet() ),
@ -197,14 +196,14 @@ SCH_ITEM* WinEDA_SchematicFrame:: SchematicGeneralLocateAndDisplay( const wxPoin
{ {
DrawStruct = LocateSmallestComponent( (SCH_SCREEN*) GetScreen() ); DrawStruct = LocateSmallestComponent( (SCH_SCREEN*) GetScreen() );
LibItem = (SCH_COMPONENT*) DrawStruct; LibItem = (SCH_COMPONENT*) DrawStruct;
LibItem->Display_Infos( this ); LibItem->DisplayInfo( this );
return DrawStruct; return DrawStruct;
} }
DrawStruct = (SCH_ITEM*) PickStruct( refpoint, GetScreen(), SHEETITEM ); DrawStruct = (SCH_ITEM*) PickStruct( refpoint, GetScreen(), SHEETITEM );
if( DrawStruct ) if( DrawStruct )
{ {
( (DrawSheetStruct*) DrawStruct )->Display_Infos( this ); ( (DrawSheetStruct*) DrawStruct )->DisplayInfo( this );
return DrawStruct; return DrawStruct;
} }

10
eeschema/edit_component_in_schematic.cpp
View File

@ -108,7 +108,7 @@ void WinEDA_SchematicFrame::EditCmpFieldText( SCH_CMP_FIELD* Field, wxDC* DC )
Entry = FindLibPart( Cmp->m_ChipName.GetData(), wxEmptyString, FIND_ROOT ); Entry = FindLibPart( Cmp->m_ChipName.GetData(), wxEmptyString, FIND_ROOT );
if( Entry && (Entry->m_Options == ENTRY_POWER) ) if( Entry && (Entry->m_Options == ENTRY_POWER) )
{ {
DisplayInfo( this, DisplayInfoMessage( this,
_( _(
"Part is a POWER, value cannot be modified!\nYou must create a new power" ) "Part is a POWER, value cannot be modified!\nYou must create a new power" )
); );
@ -170,7 +170,7 @@ void WinEDA_SchematicFrame::EditCmpFieldText( SCH_CMP_FIELD* Field, wxDC* DC )
} }
Field->Draw( DrawPanel, DC, wxPoint(0,0), g_XorMode ); Field->Draw( DrawPanel, DC, wxPoint(0,0), g_XorMode );
Cmp->Display_Infos( this ); Cmp->DisplayInfo( this );
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
@ -322,7 +322,7 @@ void WinEDA_SchematicFrame::EditComponentReference( SCH_COMPONENT* Cmp, wxDC* DC
Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE ); Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE );
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
Cmp->Display_Infos( this ); Cmp->DisplayInfo( this );
} }
@ -360,7 +360,7 @@ void WinEDA_SchematicFrame::EditComponentValue( SCH_COMPONENT* Cmp, wxDC* DC )
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
Cmp->Display_Infos( this ); Cmp->DisplayInfo( this );
} }
@ -415,6 +415,6 @@ void WinEDA_SchematicFrame::EditComponentFootprint( SCH_COMPONENT* Cmp, wxDC* DC
Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE ); Cmp->m_Flags ? g_XorMode : GR_DEFAULT_DRAWMODE );
GetScreen()->SetModify(); GetScreen()->SetModify();
Cmp->Display_Infos( this ); Cmp->DisplayInfo( this );
} }

2
eeschema/files-io.cpp
View File

@ -197,7 +197,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
Zoom_Automatique( FALSE ); Zoom_Automatique( FALSE );
msg.Printf( _( "File <%s> not found." ), msg.Printf( _( "File <%s> not found." ),
g_RootSheet->m_AssociatedScreen->m_FileName.GetData() ); g_RootSheet->m_AssociatedScreen->m_FileName.GetData() );
DisplayInfo( this, msg, 0 ); DisplayInfoMessage( this, msg, 0 );
return -1; return -1;
} }

6
eeschema/find.cpp
View File

@ -695,13 +695,13 @@ void WinEDA_FindFrame::LocatePartInLibs( wxCommandEvent& event )
FindList.Empty(); FindList.Empty();
ExploreAllLibraries( Text, FindList ); ExploreAllLibraries( Text, FindList );
if( FindList.IsEmpty() ) if( FindList.IsEmpty() )
DisplayInfo( this, _( "Nothing found" ) ); DisplayInfoMessage( this, _( "Nothing found" ) );
else else
DisplayInfo( this, FindList ); DisplayInfoMessage( this, FindList );
} }
} }
else else
DisplayInfo( this, FindList ); DisplayInfoMessage( this, FindList );
Close(); Close();
} }

2
eeschema/getpart.cpp
View File

@ -234,7 +234,7 @@ SCH_COMPONENT* WinEDA_SchematicFrame::Load_Component( wxDC* DC,
DrawStructsInGhost( DrawPanel, DC, Component, 0, 0 ); DrawStructsInGhost( DrawPanel, DC, Component, 0, 0 );
MsgPanel->EraseMsgBox(); MsgPanel->EraseMsgBox();
Component->Display_Infos( this ); Component->DisplayInfo( this );
return Component; return Component;
} }

2
eeschema/lib_export.cpp
View File

@ -144,7 +144,7 @@ void WinEDA_LibeditFrame::OnExportPart( wxCommandEvent& event )
if( createLib && success ) if( createLib && success )
{ {
msg = fn.GetFullPath() + _( " - OK" ); msg = fn.GetFullPath() + _( " - OK" );
DisplayInfo( this, _( "Note: this new library will be available " \ DisplayInfoMessage( this, _( "Note: this new library will be available " \
"only if it is loaded by eeschema.\nModify " "only if it is loaded by eeschema.\nModify "
"eeschema config if you want use it." ) ); "eeschema config if you want use it." ) );
} }

2
eeschema/libframe.cpp
View File

@ -461,7 +461,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_LIBEDIT_CHECK_PART: case ID_LIBEDIT_CHECK_PART:
if( CurrentLibEntry ) if( CurrentLibEntry )
if( TestPins( CurrentLibEntry ) == false ) if( TestPins( CurrentLibEntry ) == false )
DisplayInfo( this, _( " Pins Test OK!" ) ); DisplayInfoMessage( this, _( " Pins Test OK!" ) );
break; break;
case ID_DE_MORGAN_NORMAL_BUTT: case ID_DE_MORGAN_NORMAL_BUTT:

4
eeschema/load_one_schematic_file.cpp
View File

@ -93,7 +93,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen,
MsgDiag = FullFileName + _( " was created by a more recent " \ MsgDiag = FullFileName + _( " was created by a more recent " \
"version of EESchema and may not load " \ "version of EESchema and may not load " \
"correctly. Please consider updating!" ); "correctly. Please consider updating!" );
DisplayInfo( this, MsgDiag ); DisplayInfoMessage( this, MsgDiag );
} }
#if 0 #if 0
@ -104,7 +104,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen,
"EESchema. It will be stored in the new " \ "EESchema. It will be stored in the new " \
"file format when you save this file " \ "file format when you save this file " \
"again." ); "again." );
DisplayInfo( this, MsgDiag ); DisplayInfoMessage( this, MsgDiag );
} }
#endif #endif

2
eeschema/netlist_control.cpp
View File

@ -375,7 +375,7 @@ void WinEDA_NetlistFrame::SetupPluginData( wxCommandEvent& event )
/* Get a title for this page */ /* Get a title for this page */
wxString title = CurrPage->m_TitleStringCtrl->GetValue(); wxString title = CurrPage->m_TitleStringCtrl->GetValue();
if( title.IsEmpty() ) if( title.IsEmpty() )
DisplayInfo( this, DisplayInfoMessage( this,
_( "Do not forget to choose a title for this netlist control page" ) ); _( "Do not forget to choose a title for this netlist control page" ) );
} }

2
eeschema/schematic_undo_redo.cpp
View File

@ -168,7 +168,7 @@ void SwapData( EDA_BaseStruct* Item )
// not directly used in schematic: // not directly used in schematic:
default: default:
DisplayInfo( NULL, wxT( "SwapData() error: unexpected type" ) ); DisplayInfoMessage( NULL, wxT( "SwapData() error: unexpected type" ) );
break; break;
} }
} }

2
gerbview/export_to_pcbnew.cpp
View File

@ -41,7 +41,7 @@ void WinEDA_GerberFrame::ExportDataInPcbnewFormat( wxCommandEvent& event )
if( no_used_layers ) if( no_used_layers )
{ {
DisplayInfo( this, _( "None of the Gerber layers contain any data" ) ); DisplayInfoMessage( this, _( "None of the Gerber layers contain any data" ) );
return; return;
} }

6
gerbview/locate.cpp
View File

@ -63,7 +63,7 @@ BOARD_ITEM* WinEDA_GerberFrame::Locate( int typeloc )
TrackLocate = TrackLocate->Next(); TrackLocate = TrackLocate->Next();
} }
Track->Display_Infos( this ); Track->DisplayInfo( this );
return Track; return Track;
} }
@ -71,7 +71,7 @@ BOARD_ITEM* WinEDA_GerberFrame::Locate( int typeloc )
pt_texte_pcb = Locate_Texte_Pcb( (TEXTE_PCB*) GetBoard()->m_Drawings.GetFirst(), typeloc ); pt_texte_pcb = Locate_Texte_Pcb( (TEXTE_PCB*) GetBoard()->m_Drawings.GetFirst(), typeloc );
if( pt_texte_pcb ) // texte type PCB localise if( pt_texte_pcb ) // texte type PCB localise
{ {
pt_texte_pcb->Display_Infos( this ); pt_texte_pcb->DisplayInfo( this );
return pt_texte_pcb; return pt_texte_pcb;
} }
@ -83,7 +83,7 @@ BOARD_ITEM* WinEDA_GerberFrame::Locate( int typeloc )
if( ( TrackLocate = Locate_Zone( GetBoard()->m_Zone, if( ( TrackLocate = Locate_Zone( GetBoard()->m_Zone,
GetScreen()->m_Active_Layer, typeloc ) ) != NULL ) GetScreen()->m_Active_Layer, typeloc ) ) != NULL )
{ {
TrackLocate->Display_Infos( this ); TrackLocate->DisplayInfo( this );
return TrackLocate; return TrackLocate;
} }

4
include/base_struct.h
View File

@ -324,12 +324,12 @@ public:
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
virtual void Display_Infos( WinEDA_DrawFrame* frame ) virtual void DisplayInfo( WinEDA_DrawFrame* frame )
{ {
// derived classes may implement this // derived classes may implement this
} }

2
include/confirm.h
View File

@ -10,7 +10,7 @@
void DisplayError( wxWindow* parent, const wxString& msg, int displaytime = 0 ); void DisplayError( wxWindow* parent, const wxString& msg, int displaytime = 0 );
void DisplayInfo( wxWindow* parent, const wxString& msg, int displaytime = 0 ); void DisplayInfoMessage( wxWindow* parent, const wxString& msg, int displaytime = 0 );
/* Routines d'affichage messages ( disparait au bout de displaytime 0.1 secondes) */ /* Routines d'affichage messages ( disparait au bout de displaytime 0.1 secondes) */

2
kicad/prjconfig.cpp
View File

@ -33,7 +33,7 @@ void WinEDA_MainFrame::CreateNewProject( const wxString PrjFullFileName )
if( !wxFileName::FileExists( tmp ) ) if( !wxFileName::FileExists( tmp ) )
{ {
DisplayInfo( NULL, _( "Project template file <kicad.pro> not found " ) ); DisplayInfoMessage( NULL, _( "Project template file <kicad.pro> not found " ) );
return; return;
} }
else else

2
pcbnew/attribut.cpp
View File

@ -29,7 +29,7 @@ void WinEDA_PcbFrame::Attribut_Segment( TRACK* track, wxDC* DC, bool Flag_On )
track->SetState( SEGM_FIXE, Flag_On ); track->SetState( SEGM_FIXE, Flag_On );
track->Draw( DrawPanel, DC, GR_OR | GR_SURBRILL ); track->Draw( DrawPanel, DC, GR_OR | GR_SURBRILL );
DrawPanel->CursorOn( DC ); // Display cursor shape DrawPanel->CursorOn( DC ); // Display cursor shape
track->Display_Infos( this ); track->DisplayInfo( this );
} }

2
pcbnew/automove.cpp
View File

@ -311,7 +311,7 @@ void WinEDA_PcbFrame::FixeModule( MODULE* Module, bool Fixe )
{ {
Module->SetLocked( Fixe ); Module->SetLocked( Fixe );
Module->Display_Infos( this ); Module->DisplayInfo( this );
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
else else

4
pcbnew/autoplac.cpp
View File

@ -586,7 +586,7 @@ int WinEDA_PcbFrame::RecherchePlacementModule( MODULE* Module, wxDC* DC )
int Penalite; int Penalite;
bool TstOtherSide; bool TstOtherSide;
Module->Display_Infos( this ); Module->DisplayInfo( this );
Build_PlacedPads_List( GetBoard() ); Build_PlacedPads_List( GetBoard() );
@ -1125,7 +1125,7 @@ static MODULE* PickModule( WinEDA_PcbFrame* pcbframe, wxDC* DC )
continue; continue;
pcbframe->GetBoard()->m_Status_Pcb &= ~CHEVELU_LOCAL_OK; pcbframe->GetBoard()->m_Status_Pcb &= ~CHEVELU_LOCAL_OK;
adr_lowmem = buf_work; adr_lowmem = buf_work;
(*pt_Dmod)->Display_Infos( pcbframe ); (*pt_Dmod)->DisplayInfo( pcbframe );
pcbframe->build_ratsnest_module( DC, *pt_Dmod ); pcbframe->build_ratsnest_module( DC, *pt_Dmod );
/* calcul du nombre de chevelus externes */ /* calcul du nombre de chevelus externes */

4
pcbnew/basepcbframe.cpp
View File

@ -260,7 +260,7 @@ void WinEDA_BasePcbFrame::SetCurItem( BOARD_ITEM* aItem )
if( aItem ) if( aItem )
{ {
aItem->Display_Infos( this ); aItem->DisplayInfo( this );
#if 0 && defined(DEBUG) #if 0 && defined(DEBUG)
aItem->Show( 0, std::cout ); aItem->Show( 0, std::cout );
@ -272,7 +272,7 @@ void WinEDA_BasePcbFrame::SetCurItem( BOARD_ITEM* aItem )
// we can use either of these two: // we can use either of these two:
//MsgPanel->EraseMsgBox(); //MsgPanel->EraseMsgBox();
m_Pcb->Display_Infos( this ); // show the BOARD stuff m_Pcb->DisplayInfo( this ); // show the BOARD stuff
#if 0 && defined(DEBUG) #if 0 && defined(DEBUG)
std::cout << "SetCurItem(NULL)\n"; std::cout << "SetCurItem(NULL)\n";

2
pcbnew/class_board.cpp
View File

@ -500,7 +500,7 @@ bool BOARD::ComputeBoundaryBox()
// virtual, see pcbstruct.h // virtual, see pcbstruct.h
void BOARD::Display_Infos( WinEDA_DrawFrame* frame ) void BOARD::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
/* Affiche l'etat du PCB : nb de pads, nets , connexions.. */ /* Affiche l'etat du PCB : nb de pads, nets , connexions.. */
#define POS_AFF_NBPADS 1 #define POS_AFF_NBPADS 1

4
pcbnew/class_board.h
View File

@ -252,13 +252,13 @@ public:
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* Is virtual from EDA_BaseStruct. * Is virtual from EDA_BaseStruct.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
void Draw( WinEDA_DrawPanel* panel, wxDC* DC, void Draw( WinEDA_DrawPanel* panel, wxDC* DC,
int aDrawMode, const wxPoint& offset = ZeroOffset ); int aDrawMode, const wxPoint& offset = ZeroOffset );

4
pcbnew/class_cotation.cpp
View File

@ -461,10 +461,10 @@ void COTATION::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
// see class_cotation.h // see class_cotation.h
void COTATION::Display_Infos( WinEDA_DrawFrame* frame ) void COTATION::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
// for now, display only the text within the COTATION using class TEXTE_PCB. // for now, display only the text within the COTATION using class TEXTE_PCB.
m_Text->Display_Infos( frame ); m_Text->DisplayInfo( frame );
} }

4
pcbnew/class_cotation.h
View File

@ -79,13 +79,13 @@ public:
void Mirror(const wxPoint& axis_pos); void Mirror(const wxPoint& axis_pos);
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* Is virtual from EDA_BaseStruct. * Is virtual from EDA_BaseStruct.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**
* Function HitTest * Function HitTest

2
pcbnew/class_drawsegment.cpp
View File

@ -255,7 +255,7 @@ void DRAWSEGMENT::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
// see pcbstruct.h // see pcbstruct.h
void DRAWSEGMENT::Display_Infos( WinEDA_DrawFrame* frame ) void DRAWSEGMENT::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
int itype; int itype;
wxString msg; wxString msg;

4
pcbnew/class_drawsegment.h
View File

@ -64,13 +64,13 @@ public:
int aDrawMode, const wxPoint& offset = ZeroOffset ); int aDrawMode, const wxPoint& offset = ZeroOffset );
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* Is virtual from EDA_BaseStruct. * Is virtual from EDA_BaseStruct.
* @param frame A WinEDA_BasePcbFrame in which to print status information. * @param frame A WinEDA_BasePcbFrame in which to print status information.
*/ */
virtual void Display_Infos( WinEDA_DrawFrame* frame ); virtual void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**

2
pcbnew/class_edge_mod.cpp
View File

@ -217,7 +217,7 @@ void EDGE_MODULE::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
// see class_edge_mod.h // see class_edge_mod.h
void EDGE_MODULE::Display_Infos( WinEDA_DrawFrame* frame ) void EDGE_MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
wxString bufcar; wxString bufcar;

4
pcbnew/class_edge_mod.h
View File

@ -64,13 +64,13 @@ public:
void Draw3D( Pcb3D_GLCanvas* glcanvas ); void Draw3D( Pcb3D_GLCanvas* glcanvas );
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* Is virtual from EDA_BaseStruct. * Is virtual from EDA_BaseStruct.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**

2
pcbnew/class_marker.cpp
View File

@ -122,7 +122,7 @@ void MARKER::UnLink()
} }
void MARKER::Display_Infos( WinEDA_DrawFrame* frame ) void MARKER::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
int text_pos; int text_pos;

4
pcbnew/class_marker.h
View File

@ -113,12 +113,12 @@ public:
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**

2
pcbnew/class_module.cpp
View File

@ -896,7 +896,7 @@ EDA_Rect MODULE::GetBoundingBox()
/*******************************************************/ /*******************************************************/
void MODULE::Display_Infos( WinEDA_DrawFrame* frame ) void MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
/*******************************************************/ /*******************************************************/
/* Virtual function, from EDA_BaseStruct. /* Virtual function, from EDA_BaseStruct.
* display module info on MsgPanel * display module info on MsgPanel

4
pcbnew/class_module.h
View File

@ -190,12 +190,12 @@ public:
const wxPoint& offset, int dim_ancre, int draw_mode ); const wxPoint& offset, int dim_ancre, int draw_mode );
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**

2
pcbnew/class_pad.cpp
View File

@ -430,7 +430,7 @@ out:
/******************************************************/ /******************************************************/
void D_PAD::Display_Infos( WinEDA_DrawFrame* frame ) void D_PAD::DisplayInfo( WinEDA_DrawFrame* frame )
/******************************************************/ /******************************************************/
/* Affiche en bas d'ecran les caract de la pastille demandee */ /* Affiche en bas d'ecran les caract de la pastille demandee */
{ {

4
pcbnew/class_pad.h
View File

@ -150,13 +150,13 @@ public:
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* Is virtual from EDA_BaseStruct. * Is virtual from EDA_BaseStruct.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**

2
pcbnew/class_pcb_text.cpp
View File

@ -157,7 +157,7 @@ void TEXTE_PCB::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
// see class_pcb_text.h // see class_pcb_text.h
void TEXTE_PCB::Display_Infos( WinEDA_DrawFrame* frame ) void TEXTE_PCB::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
wxString msg; wxString msg;

4
pcbnew/class_pcb_text.h
View File

@ -41,13 +41,13 @@ public:
bool Save( FILE* aFile ) const; bool Save( FILE* aFile ) const;
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* Is virtual from EDA_BaseStruct. * Is virtual from EDA_BaseStruct.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**

2
pcbnew/class_text_mod.cpp
View File

@ -444,7 +444,7 @@ int TEXTE_MODULE::GetDrawRotation()
// see class_text_mod.h // see class_text_mod.h
void TEXTE_MODULE::Display_Infos( WinEDA_DrawFrame* frame ) void TEXTE_MODULE::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
wxString msg, Line; wxString msg, Line;
int ii; int ii;

4
pcbnew/class_text_mod.h
View File

@ -92,13 +92,13 @@ public:
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* Is virtual from EDA_BaseStruct. * Is virtual from EDA_BaseStruct.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**

2
pcbnew/class_track.cpp
View File

@ -842,7 +842,7 @@ void SEGVIA::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoi
// see class_track.h // see class_track.h
void TRACK::Display_Infos( WinEDA_DrawFrame* frame ) void TRACK::DisplayInfo( WinEDA_DrawFrame* frame )
{ {
wxString msg; wxString msg;
int text_pos; int text_pos;

4
pcbnew/class_track.h
View File

@ -164,13 +164,13 @@ public:
bool IsNull(); bool IsNull();
/** /**
* Function Display_Infos * Function DisplayInfo
* has knowledge about the frame and how and where to put status information * has knowledge about the frame and how and where to put status information
* about this object into the frame's message panel. * about this object into the frame's message panel.
* Is virtual from EDA_BaseStruct. * Is virtual from EDA_BaseStruct.
* @param frame A WinEDA_DrawFrame in which to print status information. * @param frame A WinEDA_DrawFrame in which to print status information.
*/ */
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**

2
pcbnew/class_zone.cpp
View File

@ -856,7 +856,7 @@ bool ZONE_CONTAINER::HitTestFilledArea( const wxPoint& aRefPos )
/************************************************************/ /************************************************************/
void ZONE_CONTAINER::Display_Infos( WinEDA_DrawFrame* frame ) void ZONE_CONTAINER::DisplayInfo( WinEDA_DrawFrame* frame )
/************************************************************/ /************************************************************/
{ {
wxString msg; wxString msg;

2
pcbnew/class_zone.h
View File

@ -65,7 +65,7 @@ public:
*/ */
void Copy( ZONE_CONTAINER* src ); void Copy( ZONE_CONTAINER* src );
void Display_Infos( WinEDA_DrawFrame* frame ); void DisplayInfo( WinEDA_DrawFrame* frame );
/** /**
* Function Draw * Function Draw

2
pcbnew/controle.cpp
View File

@ -203,7 +203,7 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay( int aHotKeyCode )
*/ */
// this menu's handler is void WinEDA_BasePcbFrame::ProcessItemSelection() // this menu's handler is void WinEDA_BasePcbFrame::ProcessItemSelection()
// and it calls SetCurItem() which in turn calls Display_Infos() on the item. // and it calls SetCurItem() which in turn calls DisplayInfo() on the item.
DrawPanel->m_AbortRequest = true; // changed in false if an item DrawPanel->m_AbortRequest = true; // changed in false if an item
PopupMenu( &itemMenu ); // m_AbortRequest = false if an item is selected PopupMenu( &itemMenu ); // m_AbortRequest = false if an item is selected

8
pcbnew/deltrack.cpp
View File

@ -11,10 +11,6 @@
#include "pcbnew.h" #include "pcbnew.h"
#include "protos.h" #include "protos.h"
/* Routines Locales */
/* Variables locales */
/***************************************************************/ /***************************************************************/
TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* aTrack ) TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* aTrack )
@ -116,7 +112,7 @@ TRACK* WinEDA_PcbFrame::Delete_Segment( wxDC* DC, TRACK* aTrack )
GetScreen()->SetModify(); GetScreen()->SetModify();
test_1_net_connexion( DC, current_net_code ); test_1_net_connexion( DC, current_net_code );
GetBoard()->Display_Infos( this ); GetBoard()->DisplayInfo( this );
return NULL; return NULL;
} }
@ -163,7 +159,7 @@ void WinEDA_PcbFrame::Delete_net( wxDC* DC, TRACK* aTrack )
SaveItemEfface( trackList, ii ); SaveItemEfface( trackList, ii );
GetScreen()->SetModify(); GetScreen()->SetModify();
test_1_net_connexion( DC, net_code_delete ); test_1_net_connexion( DC, net_code_delete );
GetBoard()->Display_Infos( this ); GetBoard()->DisplayInfo( this );
} }
} }

2
pcbnew/dialog_graphic_item_properties.cpp
View File

@ -213,7 +213,7 @@ void DialogGraphicItemProperties::OnOkClick( wxCommandEvent& event )
m_Parent->GetScreen()->SetModify(); m_Parent->GetScreen()->SetModify();
if ( m_DC ) if ( m_DC )
m_Item->Draw( m_Parent->DrawPanel, m_DC, GR_OR ); m_Item->Draw( m_Parent->DrawPanel, m_DC, GR_OR );
m_Item->Display_Infos( m_Parent ); m_Item->DisplayInfo( m_Parent );
Close( TRUE ); Close( TRUE );
} }

2
pcbnew/dialog_pad_properties.cpp
View File

@ -576,7 +576,7 @@ void DialogPadProperties::PadPropertiesAccept( wxCommandEvent& event )
m_CurrentPad->ComputeRayon(); m_CurrentPad->ComputeRayon();
Module->Set_Rectangle_Encadrement(); Module->Set_Rectangle_Encadrement();
m_CurrentPad->Display_Infos( m_Parent ); m_CurrentPad->DisplayInfo( m_Parent );
if( m_DC ) // redraw the area where the pad was if( m_DC ) // redraw the area where the pad was
m_Parent->DrawPanel->PostDirtyRect( m_CurrentPad->GetBoundingBox() ); m_Parent->DrawPanel->PostDirtyRect( m_CurrentPad->GetBoundingBox() );
m_Parent->GetScreen()->SetModify(); m_Parent->GetScreen()->SetModify();

4
pcbnew/dialog_print_using_printer.cpp
View File

@ -643,11 +643,11 @@ void EDA_Printout::DrawPage()
scale = wxMax( scaleX, scaleY ) / userscale; // Use x or y scaling factor, whichever fits on the DC scale = wxMax( scaleX, scaleY ) / userscale; // Use x or y scaling factor, whichever fits on the DC
if( m_PrintFrame->m_XScaleAdjust > MAX_SCALE || m_PrintFrame->m_YScaleAdjust > MAX_SCALE ) if( m_PrintFrame->m_XScaleAdjust > MAX_SCALE || m_PrintFrame->m_YScaleAdjust > MAX_SCALE )
DisplayInfo( NULL, _( "Warning: Scale option set to a very large value" ) ); DisplayInfoMessage( NULL, _( "Warning: Scale option set to a very large value" ) );
// Test for a reasonnable scale value // Test for a reasonnable scale value
if( m_PrintFrame->m_XScaleAdjust < MIN_SCALE || m_PrintFrame->m_YScaleAdjust < MIN_SCALE ) if( m_PrintFrame->m_XScaleAdjust < MIN_SCALE || m_PrintFrame->m_YScaleAdjust < MIN_SCALE )
DisplayInfo( NULL, _( "Warning: Scale option set to a very small value" ) ); DisplayInfoMessage( NULL, _( "Warning: Scale option set to a very small value" ) );
// ajust the real draw scale // ajust the real draw scale
double accurate_Xscale, accurate_Yscale; double accurate_Xscale, accurate_Yscale;

4
pcbnew/drc.cpp
View File

@ -151,7 +151,7 @@ int DRC::Drc( TRACK* aRefSegm, TRACK* aList )
{ {
wxASSERT( m_currentMarker ); wxASSERT( m_currentMarker );
m_currentMarker->Display_Infos( m_mainWindow ); m_currentMarker->DisplayInfo( m_mainWindow );
return BAD_DRC; return BAD_DRC;
} }
@ -179,7 +179,7 @@ int DRC::Drc( ZONE_CONTAINER* aArea, int CornerIndex )
if( !doEdgeZoneDrc( aArea, CornerIndex ) ) if( !doEdgeZoneDrc( aArea, CornerIndex ) )
{ {
wxASSERT( m_currentMarker ); wxASSERT( m_currentMarker );
m_currentMarker->Display_Infos( m_mainWindow ); m_currentMarker->DisplayInfo( m_mainWindow );
return BAD_DRC; return BAD_DRC;
} }

6
pcbnew/edit.cpp
View File

@ -270,7 +270,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_PCB_ZONES_BUTT: case ID_PCB_ZONES_BUTT:
SetToolID( id, wxCURSOR_PENCIL, _( "Add Zones" ) ); SetToolID( id, wxCURSOR_PENCIL, _( "Add Zones" ) );
if( DisplayOpt.DisplayZonesMode != 0 ) if( DisplayOpt.DisplayZonesMode != 0 )
DisplayInfo( this, _( "Warning: Display Zone is OFF!!!" ) ); DisplayInfoMessage( this, _( "Warning: Display Zone is OFF!!!" ) );
if( !g_HightLigt_Status && (g_HightLigth_NetCode > 0 ) ) if( !g_HightLigt_Status && (g_HightLigth_NetCode > 0 ) )
Hight_Light( &dc ); Hight_Light( &dc );
break; break;
@ -1128,7 +1128,7 @@ void WinEDA_PcbFrame::RemoveStruct( BOARD_ITEM* Item, wxDC* DC )
Remove_Zone_Corner( DC, (ZONE_CONTAINER*) Item ); Remove_Zone_Corner( DC, (ZONE_CONTAINER*) Item );
SetCurItem( NULL ); SetCurItem( NULL );
break; break;
case TYPE_ZONE_CONTAINER: case TYPE_ZONE_CONTAINER:
{ {
SetCurItem( NULL ); SetCurItem( NULL );
@ -1136,7 +1136,7 @@ void WinEDA_PcbFrame::RemoveStruct( BOARD_ITEM* Item, wxDC* DC )
Delete_Zone_Contour( DC, (ZONE_CONTAINER*) Item ); Delete_Zone_Contour( DC, (ZONE_CONTAINER*) Item );
test_1_net_connexion( NULL, netcode ); test_1_net_connexion( NULL, netcode );
} }
break; break;
case TYPE_MARKER: case TYPE_MARKER:
if( Item == GetCurItem() ) if( Item == GetCurItem() )

4
pcbnew/edit_pcb_text.cpp
View File

@ -77,7 +77,7 @@ void WinEDA_PcbFrame::StartMoveTextePcb( TEXTE_PCB* TextePcb, wxDC* DC )
old_pos = TextePcb->m_Pos; old_pos = TextePcb->m_Pos;
TextePcb->Draw( DrawPanel, DC, GR_XOR ); TextePcb->Draw( DrawPanel, DC, GR_XOR );
TextePcb->m_Flags |= IS_MOVED; TextePcb->m_Flags |= IS_MOVED;
TextePcb->Display_Infos( this ); TextePcb->DisplayInfo( this );
DrawPanel->ManageCurseur = Move_Texte_Pcb; DrawPanel->ManageCurseur = Move_Texte_Pcb;
DrawPanel->ForceCloseManageCurseur = Abort_Edit_Pcb_Text; DrawPanel->ForceCloseManageCurseur = Abort_Edit_Pcb_Text;
SetCurItem( TextePcb ); SetCurItem( TextePcb );
@ -181,7 +181,7 @@ void WinEDA_PcbFrame::Rotate_Texte_Pcb( TEXTE_PCB* TextePcb, wxDC* DC )
/* Redessin du Texte */ /* Redessin du Texte */
TextePcb->Draw( DrawPanel, DC, drawmode ); TextePcb->Draw( DrawPanel, DC, drawmode );
TextePcb->Display_Infos( this ); TextePcb->DisplayInfo( this );
GetScreen()->SetModify(); GetScreen()->SetModify();
} }

2
pcbnew/editedge.cpp
View File

@ -34,7 +34,7 @@ void WinEDA_PcbFrame::Start_Move_DrawItem( DRAWSEGMENT* drawitem, wxDC* DC )
drawitem->Draw( DrawPanel, DC, GR_XOR ); drawitem->Draw( DrawPanel, DC, GR_XOR );
drawitem->m_Flags |= IS_MOVED; drawitem->m_Flags |= IS_MOVED;
cursor_pos = cursor_pos0 = GetScreen()->m_Curseur; cursor_pos = cursor_pos0 = GetScreen()->m_Curseur;
drawitem->Display_Infos( this ); drawitem->DisplayInfo( this );
DrawPanel->ManageCurseur = Move_Segment; DrawPanel->ManageCurseur = Move_Segment;
DrawPanel->ForceCloseManageCurseur = Exit_EditEdge; DrawPanel->ForceCloseManageCurseur = Exit_EditEdge;
SetCurItem( drawitem ); SetCurItem( drawitem );

12
pcbnew/editrack-part2.cpp
View File

@ -149,7 +149,7 @@ void WinEDA_PcbFrame::ExChange_Track_Layer( TRACK* pt_segm, wxDC* DC )
} }
test_1_net_connexion( DC, pt_track->GetNet() ); test_1_net_connexion( DC, pt_track->GetNet() );
pt_track->Display_Infos( this ); pt_track->DisplayInfo( this );
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
@ -264,7 +264,7 @@ bool WinEDA_PcbFrame::Other_Layer_Route( TRACK* aTrack, wxDC* DC )
// use the form of SetCurItem() which does not write to the msg panel, // use the form of SetCurItem() which does not write to the msg panel,
// SCREEN::SetCurItem(), so the DRC error remains on screen. // SCREEN::SetCurItem(), so the DRC error remains on screen.
// WinEDA_PcbFrame::SetCurItem() calls Display_Infos(). // WinEDA_PcbFrame::SetCurItem() calls DisplayInfo().
GetScreen()->SetCurItem( g_CurrentTrackSegment ); GetScreen()->SetCurItem( g_CurrentTrackSegment );
return false; return false;
@ -305,7 +305,7 @@ bool WinEDA_PcbFrame::Other_Layer_Route( TRACK* aTrack, wxDC* DC )
} }
DrawPanel->ManageCurseur( DrawPanel, DC, FALSE ); DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
via->Display_Infos( this ); via->DisplayInfo( this );
UpdateStatusBar(); UpdateStatusBar();
@ -329,7 +329,7 @@ void WinEDA_PcbFrame::Affiche_Status_Net( wxDC* DC )
pt_segm = Locate_Pistes( GetBoard()->m_Track, masquelayer, CURSEUR_OFF_GRILLE ); pt_segm = Locate_Pistes( GetBoard()->m_Track, masquelayer, CURSEUR_OFF_GRILLE );
if( pt_segm == NULL ) if( pt_segm == NULL )
GetBoard()->Display_Infos( this ); GetBoard()->DisplayInfo( this );
else else
test_1_net_connexion( DC, pt_segm->GetNet() ); test_1_net_connexion( DC, pt_segm->GetNet() );
} }
@ -368,7 +368,7 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
if( pt_pad ) /* Affichage du chevelu du net correspondant */ if( pt_pad ) /* Affichage du chevelu du net correspondant */
{ {
pt_pad->Display_Infos( this ); pt_pad->DisplayInfo( this );
pt_chevelu = (CHEVELU*) GetBoard()->m_Ratsnest; pt_chevelu = (CHEVELU*) GetBoard()->m_Ratsnest;
for( ii = GetBoard()->GetNumRatsnests(); ii > 0; pt_chevelu++, ii-- ) for( ii = GetBoard()->GetNumRatsnests(); ii > 0; pt_chevelu++, ii-- )
{ {
@ -404,7 +404,7 @@ void WinEDA_PcbFrame::Show_1_Ratsnest( EDA_BaseStruct* item, wxDC* DC )
if( Module ) if( Module )
{ {
Module->Display_Infos( this ); Module->DisplayInfo( this );
pt_pad = Module->m_Pads; pt_pad = Module->m_Pads;
for( ; pt_pad != NULL; pt_pad = (D_PAD*) pt_pad->Next() ) for( ; pt_pad != NULL; pt_pad = (D_PAD*) pt_pad->Next() )
{ {

6
pcbnew/editrack.cpp
View File

@ -186,7 +186,7 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
D( g_CurrentTrackList.VerifyListIntegrity(); ); D( g_CurrentTrackList.VerifyListIntegrity(); );
g_CurrentTrackSegment->Display_Infos( this ); g_CurrentTrackSegment->DisplayInfo( this );
SetCurItem( g_CurrentTrackSegment ); SetCurItem( g_CurrentTrackSegment );
DrawPanel->ManageCurseur( DrawPanel, DC, FALSE ); DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
@ -271,7 +271,7 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
/* Show the new position */ /* Show the new position */
ShowNewTrackWhenMovingCursor( DrawPanel, DC, FALSE ); ShowNewTrackWhenMovingCursor( DrawPanel, DC, FALSE );
} }
g_CurrentTrackSegment->Display_Infos( this ); g_CurrentTrackSegment->DisplayInfo( this );
} }
SetCurItem( g_CurrentTrackSegment ); SetCurItem( g_CurrentTrackSegment );
@ -518,7 +518,7 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
test_1_net_connexion( DC, netcode ); test_1_net_connexion( DC, netcode );
GetScreen()->SetModify(); GetScreen()->SetModify();
GetBoard()->Display_Infos( this ); GetBoard()->DisplayInfo( this );
} }
wxASSERT( g_FirstTrackSegment==NULL ); wxASSERT( g_FirstTrackSegment==NULL );

6
pcbnew/edtxtmod.cpp
View File

@ -54,7 +54,7 @@ TEXTE_MODULE* WinEDA_BasePcbFrame::CreateTextModule( MODULE* Module, wxDC* DC )
Text->m_Flags = 0; Text->m_Flags = 0;
Text->Draw( DrawPanel, DC, GR_OR ); Text->Draw( DrawPanel, DC, GR_OR );
Text->Display_Infos( this ); Text->DisplayInfo( this );
return Text; return Text;
} }
@ -80,7 +80,7 @@ void WinEDA_BasePcbFrame::RotateTextModule( TEXTE_MODULE* Text, wxDC* DC )
/* Redessin du Texte */ /* Redessin du Texte */
Text->Draw( DrawPanel, DC, GR_XOR, MoveVector ); Text->Draw( DrawPanel, DC, GR_XOR, MoveVector );
Text->Display_Infos( this ); Text->DisplayInfo( this );
module->m_LastEdit_Time = time( NULL ); module->m_LastEdit_Time = time( NULL );
GetScreen()->SetModify(); GetScreen()->SetModify();
@ -173,7 +173,7 @@ void WinEDA_BasePcbFrame::StartMoveTexteModule( TEXTE_MODULE* Text, wxDC* DC )
CursorInitialPosition = Text->m_Pos; CursorInitialPosition = Text->m_Pos;
Text->Display_Infos( this ); Text->DisplayInfo( this );
SetCurItem( Text ); SetCurItem( Text );
DrawPanel->ManageCurseur = Show_MoveTexte_Module; DrawPanel->ManageCurseur = Show_MoveTexte_Module;

8
pcbnew/files.cpp
View File

@ -83,7 +83,7 @@ void WinEDA_PcbFrame::Files_io( wxCommandEvent& event )
if( !fn.FileExists() ) if( !fn.FileExists() )
{ {
msg = _( "Recovery file " ) + fn.GetFullPath() + _( " not found" ); msg = _( "Recovery file " ) + fn.GetFullPath() + _( " not found" );
DisplayInfo( this, msg ); DisplayInfoMessage( this, msg );
break; break;
} }
else else
@ -215,11 +215,11 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
sscanf(cbuf, "PCBNEW-BOARD Version %d date", &ver ); sscanf(cbuf, "PCBNEW-BOARD Version %d date", &ver );
if ( ver > g_CurrentVersionPCB ) if ( ver > g_CurrentVersionPCB )
{ {
DisplayInfo( this, _( "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!")); DisplayInfoMessage( this, _( "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!"));
} }
else if ( ver < g_CurrentVersionPCB ) else if ( ver < g_CurrentVersionPCB )
{ {
DisplayInfo( this, _( "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again.")); DisplayInfoMessage( this, _( "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again."));
} }
// Reload the corresponding configuration file: // Reload the corresponding configuration file:
@ -264,7 +264,7 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
/* Rebuild the new pad list (for drc and ratsnet control ...) */ /* Rebuild the new pad list (for drc and ratsnet control ...) */
build_liste_pads(); build_liste_pads();
GetBoard()->Display_Infos( this ); GetBoard()->DisplayInfo( this );
DrawPanel->Refresh( true); DrawPanel->Refresh( true);
/* reset the auto save timer */ /* reset the auto save timer */

2
pcbnew/gen_drill_report_files.cpp
View File

@ -387,7 +387,7 @@ void Gen_Drill_PcbMap( BOARD* aPcb, FILE* aFile,
/* create the drill list */ /* create the drill list */
if( aToolListBuffer.size() > 13 ) if( aToolListBuffer.size() > 13 )
{ {
DisplayInfo( NULL, DisplayInfoMessage( NULL,
_( _(
" Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\nPlot uses circle shape for some drill values" ), " Drill map: Too many diameter values to draw to draw one symbol per drill value (max 13)\nPlot uses circle shape for some drill values" ),
10 ); 10 );

2
pcbnew/gen_modules_placefile.cpp
View File

@ -281,7 +281,7 @@ void WinEDA_PcbFrame::GenModulesPosition( wxCommandEvent& event )
msg += wxT("\n\n") + backLayerName + wxT( " File: " ) + msg += wxT("\n\n") + backLayerName + wxT( " File: " ) +
fnBack.GetFullPath(); fnBack.GetFullPath();
DisplayInfo( this, msg ); DisplayInfoMessage( this, msg );
exit: // the only safe way out of here, no returns please. exit: // the only safe way out of here, no returns please.

4
pcbnew/globaleditpad.cpp
View File

@ -230,7 +230,7 @@ void WinEDA_BasePcbFrame::Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw )
wxString ref_name_module = Module->m_LibRef; wxString ref_name_module = Module->m_LibRef;
Module->Display_Infos( this ); Module->DisplayInfo( this );
WinEDA_PadGlobalEditFrame* frame = new WinEDA_PadGlobalEditFrame( this, aPad ); WinEDA_PadGlobalEditFrame* frame = new WinEDA_PadGlobalEditFrame( this, aPad );
@ -257,7 +257,7 @@ void WinEDA_BasePcbFrame::Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw )
if( ref_name_module != Module->m_LibRef ) if( ref_name_module != Module->m_LibRef )
continue; continue;
Module->Display_Infos( this ); Module->DisplayInfo( this );
/* Effacement du module */ /* Effacement du module */
if ( aDraw ) if ( aDraw )

6
pcbnew/hotkeys.cpp
View File

@ -438,7 +438,7 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey,
{ {
SetCurItem( module ); SetCurItem( module );
module->SetLocked( !module->IsLocked() ); module->SetLocked( !module->IsLocked() );
module->Display_Infos( this ); module->DisplayInfo( this );
} }
break; break;
@ -471,7 +471,7 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey,
msg.Printf( _( "Footprint %s found, but locked" ), msg.Printf( _( "Footprint %s found, but locked" ),
module->m_Reference->m_Text.GetData() ); module->m_Reference->m_Text.GetData() );
DisplayInfo( this, msg ); DisplayInfoMessage( this, msg );
} }
module = NULL; module = NULL;
} }
@ -522,7 +522,7 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey,
break; break;
} }
module->Display_Infos( this ); module->DisplayInfo( this );
break; break;
} }
} }

12
pcbnew/librairi.cpp
View File

@ -129,7 +129,7 @@ MODULE* WinEDA_ModuleEditFrame::Import_Module( wxDC* DC )
GetBoard()->Add( module ); GetBoard()->Add( module );
/* Display info : */ /* Display info : */
module->Display_Infos( this ); module->DisplayInfo( this );
Place_Module( module, DC ); Place_Module( module, DC );
GetBoard()->m_Status_Pcb = 0; GetBoard()->m_Status_Pcb = 0;
build_liste_pads(); build_liste_pads();
@ -208,7 +208,7 @@ void WinEDA_ModuleEditFrame::Export_Module( MODULE* ptmod, bool createlib )
fputs( "$EndLIBRARY\n", file ); fputs( "$EndLIBRARY\n", file );
fclose( file ); fclose( file );
msg.Printf( _( "Module exported in file <%s>" ), fn.GetFullPath().c_str() ); msg.Printf( _( "Module exported in file <%s>" ), fn.GetFullPath().c_str() );
DisplayInfo( this, msg ); DisplayInfoMessage( this, msg );
} }
@ -406,7 +406,7 @@ void WinEDA_BasePcbFrame::Archive_Modules( const wxString& LibName,
if( GetBoard()->m_Modules == NULL ) if( GetBoard()->m_Modules == NULL )
{ {
DisplayInfo( this, _( " No modules to archive!" ) ); DisplayInfoMessage( this, _( " No modules to archive!" ) );
return; return;
} }
@ -505,7 +505,7 @@ int WinEDA_BasePcbFrame::Save_Module_In_Library( const wxString& aLibName,
FILE* lib_module, * dest; FILE* lib_module, * dest;
bool added = true; bool added = true;
aModule->Display_Infos( this ); aModule->DisplayInfo( this );
if( !wxFileExists( aLibName ) ) if( !wxFileExists( aLibName ) )
{ {
@ -721,7 +721,7 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_n
{ {
if( Get_Message( _( "Module Reference:" ), _( "Module Creation" ), Line, this ) != 0 ) if( Get_Message( _( "Module Reference:" ), _( "Module Creation" ), Line, this ) != 0 )
{ {
DisplayInfo( this, _( "No reference, aborted" ) ); DisplayInfoMessage( this, _( "No reference, aborted" ) );
return NULL; return NULL;
} }
} }
@ -755,7 +755,7 @@ MODULE* WinEDA_BasePcbFrame::Create_1_Module( wxDC* DC, const wxString& module_n
Module->SetPosition( wxPoint( 0, 0 ) ); Module->SetPosition( wxPoint( 0, 0 ) );
Module->Display_Infos( this ); Module->DisplayInfo( this );
return Module; return Module;
} }

6
pcbnew/modedit.cpp
View File

@ -101,7 +101,7 @@ BOARD_ITEM* WinEDA_ModuleEditFrame::ModeditLocateAndDisplay( int aHotKeyCode )
} }
// this menu's handler is void WinEDA_BasePcbFrame::ProcessItemSelection() // this menu's handler is void WinEDA_BasePcbFrame::ProcessItemSelection()
// and it calls SetCurItem() which in turn calls Display_Infos() on the item. // and it calls SetCurItem() which in turn calls DisplayInfo() on the item.
DrawPanel->m_AbortRequest = true; // changed in false if an item DrawPanel->m_AbortRequest = true; // changed in false if an item
PopupMenu( &itemMenu ); // m_AbortRequest = false if an item is selected PopupMenu( &itemMenu ); // m_AbortRequest = false if an item is selected
@ -115,7 +115,7 @@ BOARD_ITEM* WinEDA_ModuleEditFrame::ModeditLocateAndDisplay( int aHotKeyCode )
if( item ) if( item )
{ {
item->Display_Infos( this ); item->DisplayInfo( this );
} }
return item; return item;
@ -780,7 +780,7 @@ void WinEDA_ModuleEditFrame::Transform( MODULE* module, wxDC* DC, int transform
case ID_MODEDIT_MODULE_SCALE: case ID_MODEDIT_MODULE_SCALE:
case ID_MODEDIT_MODULE_SCALEX: case ID_MODEDIT_MODULE_SCALEX:
case ID_MODEDIT_MODULE_SCALEY: case ID_MODEDIT_MODULE_SCALEY:
DisplayInfo( this, wxT( "Not availlable" ) ); DisplayInfoMessage( this, wxT( "Not availlable" ) );
break; break;
} }

2
pcbnew/moduleframe.cpp
View File

@ -388,7 +388,7 @@ void WinEDA_ModuleEditFrame::Show3D_Frame( wxCommandEvent& event )
{ {
if( m_Draw3DFrame ) if( m_Draw3DFrame )
{ {
DisplayInfo( this, _( "3D Frame already opened" ) ); DisplayInfoMessage( this, _( "3D Frame already opened" ) );
return; return;
} }

10
pcbnew/modules.cpp
View File

@ -252,7 +252,7 @@ MODULE* WinEDA_BasePcbFrame::Copie_Module( MODULE* module )
build_liste_pads(); build_liste_pads();
newmodule->Display_Infos( this ); newmodule->DisplayInfo( this );
GetBoard()->m_Status_Pcb &= ~CHEVELU_LOCAL_OK; GetBoard()->m_Status_Pcb &= ~CHEVELU_LOCAL_OK;
return newmodule; return newmodule;
} }
@ -304,7 +304,7 @@ bool WinEDA_PcbFrame::Delete_Module( MODULE* module, wxDC* DC, bool aAskBeforeDe
return FALSE; return FALSE;
/* Confirmation de l'effacement */ /* Confirmation de l'effacement */
module->Display_Infos( this ); module->DisplayInfo( this );
if( aAskBeforeDeleting ) if( aAskBeforeDeleting )
{ {
@ -521,7 +521,7 @@ void BOARD::Change_Side_Module( MODULE* Module, wxDC* DC )
Module->Set_Rectangle_Encadrement(); Module->Set_Rectangle_Encadrement();
if( m_PcbFrame ) if( m_PcbFrame )
Module->Display_Infos( m_PcbFrame ); Module->DisplayInfo( m_PcbFrame );
if( !(Module->m_Flags & IS_MOVED) ) /* Inversion simple */ if( !(Module->m_Flags & IS_MOVED) ) /* Inversion simple */
{ {
@ -698,7 +698,7 @@ void WinEDA_BasePcbFrame::Place_Module( MODULE* module, wxDC* DC )
/* affichage chevelu general si necessaire */ /* affichage chevelu general si necessaire */
ReCompile_Ratsnest_After_Changes( DC ); ReCompile_Ratsnest_After_Changes( DC );
module->Display_Infos( this ); module->DisplayInfo( this );
DrawPanel->ManageCurseur = NULL; DrawPanel->ManageCurseur = NULL;
DrawPanel->ForceCloseManageCurseur = NULL; DrawPanel->ForceCloseManageCurseur = NULL;
@ -757,7 +757,7 @@ void WinEDA_BasePcbFrame::Rotate_Module( wxDC* DC, MODULE* module,
else else
module->SetOrientation( angle ); module->SetOrientation( angle );
module->Display_Infos( this ); module->DisplayInfo( this );
if( DC ) if( DC )
{ {

8
pcbnew/move-drag_pads.cpp
View File

@ -116,7 +116,7 @@ void WinEDA_BasePcbFrame::Export_Pad_Settings( D_PAD* pt_pad )
Module = (MODULE*) pt_pad->GetParent(); Module = (MODULE*) pt_pad->GetParent();
pt_pad->Display_Infos( this ); pt_pad->DisplayInfo( this );
g_Pad_Master.m_PadShape = pt_pad->m_PadShape; g_Pad_Master.m_PadShape = pt_pad->m_PadShape;
g_Pad_Master.m_Attribut = pt_pad->m_Attribut; g_Pad_Master.m_Attribut = pt_pad->m_Attribut;
@ -236,7 +236,7 @@ void WinEDA_BasePcbFrame::AddPad( MODULE* Module, bool draw )
/* Redessin du module */ /* Redessin du module */
Module->Set_Rectangle_Encadrement(); Module->Set_Rectangle_Encadrement();
Pad->Display_Infos( this ); Pad->DisplayInfo( this );
if ( draw ) if ( draw )
DrawPanel->PostDirtyRect( Module->GetBoundingBox() ); DrawPanel->PostDirtyRect( Module->GetBoundingBox() );
} }
@ -287,7 +287,7 @@ void WinEDA_BasePcbFrame::StartMovePad( D_PAD* Pad, wxDC* DC )
s_CurrentSelectedPad = Pad; s_CurrentSelectedPad = Pad;
Pad_OldPos = Pad->m_Pos; Pad_OldPos = Pad->m_Pos;
Pad->Display_Infos( this ); Pad->DisplayInfo( this );
DrawPanel->ManageCurseur = Show_Pad_Move; DrawPanel->ManageCurseur = Show_Pad_Move;
DrawPanel->ForceCloseManageCurseur = Exit_Move_Pad; DrawPanel->ForceCloseManageCurseur = Exit_Move_Pad;
@ -390,6 +390,6 @@ void WinEDA_BasePcbFrame::RotatePad( D_PAD* Pad, wxDC* DC )
Module->Set_Rectangle_Encadrement(); Module->Set_Rectangle_Encadrement();
Pad->Display_Infos( this ); Pad->DisplayInfo( this );
Module->Draw( DrawPanel, DC, GR_OR ); Module->Draw( DrawPanel, DC, GR_OR );
} }

2
pcbnew/muonde.cpp
View File

@ -481,7 +481,7 @@ MODULE* WinEDA_PcbFrame::Genere_Self( wxDC* DC )
PtPad->m_Pos0 = PtPad->m_Pos - Module->m_Pos; PtPad->m_Pos0 = PtPad->m_Pos - Module->m_Pos;
/* Modif des positions textes */ /* Modif des positions textes */
Module->Display_Infos( this ); Module->DisplayInfo( this );
Module->m_Value->m_Pos.x = Module->m_Reference->m_Pos.x = ( FirstSegm->m_Start.x + Module->m_Value->m_Pos.x = Module->m_Reference->m_Pos.x = ( FirstSegm->m_Start.x +
LastSegm->m_End.x ) / 2; LastSegm->m_End.x ) / 2;
Module->m_Value->m_Pos.y = Module->m_Reference->m_Pos.y = ( FirstSegm->m_Start.y + Module->m_Value->m_Pos.y = Module->m_Reference->m_Pos.y = ( FirstSegm->m_Start.y +

4
pcbnew/netlist.cpp
View File

@ -373,7 +373,7 @@ void ReadPcbNetlist( WinEDA_PcbFrame* aFrame,
} }
aFrame->DrawPanel->Refresh(); aFrame->DrawPanel->Refresh();
aFrame->GetBoard()->Display_Infos( aFrame ); aFrame->GetBoard()->DisplayInfo( aFrame );
} }
@ -703,7 +703,7 @@ void TestFor_Duplicate_Missing_And_Extra_Footprints( wxWindow* aFrame,
if( aPcb->m_Modules == NULL ) if( aPcb->m_Modules == NULL )
{ {
DisplayInfo( aFrame, _( "No modules" ), 10 ); return; DisplayInfoMessage( aFrame, _( "No modules" ), 10 ); return;
} }
/* Construction de la liste des references des modules de la netliste */ /* Construction de la liste des references des modules de la netliste */

2
pcbnew/onleftclick.cpp
View File

@ -136,7 +136,7 @@ void WinEDA_PcbFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
{ {
int netcode = Select_High_Light( DC ); int netcode = Select_High_Light( DC );
if( netcode < 0 ) if( netcode < 0 )
GetBoard()->Display_Infos( this ); GetBoard()->DisplayInfo( this );
else else
Affiche_Infos_Equipot( netcode, this ); Affiche_Infos_Equipot( netcode, this );
} }

2
pcbnew/pcbframe.cpp
View File

@ -591,7 +591,7 @@ void WinEDA_PcbFrame::Show3D_Frame( wxCommandEvent& event )
{ {
if( m_Draw3DFrame ) if( m_Draw3DFrame )
{ {
DisplayInfo( this, _( "3D Frame already opened" ) ); DisplayInfoMessage( this, _( "3D Frame already opened" ) );
return; return;
} }

4
pcbnew/pcbplot.cpp
View File

@ -699,9 +699,9 @@ void WinEDA_PlotFrame::Plot( wxCommandEvent& event )
// Test for a reasonnable scale value // Test for a reasonnable scale value
if ( Scale_X < MIN_SCALE || Scale_Y < MIN_SCALE ) if ( Scale_X < MIN_SCALE || Scale_Y < MIN_SCALE )
DisplayInfo(this, _("Warning: Scale option set to a very small value") ); DisplayInfoMessage(this, _("Warning: Scale option set to a very small value") );
if ( Scale_X > MAX_SCALE || Scale_Y > MAX_SCALE ) if ( Scale_X > MAX_SCALE || Scale_Y > MAX_SCALE )
DisplayInfo(this, _("Warning: Scale option set to a very large value") ); DisplayInfoMessage(this, _("Warning: Scale option set to a very large value") );
int mask = 1; int mask = 1;
s_SelectedLayers = 0; s_SelectedLayers = 0;

4
pcbnew/ratsnest.cpp
View File

@ -122,7 +122,7 @@ void WinEDA_BasePcbFrame::Compile_Ratsnest( wxDC* DC, bool display_status_pcb )
msg.Printf( wxT( " %d" ), m_Pcb->m_Equipots.GetCount() ); msg.Printf( wxT( " %d" ), m_Pcb->m_Equipots.GetCount() );
Affiche_1_Parametre( this, 8, wxT( "Nets" ), msg, CYAN ); Affiche_1_Parametre( this, 8, wxT( "Nets" ), msg, CYAN );
reattribution_reference_piste( display_status_pcb ); reattribution_reference_piste( display_status_pcb );
/* Compute the full ratsnest /* Compute the full ratsnest
@ -147,7 +147,7 @@ void WinEDA_BasePcbFrame::Compile_Ratsnest( wxDC* DC, bool display_status_pcb )
DrawGeneralRatsnest( DC, 0 ); DrawGeneralRatsnest( DC, 0 );
if( display_status_pcb ) if( display_status_pcb )
m_Pcb->Display_Infos( this ); m_Pcb->DisplayInfo( this );
} }

4
pcbnew/sel_layer.cpp
View File

@ -239,7 +239,7 @@ void WinEDA_BasePcbFrame::SelectLayerPair()
wxString InfoMsg; wxString InfoMsg;
InfoMsg = _( "Less than two copper layers are being used." ); InfoMsg = _( "Less than two copper layers are being used." );
InfoMsg << wxT( "\n" ) << _( "Hence Layer Pairs cannot be specified." ); InfoMsg << wxT( "\n" ) << _( "Hence Layer Pairs cannot be specified." );
DisplayInfo( this, InfoMsg ); DisplayInfoMessage( this, InfoMsg );
return; return;
} }
@ -339,7 +339,7 @@ void WinEDA_SelLayerPairFrame::OnOkClick( wxCommandEvent& event )
// but could be a mistake. So display an info message // but could be a mistake. So display an info message
if( m_LayerId[m_LayerListTOP->GetSelection()] if( m_LayerId[m_LayerListTOP->GetSelection()]
== m_LayerId[m_LayerListBOTTOM->GetSelection()] ) == m_LayerId[m_LayerListBOTTOM->GetSelection()] )
DisplayInfo( this, _( "Warning: The Top Layer and Bottom Layer are same." ) ); DisplayInfoMessage( this, _( "Warning: The Top Layer and Bottom Layer are same." ) );
PCB_SCREEN* screen = (PCB_SCREEN*) m_Parent->GetScreen(); PCB_SCREEN* screen = (PCB_SCREEN*) m_Parent->GetScreen();

2
pcbnew/swap_layers.cpp
View File

@ -269,7 +269,7 @@ void WinEDA_SwapLayerFrame::Sel_Layer( wxCommandEvent& event )
{ {
wxString msg; wxString msg;
msg = _( "Deselect this layer to select the No Change state" ); msg = _( "Deselect this layer to select the No Change state" );
DisplayInfo( this, msg ); DisplayInfoMessage( this, msg );
return; return;
} }

4
pcbnew/undelete.cpp
View File

@ -60,7 +60,7 @@ void WinEDA_BasePcbFrame::UnDeleteItem( wxDC* DC )
test_1_net_connexion( DC, net_code ); test_1_net_connexion( DC, net_code );
#endif #endif
m_Pcb->Display_Infos( this ); m_Pcb->DisplayInfo( this );
break; break;
case TYPE_BOARD_ITEM_LIST: case TYPE_BOARD_ITEM_LIST:
@ -80,7 +80,7 @@ void WinEDA_BasePcbFrame::UnDeleteItem( wxDC* DC )
#if !defined(GERBVIEW) #if !defined(GERBVIEW)
test_1_net_connexion( DC, net_code ); test_1_net_connexion( DC, net_code );
#endif #endif
m_Pcb->Display_Infos( this ); m_Pcb->DisplayInfo( this );
break; break;
#if !defined(GERBVIEW) #if !defined(GERBVIEW)

6
pcbnew/zones_by_polygon.cpp
View File

@ -121,7 +121,7 @@ void WinEDA_PcbFrame::Delete_Zone_Fill( wxDC* DC, SEGZONE* aZone, long aTimestam
zone->DeleteStructure(); zone->DeleteStructure();
} }
} }
// Now delete the outlines of the corresponding copper areas // Now delete the outlines of the corresponding copper areas
for( int ii = 0; ii < GetBoard()->GetAreaCount(); ii++ ) for( int ii = 0; ii < GetBoard()->GetAreaCount(); ii++ )
{ {
@ -592,7 +592,7 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
// use the form of SetCurItem() which does not write to the msg panel, // use the form of SetCurItem() which does not write to the msg panel,
// SCREEN::SetCurItem(), so the DRC error remains on screen. // SCREEN::SetCurItem(), so the DRC error remains on screen.
// WinEDA_PcbFrame::SetCurItem() calls Display_Infos(). // WinEDA_PcbFrame::SetCurItem() calls DisplayInfo().
GetScreen()->SetCurItem( NULL ); GetScreen()->SetCurItem( NULL );
DisplayError( this, DisplayError( this,
_( "DRC error: this start point is inside or too close an other area" ) ); _( "DRC error: this start point is inside or too close an other area" ) );
@ -615,7 +615,7 @@ int WinEDA_PcbFrame::Begin_Zone( wxDC* DC )
|| !zone->IsOnCopperLayer() ) // Ok, we can add a new corner || !zone->IsOnCopperLayer() ) // Ok, we can add a new corner
{ {
zone->AppendCorner( GetScreen()->m_Curseur ); zone->AppendCorner( GetScreen()->m_Curseur );
SetCurItem( zone ); // calls Display_Infos(). SetCurItem( zone ); // calls DisplayInfo().
} }
} }
} }