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

draw only in OnPaint

This commit is contained in:
dickelbeck 2008-03-31 13:46:00 +00:00
parent 4cf118ea0b
commit ec4cbb79ed
3 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
change_log.txt
View File

@ -5,6 +5,13 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
email address.
2008-Mar-31 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
+all
Tweaked class MsgPanel so that the screen drawing only happens from
its OnPaint() function.
2008-Mar-30 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+eeschema
@ -16,7 +23,6 @@ email address.
Added comments in gestfich.cpp to explain the default paths used by kicad to find help files and lib files
2008-Mar-30 UPDATE Jonas Diemer <diemer-at-gmx.de>
================================================================================
+eeschema
@ -50,7 +56,7 @@ email address.
+eeschema
Removed an very old bug in onrightclick.cpp which crashes eeschema when
right clicking in a field inside a component.
Old code should never works, but ...
Old code should never works, but ...
2008-Mar-20 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>

88
common/msgpanel.cpp
View File

@ -29,12 +29,12 @@ WinEDA_MsgPanel::WinEDA_MsgPanel( WinEDA_DrawFrame* parent, int id,
{
m_Parent = parent;
SetFont( *g_MsgFont );
m_last_x = 0;
}
WinEDA_MsgPanel::~WinEDA_MsgPanel()
{
m_Items.clear();
}
@ -44,18 +44,18 @@ void WinEDA_MsgPanel::OnPaint( wxPaintEvent& event )
{
wxPaintDC dc( this );
//EraseMsgBox( &dc );
erase( &dc );
dc.SetBackground( *wxBLACK_BRUSH );
dc.SetBackgroundMode( wxSOLID );
dc.SetTextBackground( GetBackgroundColour() );
dc.SetFont( *g_MsgFont );
for( unsigned i=0; i<m_Items.size(); ++i )
showItem( dc, m_Items[i] );
event.Skip();
}
@ -77,44 +77,41 @@ void WinEDA_MsgPanel::Affiche_1_Parametre( int pos_X, const wxString& texte_H,
* color = couleur d'affichage
*/
{
static int old_pos_X;
wxPoint pos;
wxSize FontSizeInPixels, DrawSize;
wxPoint pos;
wxSize drawSize = GetClientSize();
wxClientDC dc( this );
DrawSize = GetClientSize();
// Get size of the font
wxSize fontSizeInPixels;
{
wxClientDC dc( this );
dc.SetBackground( *wxBLACK_BRUSH );
dc.SetBackgroundMode( wxSOLID );
dc.SetTextBackground( GetBackgroundColour() );
dc.SetFont( *g_MsgFont );
dc.GetTextExtent( wxT( "W" ), &FontSizeInPixels.x, &FontSizeInPixels.y );
dc.SetFont( *g_MsgFont );
dc.GetTextExtent( wxT( "W" ), &fontSizeInPixels.x, &fontSizeInPixels.y );
} // destroy wxClientDC ASAP
if( pos_X >= 0 )
{
old_pos_X = pos.x = pos_X * (FontSizeInPixels.x + 2);
m_last_x = pos.x = pos_X * (fontSizeInPixels.x + 2);
}
else
pos.x = old_pos_X;
pos.x = m_last_x;
MsgItem item;
item.m_X = pos.x;
item.m_UpperY = (DrawSize.y / 2) - FontSizeInPixels.y;
item.m_LowerY = DrawSize.y - FontSizeInPixels.y;
item.m_UpperY = (drawSize.y / 2) - fontSizeInPixels.y;
item.m_LowerY = drawSize.y - fontSizeInPixels.y;
item.m_UpperText = texte_H;
item.m_LowerText = texte_L;
item.m_Color = color;
int ndx;
// update the vector, which is sorted by m_X
// update the vector, which is sorted by m_X
int limit = m_Items.size();
for( ndx=0; ndx<limit; ++ndx )
{
@ -124,31 +121,31 @@ void WinEDA_MsgPanel::Affiche_1_Parametre( int pos_X, const wxString& texte_H,
m_Items[ndx] = item;
break;
}
if( m_Items[ndx].m_X > item.m_X )
{
m_Items.insert( m_Items.begin()+ndx, item );
break;
}
}
if( ndx==limit ) // mutually exclusive with two above if tests
{
m_Items.push_back( item );
}
showItem( dc, item );
Refresh();
}
void WinEDA_MsgPanel::showItem( wxDC& dc, const MsgItem& aItem )
{
int color = aItem.m_Color;
if( color >= 0 )
{
color &= MASKCOLOR;
dc.SetTextForeground( wxColour( ColorRefs[color].m_Red,
dc.SetTextForeground( wxColour( ColorRefs[color].m_Red,
ColorRefs[color].m_Green,
ColorRefs[color].m_Blue ) );
}
@ -157,7 +154,7 @@ void WinEDA_MsgPanel::showItem( wxDC& dc, const MsgItem& aItem )
{
dc.DrawText( aItem.m_UpperText.GetData(), aItem.m_X, aItem.m_UpperY );
}
if( !aItem.m_LowerText.IsEmpty() )
{
dc.DrawText( aItem.m_LowerText.GetData(), aItem.m_X, aItem.m_LowerY );
@ -168,39 +165,34 @@ void WinEDA_MsgPanel::showItem( wxDC& dc, const MsgItem& aItem )
/****************************************/
void WinEDA_MsgPanel::EraseMsgBox()
/****************************************/
/* Effacement de la fenetre d'affichage des messages de bas d'ecran
*/
{
wxClientDC dc( this );
EraseMsgBox( &dc );
m_Items.clear();
m_last_x = 0;
Refresh();
}
/*******************************************/
void WinEDA_MsgPanel::EraseMsgBox( wxDC* DC )
void WinEDA_MsgPanel::erase( wxDC* DC )
/*******************************************/
{
wxSize size;
wxColor color;
wxPen pen;
wxBrush brush;
size = GetClientSize();
color = GetBackgroundColour();
wxSize size = GetClientSize();
wxColor color = GetBackgroundColour();
pen.SetColour( color );
brush.SetColour( color );
brush.SetStyle( wxSOLID );
DC->SetPen( pen );
DC->SetBrush( brush );
DC->DrawRectangle( 0, 0, size.x, size.y );
DC->SetBrush( wxNullBrush );
DC->SetPen( wxNullPen );
m_Items.clear();
}

9
include/wxstruct.h
View File

@ -192,6 +192,8 @@ public:
class WinEDA_DrawFrame : public WinEDA_BasicFrame
{
public:
WinEDA_DrawPanel* DrawPanel; // Draw area
WinEDA_MsgPanel* MsgPanel; // Zone d'affichage de caracteristiques
@ -541,8 +543,12 @@ class WinEDA_MsgPanel : public wxPanel
{
protected:
std::vector<MsgItem> m_Items;
int m_last_x; ///< the last used x coordinate
void showItem( wxDC& dc, const MsgItem& aItem );
void showItem( wxDC& dc, const MsgItem& aItem );
void erase( wxDC* DC );
public:
WinEDA_DrawFrame* m_Parent;
@ -556,7 +562,6 @@ public:
void OnPaint( wxPaintEvent& event );
void EraseMsgBox();
void EraseMsgBox( wxDC* DC );
void Affiche_1_Parametre( int pos_X, const wxString& texte_H,
const wxString& texte_L, int color );