From 5c8894f9289e6396001c30d3827a64fe41409953 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Tue, 12 Apr 2011 10:19:59 -0400 Subject: [PATCH] Coding policy fixes and other minor improvements. * Change class WinEDA_MsgPanel name to EDA_MSG_PANEL per coding policy. * Change some old set message panel code in PCBNew with updated message panel methods in EDA_DRAW_FRAME. * Remove unused global function Affiche_1_Parametre. * Minor Doxygen warning fixes. --- common/basicframe.cpp | 2 +- common/common.cpp | 8 --- common/drawframe.cpp | 4 +- common/msgpanel.cpp | 60 +++++++++------------- include/common.h | 21 +------- include/wxEeschemaStruct.h | 7 +-- include/wxstruct.h | 31 +++++++---- pcbnew/autoplac.cpp | 26 +++++----- pcbnew/clean.cpp | 8 +-- pcbnew/gen_modules_placefile.cpp | 10 ++-- pcbnew/pcbnew.cpp | 2 +- pcbnew/ratsnest.cpp | 10 ++-- pcbnew/solve.cpp | 43 +++++++--------- pcbnew/zones_by_polygon_fill_functions.cpp | 10 ++-- 14 files changed, 102 insertions(+), 140 deletions(-) diff --git a/common/basicframe.cpp b/common/basicframe.cpp index 5b7f19d169..05ff7cf521 100644 --- a/common/basicframe.cpp +++ b/common/basicframe.cpp @@ -38,7 +38,7 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* father, m_HToolBar = NULL; m_FrameIsActive = TRUE; - m_MsgFrameHeight = WinEDA_MsgPanel::GetRequiredHeight(); + m_MsgFrameHeight = EDA_MSG_PANEL::GetRequiredHeight(); minsize.x = 470; minsize.y = 350 + m_MsgFrameHeight; diff --git a/common/common.cpp b/common/common.cpp index a54bc49a5e..1e707d5362 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -666,14 +666,6 @@ void WinEDA_TextFrame::OnClose( wxCloseEvent& event ) } -void Affiche_1_Parametre( EDA_DRAW_FRAME* frame, int pos_X, - const wxString& texte_H, const wxString& texte_L, - int color ) -{ - frame->MsgPanel->Affiche_1_Parametre( pos_X, texte_H, texte_L, color ); -} - - int GetTimeStamp() { static int OldTimeStamp, NewTimeStamp; diff --git a/common/drawframe.cpp b/common/drawframe.cpp index 1f24a53424..b9209442f2 100644 --- a/common/drawframe.cpp +++ b/common/drawframe.cpp @@ -121,8 +121,8 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* father, int idtype, const wxString& ti m_FrameSize.y -= m_MsgFrameHeight; DrawPanel = new EDA_DRAW_PANEL( this, -1, wxPoint( 0, 0 ), m_FrameSize ); - MsgPanel = new WinEDA_MsgPanel( this, -1, wxPoint( 0, m_FrameSize.y ), - wxSize( m_FrameSize.x, m_MsgFrameHeight ) ); + MsgPanel = new EDA_MSG_PANEL( this, -1, wxPoint( 0, m_FrameSize.y ), + wxSize( m_FrameSize.x, m_MsgFrameHeight ) ); MsgPanel->SetBackgroundColour( wxColour( ColorRefs[LIGHTGRAY].m_Red, ColorRefs[LIGHTGRAY].m_Green, diff --git a/common/msgpanel.cpp b/common/msgpanel.cpp index 0d3710aed4..3705574319 100644 --- a/common/msgpanel.cpp +++ b/common/msgpanel.cpp @@ -12,13 +12,13 @@ #include "colors.h" -BEGIN_EVENT_TABLE( WinEDA_MsgPanel, wxPanel ) - EVT_PAINT( WinEDA_MsgPanel::OnPaint ) +BEGIN_EVENT_TABLE( EDA_MSG_PANEL, wxPanel ) + EVT_PAINT( EDA_MSG_PANEL::OnPaint ) END_EVENT_TABLE() -WinEDA_MsgPanel::WinEDA_MsgPanel( EDA_DRAW_FRAME* parent, int id, - const wxPoint& pos, const wxSize& size ) : +EDA_MSG_PANEL::EDA_MSG_PANEL( EDA_DRAW_FRAME* parent, int id, + const wxPoint& pos, const wxSize& size ) : wxPanel( parent, id, pos, size ) { m_Parent = parent; @@ -30,12 +30,12 @@ WinEDA_MsgPanel::WinEDA_MsgPanel( EDA_DRAW_FRAME* parent, int id, } -WinEDA_MsgPanel::~WinEDA_MsgPanel() +EDA_MSG_PANEL::~EDA_MSG_PANEL() { } -wxSize WinEDA_MsgPanel::computeFontSize() +wxSize EDA_MSG_PANEL::computeFontSize() { // Get size of the wxSYS_DEFAULT_GUI_FONT wxSize fontSizeInPixels; @@ -49,14 +49,14 @@ wxSize WinEDA_MsgPanel::computeFontSize() } -int WinEDA_MsgPanel::GetRequiredHeight() +int EDA_MSG_PANEL::GetRequiredHeight() { // make space for two rows of text plus a number of pixels between them. return 2 * computeFontSize().y + 0; } -wxSize WinEDA_MsgPanel::computeTextSize( const wxString& text ) +wxSize EDA_MSG_PANEL::computeTextSize( const wxString& text ) { // Get size of the wxSYS_DEFAULT_GUI_FONT wxSize textSizeInPixels; @@ -70,7 +70,7 @@ wxSize WinEDA_MsgPanel::computeTextSize( const wxString& text ) } -void WinEDA_MsgPanel::OnPaint( wxPaintEvent& event ) +void EDA_MSG_PANEL::OnPaint( wxPaintEvent& event ) { wxPaintDC dc( this ); @@ -87,9 +87,9 @@ void WinEDA_MsgPanel::OnPaint( wxPaintEvent& event ) event.Skip(); } -void WinEDA_MsgPanel::AppendMessage( const wxString& textUpper, - const wxString& textLower, - int color, int pad ) +void EDA_MSG_PANEL::AppendMessage( const wxString& textUpper, + const wxString& textLower, + int color, int pad ) { wxString text; wxSize drawSize = GetClientSize(); @@ -122,25 +122,14 @@ void WinEDA_MsgPanel::AppendMessage( const wxString& textUpper, } -/* - * Display a parameter in message panel. - * pos_X = horizontal position - * If pos_X < 0: horizontal position is the last - * Required value >= 0 - * Texte_H = text to be displayed in top line. - * Texte_L = text to be displayed in bottom line. - * Color = color display - */ -void WinEDA_MsgPanel::Affiche_1_Parametre( int pos_X, const wxString& texte_H, - const wxString& texte_L, int color ) +void EDA_MSG_PANEL::SetMessage( int aXPosition, const wxString& aUpperText, + const wxString& aLowerText, int aColor ) { - wxPoint pos; - wxSize drawSize = GetClientSize(); + wxPoint pos; + wxSize drawSize = GetClientSize(); - if( pos_X >= 0 ) - { - m_last_x = pos.x = pos_X * (m_fontSize.x + 2); - } + if( aXPosition >= 0 ) + m_last_x = pos.x = aXPosition * (m_fontSize.x + 2); else pos.x = m_last_x; @@ -151,14 +140,15 @@ void WinEDA_MsgPanel::Affiche_1_Parametre( int pos_X, const wxString& texte_H, item.m_UpperY = (drawSize.y / 2) - m_fontSize.y; item.m_LowerY = drawSize.y - m_fontSize.y; - item.m_UpperText = texte_H; - item.m_LowerText = texte_L; - item.m_Color = color; + item.m_UpperText = aUpperText; + item.m_LowerText = aLowerText; + item.m_Color = aColor; int ndx; // update the vector, which is sorted by m_X int limit = m_Items.size(); + for( ndx=0; ndx = 0 - * Texte_H = text to be displayed in top line. - * If "by posting on this line - * Texte_L = text to be displayed in bottom line. - * If "by posting on this line - * Color = color display - */ -void Affiche_1_Parametre( EDA_DRAW_FRAME* frame, - int pos_X, - const wxString& texte_H, - const wxString& texte_L, - int color ); - int GetTimeStamp(); int DisplayColorFrame( wxWindow* parent, int OldColor ); diff --git a/include/wxEeschemaStruct.h b/include/wxEeschemaStruct.h index f521ef706b..ac23d482ff 100644 --- a/include/wxEeschemaStruct.h +++ b/include/wxEeschemaStruct.h @@ -278,6 +278,7 @@ public: * @param aUse_netnames = bool. if true, use net names from labels in schematic * if false, use net numbers (net codes) * bool aUse_netnames is used only for Spice netlist + * @param aUsePrefix Prefix reference designator with an 'X' for spice output. * @return true if success. */ bool CreateNetlist( int aFormat, @@ -745,9 +746,9 @@ public: /** * Function SaveUndoItemInUndoList - * swaps the cloned item in #m_undoItem with \a aItem and saves it to the undo list - * then swap the data back. This swaps the internal structure of the item with the - * cloned item. It does not swap the actual item pointers themselves. + * swaps the cloned item in member variable m_undoItem with \a aItem and saves it to + * the undo list then swap the data back. This swaps the internal structure of the + * item with the cloned item. It does not swap the actual item pointers themselves. * * @param aItem The item to swap with the current undo item. */ diff --git a/include/wxstruct.h b/include/wxstruct.h index 3f0ba63497..40eabd12e1 100644 --- a/include/wxstruct.h +++ b/include/wxstruct.h @@ -37,7 +37,7 @@ class EDA_ITEM; class EDA_RECT; class EDA_DRAW_PANEL; -class WinEDA_MsgPanel; +class EDA_MSG_PANEL; class BASE_SCREEN; class WinEDA_Toolbar; class WinEDAChoiceBox; @@ -227,7 +227,7 @@ class EDA_DRAW_FRAME : public EDA_BASE_FRAME public: EDA_DRAW_PANEL* DrawPanel; // Draw area - WinEDA_MsgPanel* MsgPanel; // Panel used to display some + EDA_MSG_PANEL* MsgPanel; // Panel used to display some // info (bottom of the screen) WinEDA_Toolbar* m_VToolBar; // Vertical (right side) Toolbar WinEDA_Toolbar* m_AuxVToolBar; // Auxiliary Vertical (right side) @@ -602,13 +602,13 @@ public: /********************************************************* -* class WinEDA_MsgPanel : this is a panel to display various infos +* class EDA_MSG_PANEL : this is a panel to display various infos * and messages on items in eeschema an pcbnew *********************************************************/ /** * Struct MsgItem - * is used privately by WinEDA_MsgPanel as the item type of its vector. + * is used privately by EDA_MSG_PANEL as the item type of its vector. * These items are the pairs of text strings shown in the MsgPanel. */ struct MsgItem @@ -640,7 +640,7 @@ struct MsgItem }; -class WinEDA_MsgPanel : public wxPanel +class EDA_MSG_PANEL : public wxPanel { protected: std::vector m_Items; @@ -668,21 +668,32 @@ public: int m_BgColor; public: - WinEDA_MsgPanel( EDA_DRAW_FRAME* parent, int id, const wxPoint& pos, const wxSize& size ); - ~WinEDA_MsgPanel(); + EDA_MSG_PANEL( EDA_DRAW_FRAME* parent, int id, const wxPoint& pos, const wxSize& size ); + ~EDA_MSG_PANEL(); /** * Function GetRequiredHeight - * returns the required height (in pixels) of a WinEDA_MsgPanel. This takes + * returns the required height (in pixels) of a EDA_MSG_PANEL. This takes * into consideration the system gui font, wxSYS_DEFAULT_GUI_FONT. */ static int GetRequiredHeight(); void OnPaint( wxPaintEvent& event ); void EraseMsgBox(); - void Affiche_1_Parametre( int pos_X, const wxString& texte_H, - const wxString& texte_L, int color ); + + /** + * Function SetMessage + * sets a message at \a aXPosition to \a aUpperText and \a aLowerText in the message panel. + * + * @param aXPosition The horizontal position to display the message or less than zero + * to set the message using the last message position. + * @param aUpperText The text to be displayed in top line. + * @param aLowerText The text to be displayed in bottom line. + * @param aColor Color of the text to display. + */ + void SetMessage( int aXPosition, const wxString& aUpperText, + const wxString& aLowerText, int aColor ); /** * Append a message to the message panel. diff --git a/pcbnew/autoplac.cpp b/pcbnew/autoplac.cpp index 756520fa5f..bd46d6ff05 100644 --- a/pcbnew/autoplac.cpp +++ b/pcbnew/autoplac.cpp @@ -403,24 +403,23 @@ int PCB_EDIT_FRAME::GenPlaceBoard() MsgPanel->EraseMsgBox(); msg.Printf( wxT( "%d" ), Ncols ); - Affiche_1_Parametre( this, 1, _( "Cols" ), msg, GREEN ); + MsgPanel->SetMessage( 1, _( "Cols" ), msg, GREEN ); msg.Printf( wxT( "%d" ), Nrows ); - Affiche_1_Parametre( this, 7, _( "Lines" ), msg, GREEN ); + MsgPanel->SetMessage( 7, _( "Lines" ), msg, GREEN ); msg.Printf( wxT( "%d" ), NbCells ); - Affiche_1_Parametre( this, 14, _( "Cells." ), msg, YELLOW ); + MsgPanel->SetMessage( 14, _( "Cells." ), msg, YELLOW ); /* Choose the number of board sides. */ Nb_Sides = TWO_SIDES; - Affiche_1_Parametre( this, 22, wxT( "S" ), - ( Nb_Sides == TWO_SIDES ) ? wxT( "2" ) : wxT( "1" ), - WHITE ); + MsgPanel->SetMessage( 22, wxT( "S" ), ( Nb_Sides == TWO_SIDES ) ? wxT( "2" ) : wxT( "1" ), + WHITE ); Board.InitBoard(); /* Display memory usage. */ msg.Printf( wxT( "%d" ), Board.m_MemSize / 1024 ); - Affiche_1_Parametre( this, 24, wxT( "Mem(Kb)" ), msg, CYAN ); + MsgPanel->SetMessage( 24, wxT( "Mem(Kb)" ), msg, CYAN ); Route_Layer_BOTTOM = LAYER_N_FRONT; if( Nb_Sides == TWO_SIDES ) @@ -470,7 +469,7 @@ int PCB_EDIT_FRAME::GenPlaceBoard() while( ii ) { msg.Printf( wxT( "%d" ), jj++ ); - Affiche_1_Parametre( this, 50, _( "Loop" ), msg, CYAN ); + MsgPanel->SetMessage( 50, _( "Loop" ), msg, CYAN ); ii = Propagation( this ); } @@ -1121,8 +1120,8 @@ int Propagation( PCB_EDIT_FRAME* frame ) #define NO_CELL_ZONE (HOLE | CELL_is_EDGE | CELL_is_ZONE) wxString msg; - Affiche_1_Parametre( frame, 57, wxT( "Detect" ), msg, CYAN ); - Affiche_1_Parametre( frame, -1, wxEmptyString, wxT( "1" ), CYAN ); + frame->MsgPanel->SetMessage( 57, wxT( "Detect" ), msg, CYAN ); + frame->MsgPanel->SetMessage( -1, wxEmptyString, wxT( "1" ), CYAN ); // Alloc memory to handle 1 line or 1 colunmn on the routing matrix nn = MAX( Nrows, Ncols ) * sizeof(*pt_cell_V); @@ -1151,7 +1150,7 @@ int Propagation( PCB_EDIT_FRAME* frame ) } /* search 2 : from right to left and top to bottom */ - Affiche_1_Parametre( frame, -1, wxEmptyString, wxT( "2" ), CYAN ); + frame->MsgPanel->SetMessage( -1, wxEmptyString, wxT( "2" ), CYAN ); memset( pt_cell_V, 0, nn ); for( row = 0; row < Nrows; row++ ) { @@ -1174,7 +1173,7 @@ int Propagation( PCB_EDIT_FRAME* frame ) } /* search 3 : from bottom to top and right to left balayage */ - Affiche_1_Parametre( frame, -1, wxEmptyString, wxT( "3" ), CYAN ); + frame->MsgPanel->SetMessage( -1, wxEmptyString, wxT( "3" ), CYAN ); memset( pt_cell_V, 0, nn ); for( col = Ncols - 1; col >= 0; col-- ) { @@ -1197,8 +1196,9 @@ int Propagation( PCB_EDIT_FRAME* frame ) } /* search 4 : from bottom to top and left to right */ - Affiche_1_Parametre( frame, -1, wxEmptyString, wxT( "4" ), CYAN ); + frame->MsgPanel->SetMessage( -1, wxEmptyString, wxT( "4" ), CYAN ); memset( pt_cell_V, 0, nn ); + for( col = 0; col < Ncols; col++ ) { old_cell_H = 0; diff --git a/pcbnew/clean.cpp b/pcbnew/clean.cpp index a3df1254e4..6e98fc9e5c 100644 --- a/pcbnew/clean.cpp +++ b/pcbnew/clean.cpp @@ -744,10 +744,10 @@ static void Gen_Raccord_Track( PCB_EDIT_FRAME* frame, wxDC* DC ) oldpercent = percent; msg.Printf( wxT( "%d" ), frame->GetBoard()->m_Track.GetCount() ); - Affiche_1_Parametre( frame, POS_AFF_MAX, wxT( "Max" ), msg, GREEN ); + frame->MsgPanel->SetMessage( POS_AFF_MAX, wxT( "Max" ), msg, GREEN ); msg.Printf( wxT( "%d" ), ii ); - Affiche_1_Parametre( frame, POS_AFF_NUMSEGM, wxT( "Segm" ), msg, CYAN ); + frame->MsgPanel->SetMessage( POS_AFF_NUMSEGM, wxT( "Segm" ), msg, CYAN ); } if( frame->DrawPanel->m_AbortRequest ) @@ -787,7 +787,7 @@ static void Gen_Raccord_Track( PCB_EDIT_FRAME* frame, wxDC* DC ) nn++; msg.Printf( wxT( "%d" ), nn ); - Affiche_1_Parametre( frame, POS_AFF_VAR, wxT( "New <" ), msg, YELLOW ); + frame->MsgPanel->SetMessage( POS_AFF_VAR, wxT( "New <" ), msg, YELLOW ); // create a new segment and insert it next to "other", then shorten other. newTrack = other->Copy(); @@ -834,7 +834,7 @@ static void Gen_Raccord_Track( PCB_EDIT_FRAME* frame, wxDC* DC ) nn++; msg.Printf( wxT( "%d" ), nn ); - Affiche_1_Parametre( frame, POS_AFF_VAR, wxT( "New >" ), msg, YELLOW ); + frame->MsgPanel->SetMessage( POS_AFF_VAR, wxT( "New >" ), msg, YELLOW ); // create a new segment and insert it next to "other", then shorten other. newTrack = other->Copy(); diff --git a/pcbnew/gen_modules_placefile.cpp b/pcbnew/gen_modules_placefile.cpp index 39609ffc2b..6c831b8fd9 100644 --- a/pcbnew/gen_modules_placefile.cpp +++ b/pcbnew/gen_modules_placefile.cpp @@ -177,16 +177,14 @@ void PCB_EDIT_FRAME::GenModulesPosition( wxCommandEvent& event ) switchedLocale = true; // Display results - MsgPanel->EraseMsgBox(); - Affiche_1_Parametre( this, 0, _( "Component side place file:" ), - fnFront.GetFullPath(), BLUE ); + ClearMsgPanel(); + AppendMsgPanel( _( "Component side place file:" ), fnFront.GetFullPath(), BLUE ); if( doBoardBack ) - Affiche_1_Parametre( this, 32, _( "Copper side place file:" ), - fnBack.GetFullPath(), BLUE ); + AppendMsgPanel( _( "Copper side place file:" ), fnBack.GetFullPath(), BLUE ); msg.Empty(); msg << moduleCount; - Affiche_1_Parametre( this, 65, _( "Module count" ), msg, RED ); + AppendMsgPanel( _( "Module count" ), msg, RED ); // Sort the list of modules alphabetically Liste = (LIST_MOD*) MyZMalloc( moduleCount * sizeof(LIST_MOD) ); diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index 1a05bc125f..be597bf77a 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -161,7 +161,7 @@ Changing extension to .brd." ), GetChars( fn.GetFullPath() ) ); frame->OnModify(); // Ready to save the new empty board wxString msg; - msg.Printf( _( "File <%s> not existing\nThis is normal for a new project" ), + msg.Printf( _( "File <%s> does not exist.\nThis is normal for a new project" ), GetChars( frame->GetScreen()->GetFileName() ) ); wxMessageBox( msg ); } diff --git a/pcbnew/ratsnest.cpp b/pcbnew/ratsnest.cpp index 50b97f66f8..d616f72bdc 100644 --- a/pcbnew/ratsnest.cpp +++ b/pcbnew/ratsnest.cpp @@ -120,7 +120,7 @@ void PCB_BASE_FRAME::Compile_Ratsnest( wxDC* aDC, bool aDisplayStatus ) GetBoard()->m_Status_Pcb = 0; /* we want a full ratsnest computation, * from the scratch */ - MsgPanel->EraseMsgBox(); + ClearMsgPanel(); // Rebuild the full pads and net info list RecalculateAllTracksNetcode(); @@ -128,13 +128,9 @@ void PCB_BASE_FRAME::Compile_Ratsnest( wxDC* aDC, bool aDisplayStatus ) if( aDisplayStatus ) { msg.Printf( wxT( " %d" ), m_Pcb->GetPadsCount() ); - Affiche_1_Parametre( this, 1, wxT( "pads" ), msg, RED ); - } - - if( aDisplayStatus ) - { + AppendMsgPanel( wxT( "Pads" ), msg, RED ); msg.Printf( wxT( " %d" ), m_Pcb->m_NetInfo->GetCount() ); - Affiche_1_Parametre( this, 8, wxT( "Nets" ), msg, CYAN ); + AppendMsgPanel( wxT( "Nets" ), msg, CYAN ); } /* Compute the full ratsnest diff --git a/pcbnew/solve.cpp b/pcbnew/solve.cpp index 779cf6e40b..45d0f022a2 100644 --- a/pcbnew/solve.cpp +++ b/pcbnew/solve.cpp @@ -231,20 +231,15 @@ int PCB_EDIT_FRAME::Solve( wxDC* DC, int two_sides ) int row_source, col_source, row_target, col_target; int success, nbsucces = 0, nbunsucces = 0; NETINFO_ITEM* net; - bool stop = FALSE; + bool stop = false; wxString msg; - DrawPanel->m_AbortRequest = FALSE; + DrawPanel->m_AbortRequest = false; DrawPanel->m_AbortEnable = true; s_Clearance = GetBoard()->m_NetClasses.GetDefault()->GetClearance(); Ncurrent = 0; - MsgPanel->EraseMsgBox(); - msg.Printf( wxT( "%d " ), GetBoard()->m_NbNoconnect ); - Affiche_1_Parametre( this, 72, wxT( "NoConn" ), msg, CYAN ); - - /* go until no more work to do */ GetWork( &row_source, &col_source, ¤t_net_code, &row_target, &col_target, &pt_cur_ch ); // First net to route. @@ -256,6 +251,7 @@ int PCB_EDIT_FRAME::Solve( wxDC* DC, int two_sides ) { /* Test to stop routing ( escape key pressed ) */ wxYield(); + if( DrawPanel->m_AbortRequest ) { if( IsOK( this, _( "Abort routing?" ) ) ) @@ -268,25 +264,24 @@ int PCB_EDIT_FRAME::Solve( wxDC* DC, int two_sides ) DrawPanel->m_AbortRequest = 0; } + EraseMsgBox(); + Ncurrent++; net = GetBoard()->FindNet( current_net_code ); + if( net ) { msg.Printf( wxT( "[%8.8s]" ), GetChars( net->GetNetname() ) ); - Affiche_1_Parametre( this, 1, wxT( "Net route" ), msg, BROWN ); + AppendMsgPanel( wxT( "Net route" ), msg, BROWN ); msg.Printf( wxT( "%d / %d" ), Ncurrent, Ntotal ); - Affiche_1_Parametre( this, 12, wxT( "Activity" ), msg, BROWN ); + AppendMsgPanel( wxT( "Activity" ), msg, BROWN ); } pt_cur_ch = pt_cur_ch; - segm_oX = GetBoard()->m_BoundaryBox.m_Pos.x + - (Board.m_GridRouting * col_source); - segm_oY = GetBoard()->m_BoundaryBox.m_Pos.y + - (Board.m_GridRouting * row_source); - segm_fX = GetBoard()->m_BoundaryBox.m_Pos.x + - (Board.m_GridRouting * col_target); - segm_fY = GetBoard()->m_BoundaryBox.m_Pos.y + - (Board.m_GridRouting * row_target); + segm_oX = GetBoard()->m_BoundaryBox.m_Pos.x + (Board.m_GridRouting * col_source); + segm_oY = GetBoard()->m_BoundaryBox.m_Pos.y + (Board.m_GridRouting * row_source); + segm_fX = GetBoard()->m_BoundaryBox.m_Pos.x + (Board.m_GridRouting * col_target); + segm_fY = GetBoard()->m_BoundaryBox.m_Pos.y + (Board.m_GridRouting * row_target); /* Draw segment. */ GRLine( &DrawPanel->m_ClipBox, @@ -329,12 +324,12 @@ int PCB_EDIT_FRAME::Solve( wxDC* DC, int two_sides ) break; } - msg.Printf( wxT( "%d " ), nbsucces ); - Affiche_1_Parametre( this, 22, wxT( "Ok" ), msg, GREEN ); - msg.Printf( wxT( "%d " ), nbunsucces ); - Affiche_1_Parametre( this, 30, wxT( "Fail" ), msg, RED ); - msg.Printf( wxT( "%d " ), GetBoard()->m_NbNoconnect ); - Affiche_1_Parametre( this, 38, wxT( "NoConn" ), msg, CYAN ); + msg.Printf( wxT( "%d" ), nbsucces ); + AppendMsgPanel( wxT( "Ok" ), msg, GREEN ); + msg.Printf( wxT( "%d" ), nbunsucces ); + AppendMsgPanel( wxT( "Fail" ), msg, RED ); + msg.Printf( wxT( " %d" ), GetBoard()->m_NbNoconnect ); + AppendMsgPanel( wxT( "Not Connectd" ), msg, CYAN ); /* Delete routing from display. */ pt_cur_ch->m_PadStart->Draw( DrawPanel, DC, GR_AND ); @@ -344,7 +339,7 @@ int PCB_EDIT_FRAME::Solve( wxDC* DC, int two_sides ) break; } - DrawPanel->m_AbortEnable = FALSE; + DrawPanel->m_AbortEnable = false; return SUCCESS; } diff --git a/pcbnew/zones_by_polygon_fill_functions.cpp b/pcbnew/zones_by_polygon_fill_functions.cpp index c6cef82877..516905aec8 100644 --- a/pcbnew/zones_by_polygon_fill_functions.cpp +++ b/pcbnew/zones_by_polygon_fill_functions.cpp @@ -85,10 +85,6 @@ void PCB_EDIT_FRAME::Delete_Zone_Fill( SEGZONE* aZone, long aTimestamp ) } -/***************************************************************************************/ -int PCB_EDIT_FRAME::Fill_Zone( ZONE_CONTAINER* zone_container, bool verbose ) -/***************************************************************************************/ - /** * Function Fill_Zone * Calculate the zone filling for the outline zone_container @@ -99,10 +95,11 @@ int PCB_EDIT_FRAME::Fill_Zone( ZONE_CONTAINER* zone_container, bool verbose ) * @param verbose = true to show error messages * @return error level (0 = no error) */ +int PCB_EDIT_FRAME::Fill_Zone( ZONE_CONTAINER* zone_container, bool verbose ) { wxString msg; - MsgPanel->EraseMsgBox(); + ClearMsgPanel(); if( GetBoard()->ComputeBoundingBox() == false ) { @@ -117,7 +114,8 @@ int PCB_EDIT_FRAME::Fill_Zone( ZONE_CONTAINER* zone_container, bool verbose ) if( msg.IsEmpty() ) msg = wxT( "No net" ); - Affiche_1_Parametre( this, 22, _( "NetName" ), msg, RED ); + + AppendMsgPanel( _( "NetName" ), msg, RED ); wxBusyCursor dummy; // Shows an hourglass cursor (removed by its destructor)