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

eeschema-gal: factor out EDA_DRAW_PANEL from BITMAP_BASE, remove some unnecessary includes of class_drawpanel.h

This commit is contained in:
Tomasz Wlostowski 2018-08-03 11:04:57 +02:00 committed by Jeff Young
parent 82cb61b8af
commit 0d720fdeff
8 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/base_struct.cpp
View File

@ -33,7 +33,6 @@
#include <macros.h> #include <macros.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <eda_base_frame.h> #include <eda_base_frame.h>
#include <class_drawpanel.h>
#include <base_screen.h> #include <base_screen.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <trace_helpers.h> #include <trace_helpers.h>

3
common/bitmap_base.cpp
View File

@ -29,7 +29,6 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
#include "macros.h" #include "macros.h"
#include "class_drawpanel.h"
#include "trigo.h" #include "trigo.h"
#include "common.h" #include "common.h"
#include "richio.h" #include "richio.h"
@ -216,7 +215,7 @@ const EDA_RECT BITMAP_BASE::GetBoundingBox() const
} }
void BITMAP_BASE::DrawBitmap( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPos ) void BITMAP_BASE::DrawBitmap( wxDC* aDC, const wxPoint& aPos )
{ {
if( m_bitmap == NULL ) if( m_bitmap == NULL )
return; return;

2
common/dialogs/dialog_image_editor.cpp
View File

@ -179,7 +179,7 @@ void DIALOG_IMAGE_EDITOR::OnRedrawPanel( wxPaintEvent& event )
double scale = 1.0 / m_workingImage->GetScalingFactor(); double scale = 1.0 / m_workingImage->GetScalingFactor();
dc.SetUserScale( scale, scale ); dc.SetUserScale( scale, scale );
m_workingImage->DrawBitmap( NULL, &dc, wxPoint( 0, 0 ) ); m_workingImage->DrawBitmap( &dc, wxPoint( 0, 0 ) );
} }

1
common/draw_graphic_text.cpp
View File

@ -36,7 +36,6 @@
#include <eda_text.h> // EDA_TEXT_HJUSTIFY_T and EDA_TEXT_VJUSTIFY_T #include <eda_text.h> // EDA_TEXT_HJUSTIFY_T and EDA_TEXT_VJUSTIFY_T
#include <trigo.h> #include <trigo.h>
#include <macros.h> #include <macros.h>
#include <class_drawpanel.h>
#include <base_screen.h> #include <base_screen.h>
#include <draw_graphic_text.h> #include <draw_graphic_text.h>

1
common/origin_viewitem.cpp
View File

@ -22,7 +22,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <class_drawpanel.h>
#include <draw_frame.h> #include <draw_frame.h>
#include <origin_viewitem.h> #include <origin_viewitem.h>
#include <gal/graphics_abstraction_layer.h> #include <gal/graphics_abstraction_layer.h>

2
common/page_layout/page_layout_graphic_items.cpp
View File

@ -491,7 +491,7 @@ void WS_DRAW_ITEM_BITMAP::DrawWsItem( EDA_RECT* aClipBox, wxDC* aDC, const wxPoi
if( parent->m_ImageBitmap ) if( parent->m_ImageBitmap )
{ {
GRSetDrawMode( aDC, ( aDrawMode == UNSPECIFIED_DRAWMODE ) ? GR_COPY : aDrawMode ); GRSetDrawMode( aDC, ( aDrawMode == UNSPECIFIED_DRAWMODE ) ? GR_COPY : aDrawMode );
parent->m_ImageBitmap->DrawBitmap( NULL, aDC, m_pos + aOffset ); parent->m_ImageBitmap->DrawBitmap( aDC, m_pos + aOffset );
GRSetDrawMode( aDC, GR_COPY ); GRSetDrawMode( aDC, GR_COPY );
} }
} }

1
common/worksheet.cpp
View File

@ -34,7 +34,6 @@
#include <pgm_base.h> #include <pgm_base.h>
#include <gr_basic.h> #include <gr_basic.h>
#include <common.h> #include <common.h>
#include <class_drawpanel.h>
#include <base_screen.h> #include <base_screen.h>
#include <draw_frame.h> #include <draw_frame.h>
#include <worksheet.h> #include <worksheet.h>

4
include/bitmap_base.h
View File

@ -25,6 +25,8 @@
#ifndef BITMAP_BASE_H #ifndef BITMAP_BASE_H
#define BITMAP_BASE_H #define BITMAP_BASE_H
#include <eda_rect.h>
/** /**
* @file bitmap_base.h * @file bitmap_base.h
* *
@ -155,7 +157,7 @@ public:
*/ */
const EDA_RECT GetBoundingBox() const; const EDA_RECT GetBoundingBox() const;
void DrawBitmap( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPos ); void DrawBitmap( wxDC* aDC, const wxPoint& aPos );
/** /**
* Function ReadImageFile * Function ReadImageFile