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

Renamed WORKSHEET_ITEM to WORKSHEET_VIEWITEM.

This commit is contained in:
Maciej Suminski 2013-10-02 14:26:14 +02:00
parent 54946f46f7
commit 3c738faed6
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/CMakeLists.txt
View File

@ -32,7 +32,7 @@ set(GAL_SRCS
# Common part # Common part
drawpanel_gal.cpp drawpanel_gal.cpp
painter.cpp painter.cpp
worksheet_item.cpp worksheet_viewitem.cpp
gal/graphics_abstraction_layer.cpp gal/graphics_abstraction_layer.cpp
gal/stroke_font.cpp gal/stroke_font.cpp
gal/color4d.cpp gal/color4d.cpp

26
common/worksheet_item.cpp → common/worksheet_viewitem.cpp
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file worksheet_item.cpp * @file worksheet_viewitem.cpp
* @brief Class that handles properties and drawing of worksheet layout. * @brief Class that handles properties and drawing of worksheet layout.
*/ */
#include <worksheet_item.h> #include <worksheet_viewitem.h>
#include <worksheet_shape_builder.h> #include <worksheet_shape_builder.h>
#include <gal/graphics_abstraction_layer.h> #include <gal/graphics_abstraction_layer.h>
#include <painter.h> #include <painter.h>
@ -36,28 +36,28 @@
using namespace KiGfx; using namespace KiGfx;
WORKSHEET_ITEM::WORKSHEET_ITEM( const std::string& aFileName, const std::string& aSheetName, WORKSHEET_VIEWITEM::WORKSHEET_VIEWITEM( const std::string& aFileName, const std::string& aSheetName,
const PAGE_INFO* aPageInfo, const TITLE_BLOCK* aTitleBlock ) : const PAGE_INFO* aPageInfo, const TITLE_BLOCK* aTitleBlock ) :
EDA_ITEM( NOT_USED ), // this item is never added to a BOARD so it needs no type EDA_ITEM( NOT_USED ), // this item is never added to a BOARD so it needs no type
m_fileName( aFileName ), m_sheetName( aSheetName ), m_fileName( aFileName ), m_sheetName( aSheetName ),
m_titleBlock( aTitleBlock ), m_pageInfo( aPageInfo ), m_sheetNumber( 1 ), m_sheetCount( 1 ) {} m_titleBlock( aTitleBlock ), m_pageInfo( aPageInfo ), m_sheetNumber( 1 ), m_sheetCount( 1 ) {}
void WORKSHEET_ITEM::SetPageInfo( const PAGE_INFO* aPageInfo ) void WORKSHEET_VIEWITEM::SetPageInfo( const PAGE_INFO* aPageInfo )
{ {
m_pageInfo = aPageInfo; m_pageInfo = aPageInfo;
ViewUpdate( GEOMETRY ); ViewUpdate( GEOMETRY );
} }
void WORKSHEET_ITEM::SetTitleBlock( const TITLE_BLOCK* aTitleBlock ) void WORKSHEET_VIEWITEM::SetTitleBlock( const TITLE_BLOCK* aTitleBlock )
{ {
m_titleBlock = aTitleBlock; m_titleBlock = aTitleBlock;
ViewUpdate( GEOMETRY ); ViewUpdate( GEOMETRY );
} }
const BOX2I WORKSHEET_ITEM::ViewBBox() const const BOX2I WORKSHEET_VIEWITEM::ViewBBox() const
{ {
BOX2I bbox; BOX2I bbox;
@ -76,7 +76,7 @@ const BOX2I WORKSHEET_ITEM::ViewBBox() const
} }
void WORKSHEET_ITEM::ViewDraw( int aLayer, GAL* aGal ) const void WORKSHEET_VIEWITEM::ViewDraw( int aLayer, GAL* aGal ) const
{ {
RENDER_SETTINGS* settings = m_view->GetPainter()->GetSettings(); RENDER_SETTINGS* settings = m_view->GetPainter()->GetSettings();
wxString fileName( m_fileName.c_str(), wxConvUTF8 ); wxString fileName( m_fileName.c_str(), wxConvUTF8 );
@ -128,14 +128,14 @@ void WORKSHEET_ITEM::ViewDraw( int aLayer, GAL* aGal ) const
} }
void WORKSHEET_ITEM::ViewGetLayers( int aLayers[], int& aCount ) const void WORKSHEET_VIEWITEM::ViewGetLayers( int aLayers[], int& aCount ) const
{ {
aCount = 1; aCount = 1;
aLayers[0] = ITEM_GAL_LAYER( WORKSHEET ); aLayers[0] = ITEM_GAL_LAYER( WORKSHEET );
} }
void WORKSHEET_ITEM::draw( const WS_DRAW_ITEM_LINE* aItem, GAL* aGal ) const void WORKSHEET_VIEWITEM::draw( const WS_DRAW_ITEM_LINE* aItem, GAL* aGal ) const
{ {
aGal->SetIsStroke( true ); aGal->SetIsStroke( true );
aGal->SetIsFill( false ); aGal->SetIsFill( false );
@ -145,7 +145,7 @@ void WORKSHEET_ITEM::draw( const WS_DRAW_ITEM_LINE* aItem, GAL* aGal ) const
} }
void WORKSHEET_ITEM::draw( const WS_DRAW_ITEM_RECT* aItem, GAL* aGal ) const void WORKSHEET_VIEWITEM::draw( const WS_DRAW_ITEM_RECT* aItem, GAL* aGal ) const
{ {
aGal->SetIsStroke( true ); aGal->SetIsStroke( true );
aGal->SetIsFill( false ); aGal->SetIsFill( false );
@ -155,7 +155,7 @@ void WORKSHEET_ITEM::draw( const WS_DRAW_ITEM_RECT* aItem, GAL* aGal ) const
} }
void WORKSHEET_ITEM::draw( const WS_DRAW_ITEM_POLYGON* aItem, GAL* aGal ) const void WORKSHEET_VIEWITEM::draw( const WS_DRAW_ITEM_POLYGON* aItem, GAL* aGal ) const
{ {
std::deque<VECTOR2D> corners; std::deque<VECTOR2D> corners;
BOOST_FOREACH( wxPoint point, aItem->m_Corners ) BOOST_FOREACH( wxPoint point, aItem->m_Corners )
@ -181,7 +181,7 @@ void WORKSHEET_ITEM::draw( const WS_DRAW_ITEM_POLYGON* aItem, GAL* aGal ) const
} }
void WORKSHEET_ITEM::draw( const WS_DRAW_ITEM_TEXT* aItem, GAL* aGal ) const void WORKSHEET_VIEWITEM::draw( const WS_DRAW_ITEM_TEXT* aItem, GAL* aGal ) const
{ {
VECTOR2D position( aItem->GetTextPosition().x, aItem->GetTextPosition().y ); VECTOR2D position( aItem->GetTextPosition().x, aItem->GetTextPosition().y );
@ -192,7 +192,7 @@ void WORKSHEET_ITEM::draw( const WS_DRAW_ITEM_TEXT* aItem, GAL* aGal ) const
} }
void WORKSHEET_ITEM::drawBorder( GAL* aGal ) const void WORKSHEET_VIEWITEM::drawBorder( GAL* aGal ) const
{ {
VECTOR2D origin = VECTOR2D( 0.0, 0.0 ); VECTOR2D origin = VECTOR2D( 0.0, 0.0 );
VECTOR2D end = VECTOR2D( m_pageInfo->GetWidthMils() * 25400, VECTOR2D end = VECTOR2D( m_pageInfo->GetWidthMils() * 25400,

12
include/worksheet_item.h → include/worksheet_viewitem.h
View File

@ -23,12 +23,12 @@
*/ */
/** /**
* @file worksheet_item.h * @file worksheet_viewitem.h
* @brief Class that handles properties and drawing of worksheet layout. * @brief Class that handles properties and drawing of worksheet layout.
*/ */
#ifndef WORKSHEET_ITEM_H #ifndef WORKSHEET_VIEWITEM_H
#define WORKSHEET_ITEM_H #define WORKSHEET_VIEWITEM_H
#include <base_struct.h> #include <base_struct.h>
@ -44,10 +44,10 @@ namespace KiGfx
{ {
class GAL; class GAL;
class WORKSHEET_ITEM : public EDA_ITEM class WORKSHEET_VIEWITEM : public EDA_ITEM
{ {
public: public:
WORKSHEET_ITEM( const std::string& aFileName, const std::string& aSheetName, WORKSHEET_VIEWITEM( const std::string& aFileName, const std::string& aSheetName,
const PAGE_INFO* aPageInfo, const TITLE_BLOCK* aTitleBlock ); const PAGE_INFO* aPageInfo, const TITLE_BLOCK* aTitleBlock );
/** /**
@ -159,4 +159,4 @@ protected:
}; };
} }
#endif /* WORKSHEET_ITEM_H */ #endif /* WORKSHEET_VIEWITEM_H */

4
pcbnew/basepcbframe.cpp
View File

@ -53,7 +53,7 @@
#include <math/vector2d.h> #include <math/vector2d.h>
#include <trigo.h> #include <trigo.h>
#include <pcb_painter.h> #include <pcb_painter.h>
#include <worksheet_item.h> #include <worksheet_viewitem.h>
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <tool/tool_dispatcher.h> #include <tool/tool_dispatcher.h>
@ -240,7 +240,7 @@ void PCB_BASE_FRAME::ViewReloadBoard( const BOARD* aBoard ) const
} }
// Add an entry for the worksheet layout // Add an entry for the worksheet layout
KiGfx::WORKSHEET_ITEM* worksheet = new KiGfx::WORKSHEET_ITEM( KiGfx::WORKSHEET_VIEWITEM* worksheet = new KiGfx::WORKSHEET_VIEWITEM(
std::string( aBoard->GetFileName().mb_str() ), std::string( aBoard->GetFileName().mb_str() ),
std::string( GetScreenDesc().mb_str() ), std::string( GetScreenDesc().mb_str() ),
&GetPageSettings(), &GetTitleBlock() ); &GetPageSettings(), &GetTitleBlock() );