Skip to content

K
kicad-source-mirror
Commit c5b42440 authored by dickelbeck's avatar dickelbeck
Browse files
Options

dirty rectangle screening, pending EDA_BaseStruct::GetBoundingBox()

parent 0f0ced37
Show whitespace changes
Inline Side-by-side
Showing with 460 additions and 398 deletions
eeschema/eeredraw.cpp
View file @ c5b42440
...@@ -16,131 +16,136 @@ ...@@ -16,131 +16,136 @@
#include "schframe.h" #include "schframe.h"
char marq_bitmap[]= char marq_bitmap[] =
{ {
12, 12, 0, 0, /* Dimensions x et y, offsets x et y du bitmap de marqueurs*/ 12, 12, 0, 0, /* Dimensions x et y, offsets x et y du bitmap de marqueurs*/
YELLOW, /* Couleur */ YELLOW, /* Couleur */
1,1,1,1,1,1,1,1,0,0,0,0, /* bitmap: >= 1 : color, 0 = notrace */ 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, /* bitmap: >= 1 : color, 0 = notrace */
1,1,1,0,1,0,1,1,0,0,0,0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0,
1,1,1,1,0,0,0,1,0,0,0,0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0,
1,0,1,1,1,0,0,0,0,0,0,0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
1,1,0,1,1,1,0,0,0,0,0,0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
1,1,0,0,1,1,1,0,0,0,0,0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
1,1,1,0,0,1,1,1,0,0,0,0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0,
0,0,0,0,0,0,1,1,1,0,0,0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
0,0,0,0,0,0,0,1,1,1,0,0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
0,0,0,0,0,0,0,0,1,1,1,0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
0,0,0,0,0,0,0,0,0,1,1,1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
0,0,0,0,0,0,0,0,0,0,1,0 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0
}; };
char marqERC_bitmap[]= char marqERC_bitmap[] =
{ {
8, 8, 0, 0, /* Dimensions x et y , offsets x et y du bitmap de marqueurs*/ 8, 8, 0, 0, /* Dimensions x et y , offsets x et y du bitmap de marqueurs*/
-1, /* Color: -1 = couleur non pr�cis�e */ -1, /* Color: -1 = couleur non pr�cis�e */
1,1,1,1,1,0,0,0, 1, 1, 1, 1, 1, 0, 0, 0,
1,1,1,0,1,0,0,0, 1, 1, 1, 0, 1, 0, 0, 0,
1,1,1,1,0,0,0,0, 1, 1, 1, 1, 0, 0, 0, 0,
1,0,1,1,1,0,0,0, 1, 0, 1, 1, 1, 0, 0, 0,
1,1,0,1,1,1,0,0, 1, 1, 0, 1, 1, 1, 0, 0,
0,0,0,0,1,1,1,0, 0, 0, 0, 0, 1, 1, 1, 0,
0,0,0,0,0,1,1,1, 0, 0, 0, 0, 0, 1, 1, 1,
0,0,0,0,0,0,1,0, 0, 0, 0, 0, 0, 0, 1, 0,
}; };
static EDA_BaseStruct *HighLightStruct = NULL; static EDA_BaseStruct* HighLightStruct = NULL;
/************************************************************/ /************************************************************/
void DrawDanglingSymbol(WinEDA_DrawPanel * panel,wxDC * DC, void DrawDanglingSymbol( WinEDA_DrawPanel* panel, wxDC* DC,
const wxPoint & pos, int Color) const wxPoint& pos, int Color )
/************************************************************/ /************************************************************/
{ {
#define DANGLING_SYMBOL_SIZE 12 #define DANGLING_SYMBOL_SIZE 12
if ( ! g_IsPrinting ) // Draw but do not print the Dangling Symbol */ if( !g_IsPrinting ) // Draw but do not print the Dangling Symbol */
{ {
GRRect(&panel->m_ClipBox, DC, GRRect( &panel->m_ClipBox, DC,
pos.x - DANGLING_SYMBOL_SIZE, pos.y - DANGLING_SYMBOL_SIZE, pos.x - DANGLING_SYMBOL_SIZE, pos.y - DANGLING_SYMBOL_SIZE,
pos.x + DANGLING_SYMBOL_SIZE, pos.y + DANGLING_SYMBOL_SIZE, pos.x + DANGLING_SYMBOL_SIZE, pos.y + DANGLING_SYMBOL_SIZE,
0, Color); 0, Color );
} }
} }
/*************************************************/ /*************************************************/
void SetHighLightStruct(EDA_BaseStruct *HighLight) void SetHighLightStruct( EDA_BaseStruct* HighLight )
/*************************************************/ /*************************************************/
{ {
HighLightStruct = HighLight; HighLightStruct = HighLight;
} }
/**********************************************************************/ /**********************************************************************/
void WinEDA_SchematicFrame::RedrawActiveWindow(wxDC * DC, bool EraseBg) void WinEDA_SchematicFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
/**********************************************************************/ /**********************************************************************/
/* /*
Redraws only the active window which is assumed to be whole visible. * Redraws only the active window which is assumed to be whole visible.
*/ */
{ {
wxString title; wxString title;
if( GetScreen() == NULL ) return;
if( GetScreen() == NULL )
return;
ActiveScreen = GetScreen(); ActiveScreen = GetScreen();
/* Forcage de la reinit de la brosse et plume courante */ /* Forcage de la reinit de la brosse et plume courante */
GRResetPenAndBrush(DC); GRResetPenAndBrush( DC );
DC->SetBackground(*wxBLACK_BRUSH); DC->SetBackground( *wxBLACK_BRUSH );
DC->SetBackgroundMode(wxTRANSPARENT); DC->SetBackgroundMode( wxTRANSPARENT );
DrawPanel->CursorOff(DC); // effacement curseur DrawPanel->CursorOff( DC ); // effacement curseur
if(DrawPanel->ManageCurseur) if( DrawPanel->ManageCurseur )
{ {
DrawPanel->ManageCurseur(DrawPanel, DC, FALSE); DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
} }
if ( EraseBg ) DrawPanel->EraseScreen(DC); if( EraseBg )
DrawPanel->EraseScreen( DC );
DrawPanel->DrawBackGround(DC); DrawPanel->DrawBackGround( DC );
RedrawStructList(DrawPanel, DC, GetScreen()->EEDrawList, GR_DEFAULT_DRAWMODE); RedrawStructList( DrawPanel, DC, GetScreen()->EEDrawList, GR_DEFAULT_DRAWMODE );
TraceWorkSheet(DC, GetScreen(), g_DrawMinimunLineWidth ); TraceWorkSheet( DC, GetScreen(), g_DrawMinimunLineWidth );
DrawPanel->CursorOn(DC); // reaffichage curseur DrawPanel->CursorOn( DC ); // reaffichage curseur
if(DrawPanel->ManageCurseur) if( DrawPanel->ManageCurseur )
{ {
DrawPanel->ManageCurseur(DrawPanel, DC, FALSE); DrawPanel->ManageCurseur( DrawPanel, DC, FALSE );
} }
Affiche_Status_Box(); Affiche_Status_Box();
GetScreen()->ClrRefreshReq(); GetScreen()->ClrRefreshReq();
if( GetScreen()->m_FileName == g_DefaultSchematicFileName ) if( GetScreen()->m_FileName == g_DefaultSchematicFileName )
{ {
wxString msg = g_Main_Title + wxT(" ") + GetBuildVersion(); wxString msg = g_Main_Title + wxT( " " ) + GetBuildVersion();
title.Printf( wxT("%s [%s]"), msg.GetData(),GetScreen()->m_FileName.GetData()); title.Printf( wxT( "%s [%s]" ), msg.GetData(), GetScreen()->m_FileName.GetData() );
SetTitle(title); SetTitle( title );
} }
else else
{ {
title.Printf( wxT("[%s]"), GetScreen()->m_FileName.GetData()); title.Printf( wxT( "[%s]" ), GetScreen()->m_FileName.GetData() );
SetTitle(title); SetTitle( title );
} }
} }
/*******************************************************************************/ /*******************************************************************************/
void WinEDA_DrawPanel::PrintPage(wxDC * DC, bool Print_Sheet_Ref, int PrintMask) void WinEDA_DrawPanel::PrintPage( wxDC* DC, bool Print_Sheet_Ref, int PrintMask )
/*******************************************************************************/ /*******************************************************************************/
{ {
BASE_SCREEN * screen; BASE_SCREEN* screen;
wxBeginBusyCursor(); wxBeginBusyCursor();
ActiveScreen = screen = m_Parent->GetScreen(); ActiveScreen = screen = m_Parent->GetScreen();
RedrawStructList(this,DC, screen->EEDrawList, GR_COPY); RedrawStructList( this, DC, screen->EEDrawList, GR_COPY );
if ( Print_Sheet_Ref ) if( Print_Sheet_Ref )
m_Parent->TraceWorkSheet(DC, screen, g_DrawMinimunLineWidth ); m_Parent->TraceWorkSheet( DC, screen, g_DrawMinimunLineWidth );
wxEndBusyCursor(); wxEndBusyCursor();
} }
...@@ -150,78 +155,98 @@ BASE_SCREEN * screen; ...@@ -150,78 +155,98 @@ BASE_SCREEN * screen;
* Routine to redraw list of structs. * * Routine to redraw list of structs. *
* If the list is of DrawPickStruct types then the picked item are drawn. * * If the list is of DrawPickStruct types then the picked item are drawn. *
*****************************************************************************/ *****************************************************************************/
void RedrawStructList(WinEDA_DrawPanel * panel, wxDC * DC, void RedrawStructList( WinEDA_DrawPanel* panel, wxDC* DC,
EDA_BaseStruct *Structs, int DrawMode, int Color) EDA_BaseStruct* Structs, int DrawMode, int Color )
{ {
while (Structs)
#if 0
// enable this when we have virtual GetBoundingBox():
wxRegion upd = panel->GetUpdateRegion(); // get the update rect list
// get the union of all rectangles in the update region, 'upd'
wxRect dirtyRects = upd.GetBox();
EDA_Rect boxtest;
#endif
while( Structs )
{
if( Structs->Type() == DRAW_PICK_ITEM_STRUCT_TYPE )
{ {
if (Structs->Type() == DRAW_PICK_ITEM_STRUCT_TYPE) EDA_BaseStruct* item = ( (DrawPickedStruct*) Structs )->m_PickedStruct;
// if( dirtyRects.Intersects( item->GetBoundingBox() ) )
{ {
RedrawOneStruct(panel, DC, RedrawOneStruct( panel, DC, item, DrawMode, Color );
((DrawPickedStruct *) Structs)->m_PickedStruct, }
DrawMode, Color);
} }
else else
{ {
if ( ! (Structs->m_Flags & IS_MOVED) ) if( !(Structs->m_Flags & IS_MOVED) )
RedrawOneStruct(panel, DC, Structs, DrawMode, Color); {
// if( dirtyRects.Intersects( Structs->GetBoundingBox() ) )
RedrawOneStruct( panel, DC, Structs, DrawMode, Color );
}
} }
Structs = Structs->Pnext; Structs = Structs->Pnext;
} }
} }
/***************************************************************************** /*****************************************************************************
* Routine to redraw list of structs. * * Routine to redraw list of structs. *
*****************************************************************************/ *****************************************************************************/
void RedrawOneStruct(WinEDA_DrawPanel * panel, wxDC * DC, void RedrawOneStruct( WinEDA_DrawPanel* panel, wxDC* DC,
EDA_BaseStruct *Struct, int DrawMode, int Color) EDA_BaseStruct* Struct, int DrawMode, int Color )
{ {
if( Struct == NULL )
return;
if ( Struct == NULL ) return; if( HighLightStruct == Struct )
if (HighLightStruct == Struct) Color = HIGHLIGHT_COLOR; Color = HIGHLIGHT_COLOR;
Struct->Draw(panel, DC, wxPoint(0,0), DrawMode, Color); Struct->Draw( panel, DC, wxPoint( 0, 0 ), DrawMode, Color );
} }
/*****************************************************************************************/ /*****************************************************************************************/
void EDA_DrawLineStruct::Draw(WinEDA_DrawPanel * panel,wxDC * DC, const wxPoint & offset, void EDA_DrawLineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
int DrawMode, int Color) int DrawMode, int Color )
/*****************************************************************************************/ /*****************************************************************************************/
/* Draw wires, Bus, and dashed liges.. */ /* Draw wires, Bus, and dashed liges.. */
{ {
int color; int color;
int zoom = panel->GetZoom(); int zoom = panel->GetZoom();
int width = MAX(m_Width, g_DrawMinimunLineWidth); int width = MAX( m_Width, g_DrawMinimunLineWidth );
if( Color >= 0 ) color = Color; if( Color >= 0 )
else color = ReturnLayerColor(m_Layer); color = Color;
GRSetDrawMode(DC, DrawMode); else
color = ReturnLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );
if( (m_Layer == LAYER_BUS) && (zoom <= 16) ) if( (m_Layer == LAYER_BUS) && (zoom <= 16) )
width *= 3; width *= 3;
if( m_Layer == LAYER_NOTES) if( m_Layer == LAYER_NOTES )
GRDashedLine(&panel->m_ClipBox, DC, m_Start.x + offset.x, m_Start.y + offset.y, GRDashedLine( &panel->m_ClipBox, DC, m_Start.x + offset.x, m_Start.y + offset.y,
m_End.x + offset.x, m_End.y + offset.y, width, color); m_End.x + offset.x, m_End.y + offset.y, width, color );
else else
GRLine(&panel->m_ClipBox, DC, m_Start.x + offset.x, m_Start.y + offset.y, GRLine( &panel->m_ClipBox, DC, m_Start.x + offset.x, m_Start.y + offset.y,
m_End.x + offset.x, m_End.y + offset.y, width, color); m_End.x + offset.x, m_End.y + offset.y, width, color );
if ( m_StartIsDangling ) if( m_StartIsDangling )
DrawDanglingSymbol(panel, DC, m_Start + offset, color); DrawDanglingSymbol( panel, DC, m_Start + offset, color );
if ( m_EndIsDangling ) if( m_EndIsDangling )
DrawDanglingSymbol(panel, DC, m_End + offset, color); DrawDanglingSymbol( panel, DC, m_End + offset, color );
} }
/****************************************************************************************/ /****************************************************************************************/
void DrawMarkerStruct::Draw(WinEDA_DrawPanel * panel,wxDC * DC, const wxPoint & offset, void DrawMarkerStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
int DrawMode, int Color) int DrawMode, int Color )
/****************************************************************************************/ /****************************************************************************************/
{ {
#define WAR 1 // utilis� aussi dans erc.cpp #define WAR 1 // utilis� aussi dans erc.cpp
...@@ -229,193 +254,226 @@ void DrawMarkerStruct::Draw(WinEDA_DrawPanel * panel,wxDC * DC, const wxPoint & ...@@ -229,193 +254,226 @@ void DrawMarkerStruct::Draw(WinEDA_DrawPanel * panel,wxDC * DC, const wxPoint &
if( m_Type == MARQ_ERC ) if( m_Type == MARQ_ERC )
{ {
int color = Color; int color = Color;
if ( Color <= 0 ) if( Color <= 0 )
{ {
color = (m_MarkFlags == WAR ) ? color = (m_MarkFlags == WAR ) ?
g_LayerDescr.LayerColor[LAYER_ERC_WARN] : g_LayerDescr.LayerColor[LAYER_ERC_WARN] :
g_LayerDescr.LayerColor[LAYER_ERC_ERR]; g_LayerDescr.LayerColor[LAYER_ERC_ERR];
} }
Draw_Marqueur(panel, DC, m_Pos+offset, marqERC_bitmap, DrawMode, color); Draw_Marqueur( panel, DC, m_Pos + offset, marqERC_bitmap, DrawMode, color );
} }
else
else Draw_Marqueur(panel, DC, m_Pos+offset, marq_bitmap, DrawMode, Color); Draw_Marqueur( panel, DC, m_Pos + offset, marq_bitmap, DrawMode, Color );
} }
/*************************************************************************/ /*************************************************************************/
void DrawNoConnectStruct::Draw(WinEDA_DrawPanel * panel, wxDC * DC, const wxPoint & offset, void DrawNoConnectStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
int DrawMode, int Color) int DrawMode, int Color )
/*************************************************************************/ /*************************************************************************/
/* DRaw the "No Connect" symbol.. */ /* DRaw the "No Connect" symbol.. */
{ {
#define DELTA (DRAWNOCONNECT_SIZE/2) #define DELTA (DRAWNOCONNECT_SIZE / 2)
int pX, pY, color; int pX, pY, color;
int width = g_DrawMinimunLineWidth; int width = g_DrawMinimunLineWidth;
pX = m_Pos.x + offset.x; pY = m_Pos.y + offset.y; pX = m_Pos.x + offset.x; pY = m_Pos.y + offset.y;
if( Color >= 0 ) color = Color; if( Color >= 0 )
else color = ReturnLayerColor(LAYER_NOCONNECT); color = Color;
GRSetDrawMode(DC, DrawMode); else
color = ReturnLayerColor( LAYER_NOCONNECT );
GRLine(&panel->m_ClipBox, DC, pX - DELTA, pY - DELTA, pX + DELTA, pY + DELTA, width, color); GRSetDrawMode( DC, DrawMode );
GRLine(&panel->m_ClipBox, DC, pX + DELTA, pY - DELTA, pX - DELTA, pY + DELTA, width, color);
GRLine( &panel->m_ClipBox, DC, pX - DELTA, pY - DELTA, pX + DELTA, pY + DELTA, width, color );
GRLine( &panel->m_ClipBox, DC, pX + DELTA, pY - DELTA, pX - DELTA, pY + DELTA, width, color );
} }
/**************************************************************/ /**************************************************************/
void DrawBusEntryStruct::Draw(WinEDA_DrawPanel * panel, wxDC * DC, const wxPoint & offset, void DrawBusEntryStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
int DrawMode, int Color) int DrawMode, int Color )
/***************************************************************/ /***************************************************************/
/* Draw the bus entries .. */ /* Draw the bus entries .. */
{ {
int color; int color;
int zoom = panel->GetZoom(); int zoom = panel->GetZoom();
int width = MAX(m_Width, g_DrawMinimunLineWidth); int width = MAX( m_Width, g_DrawMinimunLineWidth );
if( Color >= 0 ) color = Color; if( Color >= 0 )
else color = ReturnLayerColor(m_Layer); color = Color;
GRSetDrawMode(DC, DrawMode); else
color = ReturnLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );
if( (m_Layer == LAYER_BUS) && (zoom <= 16) ) if( (m_Layer == LAYER_BUS) && (zoom <= 16) )
width *= 3; width *= 3;
GRLine(&panel->m_ClipBox, DC, m_Pos.x + offset.x, m_Pos.y + offset.y, GRLine( &panel->m_ClipBox, DC, m_Pos.x + offset.x, m_Pos.y + offset.y,
m_End().x + offset.x, m_End().y + offset.y, width, color); m_End().x + offset.x, m_End().y + offset.y, width, color );
} }
/***************************************************************************** /*****************************************************************************
* Routine to redraw polyline struct. * * Routine to redraw polyline struct. *
*****************************************************************************/ *****************************************************************************/
void DrawPolylineStruct::Draw(WinEDA_DrawPanel * panel, wxDC * DC, const wxPoint & offset, void DrawPolylineStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
int DrawMode, int Color) int DrawMode, int Color )
{ {
int i, color ; int i, color;
int zoom = panel->GetZoom(); int zoom = panel->GetZoom();
int width = MAX(m_Width, g_DrawMinimunLineWidth); int width = MAX( m_Width, g_DrawMinimunLineWidth );
if( Color >= 0 ) color = Color; if( Color >= 0 )
else color = ReturnLayerColor(m_Layer); color = Color;
GRSetDrawMode(DC, DrawMode); else
color = ReturnLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );
if( (m_Layer == LAYER_BUS) && (zoom <= 16) ) if( (m_Layer == LAYER_BUS) && (zoom <= 16) )
{ {
width *= 3; width *= 3;
} }
GRMoveTo(m_Points[0], m_Points[1]); GRMoveTo( m_Points[0], m_Points[1] );
if( m_Layer == LAYER_NOTES) if( m_Layer == LAYER_NOTES )
{ {
for (i = 1; i < m_NumOfPoints; i++) for( i = 1; i < m_NumOfPoints; i++ )
GRDashedLineTo(&panel->m_ClipBox, DC, m_Points[i * 2] + offset.x, GRDashedLineTo( &panel->m_ClipBox, DC, m_Points[i * 2] + offset.x,
m_Points[i * 2 + 1] + offset.y, width, color); m_Points[i * 2 + 1] + offset.y, width, color );
} }
else else
{ {
for (i = 1; i < m_NumOfPoints; i++) for( i = 1; i < m_NumOfPoints; i++ )
GRLineTo(&panel->m_ClipBox, DC, m_Points[i * 2] + offset.x, m_Points[i * 2 + 1] + offset.y, GRLineTo( &panel->m_ClipBox,
width, color); DC,
m_Points[i * 2] + offset.x,
m_Points[i * 2 + 1] + offset.y,
width,
color );
} }
} }
/***************************************************************************** /*****************************************************************************
* Routine to redraw connection struct. * * Routine to redraw connection struct. *
*****************************************************************************/ *****************************************************************************/
void DrawJunctionStruct::Draw(WinEDA_DrawPanel * panel,wxDC * DC, const wxPoint & offset, void DrawJunctionStruct::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
int DrawMode, int Color) int DrawMode, int Color )
{ {
int color; int color;
int Width = DRAWJUNCTION_SIZE; int Width = DRAWJUNCTION_SIZE;
if( Color >= 0 ) color = Color; if( Color >= 0 )
else color = ReturnLayerColor(m_Layer); color = Color;
GRSetDrawMode(DC, DrawMode); else
color = ReturnLayerColor( m_Layer );
GRSetDrawMode( DC, DrawMode );
GRFilledRect(&panel->m_ClipBox, DC, m_Pos.x - Width + offset.x, m_Pos.y - Width + offset.y, GRFilledRect( &panel->m_ClipBox, DC, m_Pos.x - Width + offset.x, m_Pos.y - Width + offset.y,
m_Pos.x + Width + offset.x, m_Pos.y + Width + offset.y, color, color); m_Pos.x + Width + offset.x, m_Pos.y + Width + offset.y, color, color );
} }
/**********************************************************/ /**********************************************************/
void DrawStructsInGhost(WinEDA_DrawPanel * panel,wxDC * DC, void DrawStructsInGhost( WinEDA_DrawPanel* panel, wxDC* DC,
EDA_BaseStruct * DrawStruct, int dx, int dy ) EDA_BaseStruct* DrawStruct, int dx, int dy )
/**********************************************************/ /**********************************************************/
/* Routine de redessin en mode fantome (Dessin simplifie en g_XorMode et /* Routine de redessin en mode fantome (Dessin simplifie en g_XorMode et
g_GhostColor * g_GhostColor
de structures. * de structures.
Utilisee dans les deplacements de blocs * Utilisee dans les deplacements de blocs
*/ */
{ {
int Width, ii; int Width, ii;
int DrawMode = g_XorMode; int DrawMode = g_XorMode;
int width = g_DrawMinimunLineWidth; int width = g_DrawMinimunLineWidth;
GRSetDrawMode(DC, DrawMode); GRSetDrawMode( DC, DrawMode );
switch (DrawStruct->Type()) switch( DrawStruct->Type() )
{ {
case DRAW_POLYLINE_STRUCT_TYPE: case DRAW_POLYLINE_STRUCT_TYPE:
{ {
DrawPolylineStruct * Struct; DrawPolylineStruct* Struct;
Struct = (DrawPolylineStruct * ) DrawStruct; Struct = (DrawPolylineStruct*) DrawStruct;
GRMoveTo(Struct->m_Points[0] + dx, Struct->m_Points[1] + dy); GRMoveTo( Struct->m_Points[0] + dx, Struct->m_Points[1] + dy );
for (ii = 1; ii < Struct->m_NumOfPoints; ii++) for( ii = 1; ii < Struct->m_NumOfPoints; ii++ )
GRLineTo(&panel->m_ClipBox, DC, Struct->m_Points[ii * 2] + dx, GRLineTo( &panel->m_ClipBox, DC, Struct->m_Points[ii * 2] + dx,
Struct->m_Points[ii * 2 + 1] +dy, width, g_GhostColor); Struct->m_Points[ii * 2 + 1] + dy, width, g_GhostColor );
break; break;
} }
case DRAW_SEGMENT_STRUCT_TYPE: case DRAW_SEGMENT_STRUCT_TYPE:
{ {
EDA_DrawLineStruct * Struct; EDA_DrawLineStruct* Struct;
Struct = (EDA_DrawLineStruct * ) DrawStruct; Struct = (EDA_DrawLineStruct*) DrawStruct;
if( (Struct->m_Flags & STARTPOINT) == 0 ) if( (Struct->m_Flags & STARTPOINT) == 0 )
{ {
GRMoveTo(Struct->m_Start.x + dx, Struct->m_Start.y + dy); GRMoveTo( Struct->m_Start.x + dx, Struct->m_Start.y + dy );
} }
else else
{ {
GRMoveTo(Struct->m_Start.x, Struct->m_Start.y); GRMoveTo( Struct->m_Start.x, Struct->m_Start.y );
} }
if( (Struct->m_Flags & ENDPOINT) == 0 ) if( (Struct->m_Flags & ENDPOINT) == 0 )
{ {
GRLineTo(&panel->m_ClipBox, DC, Struct->m_End.x + dx, Struct->m_End.y + dy, width, g_GhostColor); GRLineTo( &panel->m_ClipBox,
DC,
Struct->m_End.x + dx,
Struct->m_End.y + dy,
width,
g_GhostColor );
} }
else else
{ {
GRLineTo(&panel->m_ClipBox, DC, Struct->m_End.x, Struct->m_End.y, width, g_GhostColor); GRLineTo( &panel->m_ClipBox, DC, Struct->m_End.x, Struct->m_End.y, width, g_GhostColor );
} }
break; break;
} }
case DRAW_BUSENTRY_STRUCT_TYPE: case DRAW_BUSENTRY_STRUCT_TYPE:
{ {
DrawBusEntryStruct * Struct = (DrawBusEntryStruct *) DrawStruct; DrawBusEntryStruct* Struct = (DrawBusEntryStruct*) DrawStruct;
int xx = Struct->m_Pos.x + dx, yy = Struct->m_Pos.y + dy; int xx = Struct->m_Pos.x + dx, yy = Struct->m_Pos.y + dy;
GRMoveTo(xx, yy); GRMoveTo( xx, yy );
GRLineTo(&panel->m_ClipBox, DC, Struct->m_Size.x + xx, Struct->m_Size.y + yy, width, g_GhostColor); GRLineTo( &panel->m_ClipBox,
DC,
Struct->m_Size.x + xx,
Struct->m_Size.y + yy,
width,
g_GhostColor );
break; break;
} }
case DRAW_JUNCTION_STRUCT_TYPE: case DRAW_JUNCTION_STRUCT_TYPE:
{ {
DrawJunctionStruct * Struct; DrawJunctionStruct* Struct;
Struct = (DrawJunctionStruct * ) DrawStruct; Struct = (DrawJunctionStruct*) DrawStruct;
Width = DRAWJUNCTION_SIZE; Width = DRAWJUNCTION_SIZE;
GRFilledRect(&panel->m_ClipBox, DC, Struct->m_Pos.x - Width + dx, Struct->m_Pos.y - Width + dy, GRFilledRect( &panel->m_ClipBox,
Struct->m_Pos.x + Width + dx, Struct->m_Pos.y + Width + dy, DC,
g_GhostColor, g_GhostColor); Struct->m_Pos.x - Width + dx,
Struct->m_Pos.y - Width + dy,
Struct->m_Pos.x + Width + dx,
Struct->m_Pos.y + Width + dy,
g_GhostColor,
g_GhostColor );
break; break;
} }
case DRAW_TEXT_STRUCT_TYPE: case DRAW_TEXT_STRUCT_TYPE:
{ {
DrawTextStruct * Struct; DrawTextStruct* Struct;
Struct = (DrawTextStruct * ) DrawStruct; Struct = (DrawTextStruct*) DrawStruct;
Struct->m_Pos.x += dx; Struct->m_Pos.y += dy; Struct->m_Pos.x += dx; Struct->m_Pos.y += dy;
Struct->Draw(panel, DC, wxPoint(0,0),DrawMode,g_GhostColor); Struct->Draw( panel, DC, wxPoint( 0, 0 ), DrawMode, g_GhostColor );
Struct->m_Pos.x -= dx; Struct->m_Pos.y -= dy; Struct->m_Pos.x -= dx; Struct->m_Pos.y -= dy;
break; break;
} }
...@@ -424,44 +482,45 @@ int width = g_DrawMinimunLineWidth; ...@@ -424,44 +482,45 @@ int width = g_DrawMinimunLineWidth;
case DRAW_GLOBAL_LABEL_STRUCT_TYPE: case DRAW_GLOBAL_LABEL_STRUCT_TYPE:
case DRAW_HIER_LABEL_STRUCT_TYPE: case DRAW_HIER_LABEL_STRUCT_TYPE:
{ {
DrawLabelStruct * Struct; DrawLabelStruct* Struct;
Struct = (DrawLabelStruct * ) DrawStruct; Struct = (DrawLabelStruct*) DrawStruct;
Struct->m_Pos.x += dx; Struct->m_Pos.y += dy; Struct->m_Pos.x += dx; Struct->m_Pos.y += dy;
Struct->Draw(panel, DC, wxPoint(0,0),DrawMode,g_GhostColor); Struct->Draw( panel, DC, wxPoint( 0, 0 ), DrawMode, g_GhostColor );
Struct->m_Pos.x -= dx; Struct->m_Pos.y -= dy; Struct->m_Pos.x -= dx; Struct->m_Pos.y -= dy;
break; break;
} }
case DRAW_NOCONNECT_STRUCT_TYPE: case DRAW_NOCONNECT_STRUCT_TYPE:
{ {
DrawNoConnectStruct * Struct; DrawNoConnectStruct* Struct;
Struct = (DrawNoConnectStruct * ) DrawStruct; Struct = (DrawNoConnectStruct*) DrawStruct;
Struct->m_Pos.x += dx; Struct->m_Pos.y += dy; Struct->m_Pos.x += dx; Struct->m_Pos.y += dy;
Struct->Draw(panel, DC, wxPoint(0,0),DrawMode,g_GhostColor); Struct->Draw( panel, DC, wxPoint( 0, 0 ), DrawMode, g_GhostColor );
Struct->m_Pos.x -= dx; Struct->m_Pos.y -= dy; Struct->m_Pos.x -= dx; Struct->m_Pos.y -= dy;
break; break;
} }
case DRAW_LIB_ITEM_STRUCT_TYPE: case DRAW_LIB_ITEM_STRUCT_TYPE:
{ {
EDA_LibComponentStruct *LibEntry; EDA_LibComponentStruct* LibEntry;
EDA_SchComponentStruct *Struct; EDA_SchComponentStruct* Struct;
Struct = (EDA_SchComponentStruct * ) DrawStruct; Struct = (EDA_SchComponentStruct*) DrawStruct;
LibEntry = FindLibPart(Struct->m_ChipName.GetData(), wxEmptyString, FIND_ROOT); LibEntry = FindLibPart( Struct->m_ChipName.GetData(), wxEmptyString, FIND_ROOT );
if( LibEntry == NULL ) break; if( LibEntry == NULL )
DrawingLibInGhost(panel, DC, LibEntry, Struct, Struct->m_Pos.x + dx, break;
DrawingLibInGhost( panel, DC, LibEntry, Struct, Struct->m_Pos.x + dx,
Struct->m_Pos.y + dy, Struct->m_Pos.y + dy,
Struct->m_Multi, Struct->m_Convert, Struct->m_Multi, Struct->m_Convert,
g_GhostColor, FALSE); g_GhostColor, FALSE );
break; break;
} }
case DRAW_SHEET_STRUCT_TYPE: case DRAW_SHEET_STRUCT_TYPE:
{ {
DrawSheetStruct *Struct = (DrawSheetStruct * ) DrawStruct; DrawSheetStruct* Struct = (DrawSheetStruct*) DrawStruct;
GRRect(&panel->m_ClipBox, DC, Struct->m_Pos.x + dx, Struct->m_Pos.y + dy, GRRect( &panel->m_ClipBox, DC, Struct->m_Pos.x + dx, Struct->m_Pos.y + dy,
Struct->m_Pos.x + Struct->m_Size.x + dx, Struct->m_Pos.x + Struct->m_Size.x + dx,
Struct->m_Pos.y + Struct->m_Size.y + dy, width, g_GhostColor); Struct->m_Pos.y + Struct->m_Size.y + dy, width, g_GhostColor );
break; break;
} }
...@@ -476,25 +535,27 @@ int width = g_DrawMinimunLineWidth; ...@@ -476,25 +535,27 @@ int width = g_DrawMinimunLineWidth;
/************************************************************/ /************************************************************/
void Draw_Marqueur(WinEDA_DrawPanel * panel, wxDC * DC, void Draw_Marqueur( WinEDA_DrawPanel* panel, wxDC* DC,
wxPoint pos, char* pt_bitmap, int DrawMode, int Color) wxPoint pos, char* pt_bitmap, int DrawMode, int Color )
/************************************************************/ /************************************************************/
/* /*
Place un repere sur l'ecran au point de coordonnees PCB pos_X, pos_Y * Place un repere sur l'ecran au point de coordonnees PCB pos_X, pos_Y
Le marqueur est defini par un tableau de 2 + (lig*col) elements: * Le marqueur est defini par un tableau de 2 + (lig*col) elements:
1er element: dim nbre ligne * 1er element: dim nbre ligne
2er element: dim nbre col * 2er element: dim nbre col
suite: lig * col elements a 0 ou 1 : si 1 mise a color du pixel * suite: lig * col elements a 0 ou 1 : si 1 mise a color du pixel
*
copie la description du marqueur en current_marqueur (global) * copie la description du marqueur en current_marqueur (global)
*/ */
{ {
int px, py, color; int px, py, color;
char ii, ii_max, jj, jj_max; char ii, ii_max, jj, jj_max;
if ( pt_bitmap == NULL ) pt_bitmap = marq_bitmap; if( pt_bitmap == NULL )
pt_bitmap = marq_bitmap;
px = GRMapX(pos.x); py = GRMapY(pos.y); px = GRMapX( pos.x ); py = GRMapY( pos.y );
/* Lecture des dimensions */ /* Lecture des dimensions */
ii_max = *(pt_bitmap++); jj_max = *(pt_bitmap++); ii_max = *(pt_bitmap++); jj_max = *(pt_bitmap++);
...@@ -503,18 +564,19 @@ char ii, ii_max, jj, jj_max; ...@@ -503,18 +564,19 @@ char ii, ii_max, jj, jj_max;
px += *(pt_bitmap++); py += *(pt_bitmap++); px += *(pt_bitmap++); py += *(pt_bitmap++);
color = *(pt_bitmap++); color = *(pt_bitmap++);
if ( (Color > 0) ) color = Color; if( (Color > 0) )
if (color < 0) color = 0; color = Color;
GRSetDrawMode(DC, DrawMode); if( color < 0 )
color = 0;
GRSetDrawMode( DC, DrawMode );
/* Trace du bitmap */ /* Trace du bitmap */
for( ii = 0; ii < ii_max; ii++) for( ii = 0; ii < ii_max; ii++ )
{ {
for( jj = 0; jj < jj_max; jj++, pt_bitmap++) for( jj = 0; jj < jj_max; jj++, pt_bitmap++ )
{ {
if(*pt_bitmap) GRSPutPixel(&panel->m_ClipBox, DC, px+ii , py+jj , color); if( *pt_bitmap )
GRSPutPixel( &panel->m_ClipBox, DC, px + ii, py + jj, color );
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment