Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Make RENDER_SETTINGS argument const

6.0.7
Dominik Wernberger 5 years ago
committed by Seth Hillbrand
parent
5d099bb789
commit
bb2881a5ab
61 changed files with 129 additions and 129 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      common/eda_draw_frame.cpp
  2. 6
      common/eda_text.cpp
  3. 2
      common/marker_base.cpp
  4. 12
      common/page_layout/ws_draw_item.cpp
  5. 4
      eeschema/class_libentry.cpp
  6. 4
      eeschema/class_libentry.h
  7. 2
      eeschema/lib_arc.cpp
  8. 2
      eeschema/lib_arc.h
  9. 2
      eeschema/lib_bezier.cpp
  10. 4
      eeschema/lib_bezier.h
  11. 4
      eeschema/lib_circle.cpp
  12. 2
      eeschema/lib_circle.h
  13. 2
      eeschema/lib_field.cpp
  14. 2
      eeschema/lib_field.h
  15. 4
      eeschema/lib_item.cpp
  16. 6
      eeschema/lib_item.h
  17. 16
      eeschema/lib_pin.cpp
  18. 8
      eeschema/lib_pin.h
  19. 2
      eeschema/lib_polyline.cpp
  20. 2
      eeschema/lib_polyline.h
  21. 4
      eeschema/lib_rectangle.cpp
  22. 4
      eeschema/lib_rectangle.h
  23. 2
      eeschema/lib_text.cpp
  24. 2
      eeschema/lib_text.h
  25. 2
      eeschema/sch_bitmap.cpp
  26. 2
      eeschema/sch_bitmap.h
  27. 4
      eeschema/sch_bus_entry.cpp
  28. 2
      eeschema/sch_bus_entry.h
  29. 2
      eeschema/sch_component.cpp
  30. 2
      eeschema/sch_component.h
  31. 2
      eeschema/sch_edit_frame.cpp
  32. 2
      eeschema/sch_edit_frame.h
  33. 2
      eeschema/sch_field.cpp
  34. 2
      eeschema/sch_field.h
  35. 2
      eeschema/sch_item.h
  36. 2
      eeschema/sch_junction.cpp
  37. 2
      eeschema/sch_junction.h
  38. 2
      eeschema/sch_line.cpp
  39. 2
      eeschema/sch_line.h
  40. 2
      eeschema/sch_marker.cpp
  41. 2
      eeschema/sch_marker.h
  42. 2
      eeschema/sch_no_connect.cpp
  43. 2
      eeschema/sch_no_connect.h
  44. 2
      eeschema/sch_pin.h
  45. 2
      eeschema/sch_screen.cpp
  46. 2
      eeschema/sch_screen.h
  47. 16
      eeschema/sch_sheet.cpp
  48. 6
      eeschema/sch_sheet.h
  49. 2
      eeschema/sch_sheet_path.cpp
  50. 4
      eeschema/sch_sheet_pin.cpp
  51. 20
      eeschema/sch_text.cpp
  52. 20
      eeschema/sch_text.h
  53. 2
      eeschema/symbol_editor/symbol_edit_frame.h
  54. 2
      eeschema/symbol_editor/symbol_editor_plotter.cpp
  55. 4
      include/eda_draw_frame.h
  56. 6
      include/eda_text.h
  57. 2
      include/marker_base.h
  58. 18
      include/page_layout/ws_draw_item.h
  59. 2
      include/page_layout/ws_painter.h
  60. 2
      pagelayout_editor/pl_editor_frame.cpp
  61. 2
      pagelayout_editor/pl_editor_frame.h

6
common/eda_draw_frame.cpp
View File

@ -272,7 +272,7 @@ void EDA_DRAW_FRAME::OnUpdateSelectGrid( wxUpdateUIEvent& aEvent )
}
void EDA_DRAW_FRAME::PrintPage( RENDER_SETTINGS* aSettings )
void EDA_DRAW_FRAME::PrintPage( const RENDER_SETTINGS* aSettings )
{
wxMessageBox( wxT("EDA_DRAW_FRAME::PrintPage() error") );
}
@ -825,7 +825,7 @@ void EDA_DRAW_FRAME::FocusOnLocation( const wxPoint& aPos )
static const wxString productName = wxT( "KiCad E.D.A. " );
void PrintPageLayout( RENDER_SETTINGS* aSettings, const PAGE_INFO& aPageInfo,
void PrintPageLayout( const RENDER_SETTINGS* aSettings, const PAGE_INFO& aPageInfo,
const wxString& aFullSheetName, const wxString& aFileName,
const TITLE_BLOCK& aTitleBlock, int aSheetCount, const wxString& aPageNumber,
double aMils2Iu, const PROJECT* aProject, const wxString& aSheetLayer,
@ -850,7 +850,7 @@ void PrintPageLayout( RENDER_SETTINGS* aSettings, const PAGE_INFO& aPageInfo,
}
void EDA_DRAW_FRAME::PrintWorkSheet( RENDER_SETTINGS* aSettings, BASE_SCREEN* aScreen,
void EDA_DRAW_FRAME::PrintWorkSheet( const RENDER_SETTINGS* aSettings, BASE_SCREEN* aScreen,
double aMils2Iu, const wxString &aFilename,
const wxString &aSheetLayer )
{

6
common/eda_text.cpp
View File

@ -398,8 +398,8 @@ bool EDA_TEXT::TextHitTest( const EDA_RECT& aRect, bool aContains, int aAccuracy
}
void EDA_TEXT::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor,
OUTLINE_MODE aFillMode )
void EDA_TEXT::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
COLOR4D aColor, OUTLINE_MODE aFillMode )
{
if( IsMultilineAllowed() )
{
@ -462,7 +462,7 @@ void EDA_TEXT::GetLinePositions( std::vector<wxPoint>& aPositions, int aLineCoun
}
}
void EDA_TEXT::printOneLineOfText( RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
void EDA_TEXT::printOneLineOfText( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
COLOR4D aColor, OUTLINE_MODE aFillMode,
const wxString& aText, const wxPoint &aPos )
{

2
common/marker_base.cpp
View File

@ -134,7 +134,7 @@ EDA_RECT MARKER_BASE::GetBoundingBoxMarker() const
}
void MARKER_BASE::PrintMarker( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void MARKER_BASE::PrintMarker( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();

12
common/page_layout/ws_draw_item.cpp
View File

@ -159,7 +159,7 @@ void WS_DRAW_ITEM_BASE::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS
// ============================ TEXT ==============================
void WS_DRAW_ITEM_TEXT::PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void WS_DRAW_ITEM_TEXT::PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
Print( aSettings, aOffset, aSettings->GetLayerColor( LAYER_WORKSHEET ), FILLED );
}
@ -197,7 +197,7 @@ void WS_DRAW_ITEM_TEXT::SetTextAngle( double aAngle )
// ============================ POLYGON =================================
void WS_DRAW_ITEM_POLYPOLYGONS::PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void WS_DRAW_ITEM_POLYPOLYGONS::PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();
COLOR4D color = aSettings->GetLayerColor( LAYER_WORKSHEET );
@ -301,7 +301,7 @@ wxString WS_DRAW_ITEM_POLYPOLYGONS::GetSelectMenuText( EDA_UNITS aUnits ) const
// ============================ RECT ==============================
void WS_DRAW_ITEM_RECT::PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void WS_DRAW_ITEM_RECT::PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();
COLOR4D color = aSettings->GetLayerColor( LAYER_WORKSHEET );
@ -400,7 +400,7 @@ wxString WS_DRAW_ITEM_RECT::GetSelectMenuText( EDA_UNITS aUnits ) const
// ============================ LINE ==============================
void WS_DRAW_ITEM_LINE::PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void WS_DRAW_ITEM_LINE::PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();
COLOR4D color = aSettings->GetLayerColor( LAYER_WORKSHEET );
@ -432,7 +432,7 @@ wxString WS_DRAW_ITEM_LINE::GetSelectMenuText( EDA_UNITS aUnits ) const
// ============== BITMAP ================
void WS_DRAW_ITEM_BITMAP::PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void WS_DRAW_ITEM_BITMAP::PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
WS_DATA_ITEM_BITMAP* bitmap = (WS_DATA_ITEM_BITMAP*) GetPeer();
@ -533,7 +533,7 @@ void WS_DRAW_ITEM_LIST::BuildWorkSheetGraphicList( const PAGE_INFO& aPageInfo,
* The selected items are drawn after (usually 0 or 1)
* to be sure they are seen, even for overlapping items
*/
void WS_DRAW_ITEM_LIST::Print( RENDER_SETTINGS* aSettings )
void WS_DRAW_ITEM_LIST::Print( const RENDER_SETTINGS* aSettings )
{
std::vector<WS_DRAW_ITEM_BASE*> second_items;

4
eeschema/class_libentry.cpp
View File

@ -436,8 +436,8 @@ wxString LIB_PART::SubReference( int aUnit, bool aAddSeparator )
}
void LIB_PART::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, int aMulti,
int aConvert, const PART_DRAW_OPTIONS& aOpts )
void LIB_PART::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
int aMulti, int aConvert, const PART_DRAW_OPTIONS& aOpts )
{
/* draw background for filled items using background option
* Solid lines will be drawn after the background

4
eeschema/class_libentry.h
View File

@ -300,8 +300,8 @@ public:
* @param aConvert - Component conversion (DeMorgan) if available.
* @param aOpts - Drawing options
*/
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, int aMulti, int aConvert,
const PART_DRAW_OPTIONS& aOpts );
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
int aMulti, int aConvert, const PART_DRAW_OPTIONS& aOpts );
/**
* Plot lib part to plotter.

2
eeschema/lib_arc.cpp
View File

@ -291,7 +291,7 @@ int LIB_ARC::GetPenWidth() const
}
void LIB_ARC::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void LIB_ARC::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
{
bool forceNoFill = static_cast<bool>( aData );

2
eeschema/lib_arc.h
View File

@ -50,7 +50,7 @@ class LIB_ARC : public LIB_ITEM
int m_Width; /* Line width */
int m_editState;
void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) override;
public:

2
eeschema/lib_bezier.cpp
View File

@ -202,7 +202,7 @@ int LIB_BEZIER::GetPenWidth() const
}
void LIB_BEZIER::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void LIB_BEZIER::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
{
bool forceNoFill = static_cast<bool>( aData );

4
eeschema/lib_bezier.h
View File

@ -103,8 +103,8 @@ private:
int compare( const LIB_ITEM& aOther,
LIB_ITEM::COMPARE_FLAGS aCompareFlags = LIB_ITEM::COMPARE_FLAGS::NORMAL ) const override;
void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) override;
void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
void* aData, const TRANSFORM& aTransform ) override;
};

4
eeschema/lib_circle.cpp
View File

@ -194,8 +194,8 @@ int LIB_CIRCLE::GetPenWidth() const
}
void LIB_CIRCLE::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
void LIB_CIRCLE::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
void* aData, const TRANSFORM& aTransform )
{
bool forceNoFill = static_cast<bool>( aData );
int penWidth = GetPenWidth();

2
eeschema/lib_circle.h
View File

@ -105,7 +105,7 @@ private:
int compare( const LIB_ITEM& aOther,
LIB_ITEM::COMPARE_FLAGS aCompareFlags = LIB_ITEM::COMPARE_FLAGS::NORMAL ) const override;
void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) override;
};

2
eeschema/lib_field.cpp
View File

@ -105,7 +105,7 @@ int LIB_FIELD::GetPenWidth() const
}
void LIB_FIELD::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void LIB_FIELD::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
{
wxDC* DC = aSettings->GetPrintDC();

2
eeschema/lib_field.h
View File

@ -68,7 +68,7 @@ class LIB_FIELD : public LIB_ITEM, public EDA_TEXT
* the m_Text
* </p>
*/
void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) override;
/**

4
eeschema/lib_item.cpp
View File

@ -134,8 +134,8 @@ bool LIB_ITEM::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy )
}
void LIB_ITEM::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
void LIB_ITEM::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
void* aData, const TRANSFORM& aTransform )
{
print( aSettings, aOffset, aData, aTransform );
}

6
eeschema/lib_item.h
View File

@ -69,7 +69,7 @@ class LIB_ITEM : public EDA_ITEM
* @param aData A pointer to any object specific data required to perform the draw.
* @param aTransform A reference to a #TRANSFORM object containing drawing transform.
*/
virtual void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
virtual void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) = 0;
friend class LIB_PART;
@ -175,8 +175,8 @@ public:
* pass reference to the lib component for pins.
* @param aTransform Transform Matrix (rotation, mirror ..)
*/
virtual void Print( RENDER_SETTINGS* aSettings, const wxPoint &aOffset, void* aData,
const TRANSFORM& aTransform );
virtual void Print( const RENDER_SETTINGS* aSettings, const wxPoint &aOffset,
void* aData, const TRANSFORM& aTransform );
virtual int GetPenWidth() const = 0;

16
eeschema/lib_pin.cpp
View File

@ -69,9 +69,9 @@ const wxString LIB_PIN::GetCanonicalElectricalTypeName( ELECTRICAL_PINTYPE aType
// i.e. the clock symbols (falling clock is actually external but is of
// the same kind)
static int internalPinDecoSize( RENDER_SETTINGS* aSettings, const LIB_PIN &aPin )
static int internalPinDecoSize( const RENDER_SETTINGS* aSettings, const LIB_PIN &aPin )
{
KIGFX::SCH_RENDER_SETTINGS* settings = static_cast<KIGFX::SCH_RENDER_SETTINGS*>( aSettings );
const KIGFX::SCH_RENDER_SETTINGS* settings = static_cast<const KIGFX::SCH_RENDER_SETTINGS*>( aSettings );
if( settings && settings->m_PinSymbolSize )
return settings->m_PinSymbolSize;
@ -82,9 +82,9 @@ static int internalPinDecoSize( RENDER_SETTINGS* aSettings, const LIB_PIN &aPin
/// Utility for getting the size of the 'external' pin decorators (as a radius)
// i.e. the negation circle, the polarity 'slopes' and the nonlogic
// marker
static int externalPinDecoSize( RENDER_SETTINGS* aSettings, const LIB_PIN &aPin )
static int externalPinDecoSize( const RENDER_SETTINGS* aSettings, const LIB_PIN &aPin )
{
KIGFX::SCH_RENDER_SETTINGS* settings = static_cast<KIGFX::SCH_RENDER_SETTINGS*>( aSettings );
const KIGFX::SCH_RENDER_SETTINGS* settings = static_cast<const KIGFX::SCH_RENDER_SETTINGS*>( aSettings );
if( settings && settings->m_PinSymbolSize )
return settings->m_PinSymbolSize;
@ -171,7 +171,7 @@ int LIB_PIN::GetPenWidth() const
}
void LIB_PIN::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void LIB_PIN::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
{
PART_DRAW_OPTIONS* opts = (PART_DRAW_OPTIONS*) aData;
@ -199,7 +199,7 @@ void LIB_PIN::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* a
}
void LIB_PIN::printPinSymbol( RENDER_SETTINGS* aSettings, const wxPoint& aPos, int aOrient )
void LIB_PIN::printPinSymbol( const RENDER_SETTINGS* aSettings, const wxPoint& aPos, int aOrient )
{
wxDC* DC = aSettings->GetPrintDC();
int MapX1, MapY1, x1, y1;
@ -310,7 +310,7 @@ void LIB_PIN::printPinSymbol( RENDER_SETTINGS* aSettings, const wxPoint& aPos, i
}
void LIB_PIN::printPinTexts( RENDER_SETTINGS* aSettings, wxPoint& aPinPos, int aPinOrient,
void LIB_PIN::printPinTexts( const RENDER_SETTINGS* aSettings, wxPoint& aPinPos, int aPinOrient,
int aTextInside, bool aDrawPinNum, bool aDrawPinName )
{
if( !aDrawPinName && !aDrawPinNum )
@ -460,7 +460,7 @@ void LIB_PIN::printPinTexts( RENDER_SETTINGS* aSettings, wxPoint& aPinPos, int a
void LIB_PIN::printPinElectricalTypeName( RENDER_SETTINGS* aSettings, wxPoint& aPosition,
void LIB_PIN::printPinElectricalTypeName( const RENDER_SETTINGS* aSettings, wxPoint& aPosition,
int aOrientation )
{
wxDC* DC = aSettings->GetPrintDC();

8
eeschema/lib_pin.h
View File

@ -81,7 +81,7 @@ protected:
* Print the pin symbol without text.
* If \a aColor != 0, draw with \a aColor, else with the normal pin color.
*/
void printPinSymbol( RENDER_SETTINGS* aSettings, const wxPoint& aPos, int aOrientation );
void printPinSymbol( const RENDER_SETTINGS* aSettings, const wxPoint& aPos, int aOrientation );
/**
* Put the pin number and pin text info, given the pin line coordinates.
@ -91,13 +91,13 @@ protected:
* If aTextInside then the text is been put inside,otherwise all is drawn outside.
* Pin Name: substring between '~' is negated
*/
void printPinTexts( RENDER_SETTINGS* aSettings, wxPoint& aPinPos, int aPinOrient,
void printPinTexts( const RENDER_SETTINGS* aSettings, wxPoint& aPinPos, int aPinOrient,
int aTextInside, bool aDrawPinNum, bool aDrawPinName );
/**
* Draw the electrical type text of the pin (only for the footprint editor)
*/
void printPinElectricalTypeName( RENDER_SETTINGS* aSettings, wxPoint& aPosition,
void printPinElectricalTypeName( const RENDER_SETTINGS* aSettings, wxPoint& aPosition,
int aOrientation );
public:
@ -189,7 +189,7 @@ public:
* electrical types
* @param aTransform Transform Matrix (rotation, mirror ..)
*/
void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) override;
/**

2
eeschema/lib_polyline.cpp
View File

@ -193,7 +193,7 @@ int LIB_POLYLINE::GetPenWidth() const
}
void LIB_POLYLINE::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void LIB_POLYLINE::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
{
bool forceNoFill = static_cast<bool>( aData );

2
eeschema/lib_polyline.h
View File

@ -33,7 +33,7 @@ class LIB_POLYLINE : public LIB_ITEM
int m_Width; // Line width
std::vector<wxPoint> m_PolyPoints; // list of points (>= 2)
void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) override;
public:

4
eeschema/lib_rectangle.cpp
View File

@ -158,8 +158,8 @@ int LIB_RECTANGLE::GetPenWidth() const
}
void LIB_RECTANGLE::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
void LIB_RECTANGLE::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
void* aData, const TRANSFORM& aTransform )
{
bool forceNoFill = static_cast<bool>( aData );
int penWidth = GetPenWidth();

4
eeschema/lib_rectangle.h
View File

@ -34,8 +34,8 @@ class LIB_RECTANGLE : public LIB_ITEM
wxPoint m_Pos; // Rectangle start point.
int m_Width; // Line width
void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) override;
void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
void* aData, const TRANSFORM& aTransform ) override;
public:
LIB_RECTANGLE( LIB_PART * aParent );

2
eeschema/lib_text.cpp
View File

@ -301,7 +301,7 @@ int LIB_TEXT::GetPenWidth() const
}
void LIB_TEXT::print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void LIB_TEXT::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform )
{
wxDC* DC = aSettings->GetPrintDC();

2
eeschema/lib_text.h
View File

@ -39,7 +39,7 @@
*/
class LIB_TEXT : public LIB_ITEM, public EDA_TEXT
{
void print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
void print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, void* aData,
const TRANSFORM& aTransform ) override;
public:

2
eeschema/sch_bitmap.cpp
View File

@ -114,7 +114,7 @@ const EDA_RECT SCH_BITMAP::GetBoundingBox() const
}
void SCH_BITMAP::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_BITMAP::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxPoint pos = m_pos + aOffset;

2
eeschema/sch_bitmap.h
View File

@ -97,7 +97,7 @@ public:
void SwapData( SCH_ITEM* aItem ) override;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
/// @copydoc VIEW_ITEM::ViewGetLayers()
virtual void ViewGetLayers( int aLayers[], int& aCount ) const override;

4
eeschema/sch_bus_entry.cpp
View File

@ -195,10 +195,10 @@ void SCH_BUS_BUS_ENTRY::GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemLis
}
void SCH_BUS_ENTRY_BASE::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_BUS_ENTRY_BASE::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();
COLOR4D color = ( GetStrokeColor() == COLOR4D::UNSPECIFIED ) ?
COLOR4D color = ( GetStrokeColor() == COLOR4D::UNSPECIFIED ) ?
aSettings->GetLayerColor( m_layer ) : GetStrokeColor();
int penWidth = ( GetPenWidth() == 0 ) ? aSettings->GetDefaultPenWidth() : GetPenWidth();

2
eeschema/sch_bus_entry.h
View File

@ -79,7 +79,7 @@ public:
void ViewGetLayers( int aLayers[], int& aCount ) const override;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
const EDA_RECT GetBoundingBox() const override;

2
eeschema/sch_component.cpp
View File

@ -352,7 +352,7 @@ int SCH_COMPONENT::GetUnitCount() const
}
void SCH_COMPONENT::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_COMPONENT::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
PART_DRAW_OPTIONS opts;
opts.transform = m_transform;

2
eeschema/sch_component.h
View File

@ -495,7 +495,7 @@ public:
* @param aOffset is the drawing offset (usually wxPoint(0,0),
* but can be different when moving an object)
*/
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void SwapData( SCH_ITEM* aItem ) override;

2
eeschema/sch_edit_frame.cpp
View File

@ -1054,7 +1054,7 @@ void SCH_EDIT_FRAME::OnExit( wxCommandEvent& event )
}
void SCH_EDIT_FRAME::PrintPage( RENDER_SETTINGS* aSettings )
void SCH_EDIT_FRAME::PrintPage( const RENDER_SETTINGS* aSettings )
{
wxString fileName = Prj().AbsolutePath( GetScreen()->GetFileName() );

2
eeschema/sch_edit_frame.h
View File

@ -865,7 +865,7 @@ public:
*
* @param aDC = wxDC given by the calling print function
*/
virtual void PrintPage( RENDER_SETTINGS* aSettings ) override;
virtual void PrintPage( const RENDER_SETTINGS* aSettings ) override;
void SetNetListerCommand( const wxString& aCommand ) { m_netListerCommand = aCommand; }

2
eeschema/sch_field.cpp
View File

@ -195,7 +195,7 @@ int SCH_FIELD::GetPenWidth() const
}
void SCH_FIELD::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_FIELD::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();
COLOR4D color = aSettings->GetLayerColor( IsForceVisible() ? LAYER_HIDDEN : m_layer );

2
eeschema/sch_field.h
View File

@ -150,7 +150,7 @@ public:
int GetPenWidth() const override;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Move( const wxPoint& aMoveVector ) override
{

2
eeschema/sch_item.h
View File

@ -308,7 +308,7 @@ public:
*
* @param aOffset drawing offset (usually {0,0} but can be different when moving an object)
*/
virtual void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) = 0;
virtual void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) = 0;
/**
* Move the item by \a aMoveVector to a new position.

2
eeschema/sch_junction.cpp
View File

@ -109,7 +109,7 @@ const EDA_RECT SCH_JUNCTION::GetBoundingBox() const
}
void SCH_JUNCTION::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_JUNCTION::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();
COLOR4D color = GetJunctionColor();

2
eeschema/sch_junction.h
View File

@ -62,7 +62,7 @@ public:
const EDA_RECT GetBoundingBox() const override;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Move( const wxPoint& aMoveVector ) override
{

2
eeschema/sch_line.cpp
View File

@ -315,7 +315,7 @@ int SCH_LINE::GetPenWidth() const
}
void SCH_LINE::Print( RENDER_SETTINGS* aSettings, const wxPoint& offset )
void SCH_LINE::Print( const RENDER_SETTINGS* aSettings, const wxPoint& offset )
{
wxDC* DC = aSettings->GetPrintDC();
COLOR4D color = GetLineColor();

2
eeschema/sch_line.h
View File

@ -164,7 +164,7 @@ public:
*/
double GetLength() const;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
int GetPenWidth() const override;

2
eeschema/sch_marker.cpp
View File

@ -142,7 +142,7 @@ KIGFX::COLOR4D SCH_MARKER::getColor() const
}
void SCH_MARKER::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_MARKER::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
PrintMarker( aSettings, aOffset );
}

2
eeschema/sch_marker.h
View File

@ -58,7 +58,7 @@ public:
SCH_LAYER_ID GetColorLayer() const;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Plot( PLOTTER* aPlotter ) override
{

2
eeschema/sch_no_connect.cpp
View File

@ -101,7 +101,7 @@ int SCH_NO_CONNECT::GetPenWidth() const
}
void SCH_NO_CONNECT::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_NO_CONNECT::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();
int half = GetSize() / 2;

2
eeschema/sch_no_connect.h
View File

@ -69,7 +69,7 @@ public:
void ViewGetLayers( int aLayers[], int& aCount ) const override;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) override;

2
eeschema/sch_pin.h
View File

@ -77,7 +77,7 @@ public:
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override;
void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS& aList ) override;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override {}
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override {}
void Move( const wxPoint& aMoveVector ) override {}

2
eeschema/sch_screen.cpp
View File

@ -739,7 +739,7 @@ void SCH_SCREEN::UpdateLocalLibSymbolLinks()
}
void SCH_SCREEN::Print( RENDER_SETTINGS* aSettings )
void SCH_SCREEN::Print( const RENDER_SETTINGS* aSettings )
{
// Ensure links are up to date, even if a library was reloaded for some reason:
std::vector<SCH_ITEM*> junctions;

2
eeschema/sch_screen.h
View File

@ -276,7 +276,7 @@ public:
* @note This function is useful only for schematic. The library editor and library viewer
* do not use a draw list and therefore draws nothing.
*/
void Print( RENDER_SETTINGS* aSettings );
void Print( const RENDER_SETTINGS* aSettings );
/**
* Plot all the schematic objects to \a aPlotter.

16
eeschema/sch_sheet.cpp
View File

@ -979,15 +979,15 @@ void SCH_SHEET::Plot( PLOTTER* aPlotter )
}
void SCH_SHEET::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_SHEET::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
wxDC* DC = aSettings->GetPrintDC();
wxPoint pos = m_pos + aOffset;
int lineWidth = std::max( GetPenWidth(), aSettings->GetDefaultPenWidth() );
auto* settings = dynamic_cast<KIGFX::SCH_RENDER_SETTINGS*>( aSettings );
bool override = settings && settings->m_OverrideItemColors;
COLOR4D border = GetBorderColor();
COLOR4D background = GetBackgroundColor();
wxDC* DC = aSettings->GetPrintDC();
wxPoint pos = m_pos + aOffset;
int lineWidth = std::max( GetPenWidth(), aSettings->GetDefaultPenWidth() );
const auto* settings = dynamic_cast<const KIGFX::SCH_RENDER_SETTINGS*>( aSettings );
bool override = settings && settings->m_OverrideItemColors;
COLOR4D border = GetBorderColor();
COLOR4D background = GetBackgroundColor();
if( override || border == COLOR4D::UNSPECIFIED )
border = aSettings->GetLayerColor( LAYER_SHEET );

6
eeschema/sch_sheet.h
View File

@ -121,7 +121,7 @@ public:
*/
bool IsMovableFromAnchorPoint() override { return true; }
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
/**
* Calculate the graphic shape (a polygon) associated to the text.
@ -129,7 +129,7 @@ public:
* @param aPoints = a buffer to fill with polygon corners coordinates
* @param aPos = Position of the shape
*/
void CreateGraphicShape( RENDER_SETTINGS* aSettings,
void CreateGraphicShape( const RENDER_SETTINGS* aSettings,
std::vector <wxPoint>& aPoints, const wxPoint& aPos ) override;
void SwapData( SCH_ITEM* aItem ) override;
@ -437,7 +437,7 @@ public:
int GetPenWidth() const override;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
/**
* Return a bounding box for the sheet body but not the fields.

2
eeschema/sch_sheet_path.cpp
View File

@ -73,7 +73,7 @@ public:
// pure virtuals:
void SetPosition( const wxPoint& ) override {}
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override {}
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override {}
void Move( const wxPoint& aMoveVector ) override {}
void MirrorY( int aYaxis_position ) override {}
void MirrorX( int aXaxis_position ) override {}

4
eeschema/sch_sheet_pin.cpp
View File

@ -64,7 +64,7 @@ EDA_ITEM* SCH_SHEET_PIN::Clone() const
}
void SCH_SHEET_PIN::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_SHEET_PIN::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
// The icon selection is handle by the virtual method CreateGraphicShape called by ::Print
SCH_HIERLABEL::Print( aSettings, aOffset );
@ -251,7 +251,7 @@ void SCH_SHEET_PIN::Rotate( wxPoint aPosition )
}
void SCH_SHEET_PIN::CreateGraphicShape( RENDER_SETTINGS* aRenderSettings,
void SCH_SHEET_PIN::CreateGraphicShape( const RENDER_SETTINGS* aRenderSettings,
std::vector<wxPoint>& aPoints, const wxPoint& aPos )
{
/*

20
eeschema/sch_text.cpp
View File

@ -173,7 +173,7 @@ bool SCH_TEXT::IncrementLabel( int aIncrement )
}
wxPoint SCH_TEXT::GetSchematicTextOffset( RENDER_SETTINGS* aSettings ) const
wxPoint SCH_TEXT::GetSchematicTextOffset( const RENDER_SETTINGS* aSettings ) const
{
wxPoint text_offset;
@ -321,12 +321,12 @@ bool SCH_TEXT::operator<( const SCH_ITEM& aItem ) const
}
int SCH_TEXT::GetTextOffset( RENDER_SETTINGS* aSettings ) const
int SCH_TEXT::GetTextOffset( const RENDER_SETTINGS* aSettings ) const
{
double ratio;
if( aSettings )
ratio = static_cast<SCH_RENDER_SETTINGS*>( aSettings )->m_TextOffsetRatio;
ratio = static_cast<const SCH_RENDER_SETTINGS*>( aSettings )->m_TextOffsetRatio;
else if( Schematic() )
ratio = Schematic()->Settings().m_TextOffsetRatio;
else
@ -344,7 +344,7 @@ int SCH_TEXT::GetPenWidth() const
}
void SCH_TEXT::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_TEXT::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
COLOR4D color = aSettings->GetLayerColor( m_layer );
wxPoint text_offset = aOffset + GetSchematicTextOffset( aSettings );
@ -910,7 +910,7 @@ void SCH_GLOBALLABEL::RunOnChildren( const std::function<void( SCH_ITEM* )>& aFu
}
wxPoint SCH_GLOBALLABEL::GetSchematicTextOffset( RENDER_SETTINGS* aSettings ) const
wxPoint SCH_GLOBALLABEL::GetSchematicTextOffset( const RENDER_SETTINGS* aSettings ) const
{
wxPoint text_offset;
int dist = GetTextOffset( aSettings );
@ -1158,7 +1158,7 @@ bool SCH_GLOBALLABEL::ResolveTextVar( wxString* token, int aDepth ) const
}
void SCH_GLOBALLABEL::Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
void SCH_GLOBALLABEL::Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset )
{
static std::vector<wxPoint> s_poly;
@ -1188,7 +1188,7 @@ void SCH_GLOBALLABEL::Plot( PLOTTER* aPlotter )
m_intersheetRefsField.Plot( aPlotter );
}
void SCH_GLOBALLABEL::CreateGraphicShape( RENDER_SETTINGS* aRenderSettings,
void SCH_GLOBALLABEL::CreateGraphicShape( const RENDER_SETTINGS* aRenderSettings,
std::vector<wxPoint>& aPoints, const wxPoint& Pos )
{
int margin = GetTextOffset( aRenderSettings );
@ -1380,7 +1380,7 @@ void SCH_HIERLABEL::SetLabelSpinStyle( LABEL_SPIN_STYLE aSpinStyle )
}
void SCH_HIERLABEL::Print( RENDER_SETTINGS* aSettings, const wxPoint& offset )
void SCH_HIERLABEL::Print( const RENDER_SETTINGS* aSettings, const wxPoint& offset )
{
wxCHECK_RET( Schematic(), "No parent SCHEMATIC set for SCH_LABEL!" );
@ -1400,7 +1400,7 @@ void SCH_HIERLABEL::Print( RENDER_SETTINGS* aSettings, const wxPoint& offset )
}
void SCH_HIERLABEL::CreateGraphicShape( RENDER_SETTINGS* aRenderSettings,
void SCH_HIERLABEL::CreateGraphicShape( const RENDER_SETTINGS* aRenderSettings,
std::vector<wxPoint>& aPoints, const wxPoint& Pos )
{
int* Template = TemplateShape[static_cast<int>( m_shape )][static_cast<int>( m_spin_style )];
@ -1477,7 +1477,7 @@ const EDA_RECT SCH_HIERLABEL::GetBoundingBox() const
}
wxPoint SCH_HIERLABEL::GetSchematicTextOffset( RENDER_SETTINGS* aSettings ) const
wxPoint SCH_HIERLABEL::GetSchematicTextOffset( const RENDER_SETTINGS* aSettings ) const
{
wxPoint text_offset;
int dist = GetTextOffset( aSettings );

20
eeschema/sch_text.h
View File

@ -242,9 +242,9 @@ public:
* This offset depends on the orientation, the type of text, and the area required to
* draw the associated graphic symbol or to put the text above a wire.
*/
virtual wxPoint GetSchematicTextOffset( RENDER_SETTINGS* aSettings ) const;
virtual wxPoint GetSchematicTextOffset( const RENDER_SETTINGS* aSettings ) const;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& offset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& offset ) override;
/**
* Calculate the graphic shape (a polygon) associated to the text.
@ -253,7 +253,7 @@ public:
* @param Pos Position of the shape, for texts and labels: do nothing
* Mainly for derived classes (SCH_SHEET_PIN and Hierarchical labels)
*/
virtual void CreateGraphicShape( RENDER_SETTINGS* aSettings,
virtual void CreateGraphicShape( const RENDER_SETTINGS* aSettings,
std::vector <wxPoint>& aPoints, const wxPoint& Pos )
{
aPoints.clear();
@ -265,7 +265,7 @@ public:
bool operator<( const SCH_ITEM& aItem ) const override;
int GetTextOffset( RENDER_SETTINGS* aSettings = nullptr ) const;
int GetTextOffset( const RENDER_SETTINGS* aSettings = nullptr ) const;
int GetPenWidth() const override;
@ -408,11 +408,11 @@ public:
void SetLabelSpinStyle( LABEL_SPIN_STYLE aSpinStyle ) override;
wxPoint GetSchematicTextOffset( RENDER_SETTINGS* aSettings ) const override;
wxPoint GetSchematicTextOffset( const RENDER_SETTINGS* aSettings ) const override;
const EDA_RECT GetBoundingBox() const override;
void CreateGraphicShape( RENDER_SETTINGS* aRenderSettings,
void CreateGraphicShape( const RENDER_SETTINGS* aRenderSettings,
std::vector<wxPoint>& aPoints, const wxPoint& aPos ) override;
void UpdateIntersheetRefProps();
@ -432,7 +432,7 @@ public:
BITMAP_DEF GetMenuImage() const override;
void Print( RENDER_SETTINGS* aSettings, const wxPoint& offset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& offset ) override;
void Plot( PLOTTER* aPlotter ) override;
@ -470,7 +470,7 @@ public:
~SCH_HIERLABEL() { }
void Print( RENDER_SETTINGS* aSettings, const wxPoint& offset ) override;
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& offset ) override;
static inline bool ClassOf( const EDA_ITEM* aItem )
{
@ -484,9 +484,9 @@ public:
void SetLabelSpinStyle( LABEL_SPIN_STYLE aSpinStyle ) override;
wxPoint GetSchematicTextOffset( RENDER_SETTINGS* aSettings ) const override;
wxPoint GetSchematicTextOffset( const RENDER_SETTINGS* aSettings ) const override;
void CreateGraphicShape( RENDER_SETTINGS* aSettings, std::vector<wxPoint>& aPoints,
void CreateGraphicShape( const RENDER_SETTINGS* aSettings, std::vector<wxPoint>& aPoints,
const wxPoint& Pos ) override;
const EDA_RECT GetBoundingBox() const override;

2
eeschema/symbol_editor/symbol_edit_frame.h
View File

@ -284,7 +284,7 @@ public:
/**
* Print a page.
*/
void PrintPage( RENDER_SETTINGS* aSettings ) override;
void PrintPage( const RENDER_SETTINGS* aSettings ) override;
/**
* Create the SVG print file for the current edited symbol.

2
eeschema/symbol_editor/symbol_editor_plotter.cpp
View File

@ -80,7 +80,7 @@ void SYMBOL_EDIT_FRAME::SVGPlotSymbol( const wxString& aFullFileName )
}
void SYMBOL_EDIT_FRAME::PrintPage( RENDER_SETTINGS* aSettings )
void SYMBOL_EDIT_FRAME::PrintPage( const RENDER_SETTINGS* aSettings )
{
if( !m_my_part )
return;

4
include/eda_draw_frame.h
View File

@ -297,7 +297,7 @@ public:
* @param aFilename The filename to display in basic inscriptions.
* @param aSheetLayer The layer displayed from PcbNew.
*/
void PrintWorkSheet( RENDER_SETTINGS* aSettings, BASE_SCREEN* aScreen, double aMils2Iu,
void PrintWorkSheet( const RENDER_SETTINGS* aSettings, BASE_SCREEN* aScreen, double aMils2Iu,
const wxString& aFilename, const wxString& aSheetLayer = wxEmptyString );
void DisplayToolMsg( const wxString& msg ) override;
@ -385,7 +385,7 @@ public:
*
* @param aDC wxDC given by the calling print function
*/
virtual void PrintPage( RENDER_SETTINGS* aSettings );
virtual void PrintPage( const RENDER_SETTINGS* aSettings );
/**
* Use to start up the GAL drawing canvas.

6
include/eda_text.h
View File

@ -272,8 +272,8 @@ public:
* @param aColor text color.
* @param aDisplay_mode #FILLED or #SKETCH.
*/
void Print( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor,
OUTLINE_MODE aDisplay_mode = FILLED );
void Print( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset,
COLOR4D aColor, OUTLINE_MODE aDisplay_mode = FILLED );
/**
* Convert the text shape to a list of segment.
@ -383,7 +383,7 @@ private:
* @param aText the single line of text to draw.
* @param aPos the position of this line ).
*/
void printOneLineOfText( RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor,
void printOneLineOfText( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset, COLOR4D aColor,
OUTLINE_MODE aFillMode, const wxString& aText, const wxPoint& aPos );
wxString m_text;

2
include/marker_base.h
View File

@ -76,7 +76,7 @@ public:
/**
* Print the shape is the polygon defined in m_Corners (array of wxPoints).
*/
void PrintMarker( RENDER_SETTINGS* aSettings, const wxPoint& aOffset );
void PrintMarker( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset );
/**
* @return the position of this marker in internal units.

18
include/page_layout/ws_draw_item.h
View File

@ -76,13 +76,13 @@ public:
}
// The function to print a WS_DRAW_ITEM
virtual void PrintWsItem( RENDER_SETTINGS* aSettings )
virtual void PrintWsItem( const RENDER_SETTINGS* aSettings )
{
PrintWsItem( aSettings, wxPoint( 0, 0 ) );
}
// More advanced version of DrawWsItem. This is what must be defined in the derived type.
virtual void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) = 0;
virtual void PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) = 0;
// Derived types must define GetBoundingBox() as a minimum, and can then override the
// two HitTest() functions if they need something more specific.
@ -141,7 +141,7 @@ public:
const EDA_RECT GetBoundingBox() const override;
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;
void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override;
@ -175,7 +175,7 @@ public:
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy = 0 ) const override;
void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override;
@ -224,7 +224,7 @@ public:
wxPoint GetPosition() const override { return GetStart(); }
void SetPosition( const wxPoint& aPos ) override { SetStart( aPos ); }
void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
const EDA_RECT GetBoundingBox() const override;
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;
@ -270,7 +270,7 @@ public:
wxPoint GetPosition() const override { return wxPoint( 0, 0 ); }
void SetPosition( const wxPoint& aPos ) override { /* do nothing */ }
void PrintWsItem( RENDER_SETTINGS* , const wxPoint& ) override { /* do nothing */ }
void PrintWsItem( const RENDER_SETTINGS* , const wxPoint& ) override { /* do nothing */ }
const EDA_RECT GetBoundingBox() const override;
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override { return false; }
@ -312,7 +312,7 @@ public:
virtual wxString GetClass() const override { return wxT( "WS_DRAW_ITEM_TEXT" ); }
void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void SetTextAngle( double aAngle ) override;
@ -350,7 +350,7 @@ public:
wxPoint GetPosition() const override { return m_pos; }
void SetPosition( const wxPoint& aPos ) override { m_pos = aPos; }
void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void PrintWsItem( const RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;
bool HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy = 0 ) const override;
@ -509,7 +509,7 @@ public:
/**
* Draws the item list created by BuildWorkSheetGraphicList
*/
void Print( RENDER_SETTINGS* aSettings );
void Print( const RENDER_SETTINGS* aSettings );
/**
* Drawing or plot the page layout.

2
include/page_layout/ws_painter.h
View File

@ -150,7 +150,7 @@ private:
* - the LTmargin The left top margin of the page layout.
* - the RBmargin The right bottom margin of the page layout.
*/
void PrintPageLayout( RENDER_SETTINGS* aSettings, const PAGE_INFO& aPageInfo,
void PrintPageLayout( const RENDER_SETTINGS* aSettings, const PAGE_INFO& aPageInfo,
const wxString& aFullSheetName, const wxString& aFileName,
const TITLE_BLOCK& aTitleBlock, int aSheetCount, const wxString& aPageNumber,
double aScalar, const PROJECT* aProject,

2
pagelayout_editor/pl_editor_frame.cpp
View File

@ -750,7 +750,7 @@ void PL_EDITOR_FRAME::UpdateStatusBar()
}
void PL_EDITOR_FRAME::PrintPage( RENDER_SETTINGS* aSettings )
void PL_EDITOR_FRAME::PrintPage( const RENDER_SETTINGS* aSettings )
{
GetScreen()->SetVirtualPageNumber( GetPageNumberOption() ? 1 : 2 );
WS_DATA_MODEL& model = WS_DATA_MODEL::GetTheInstance();

2
pagelayout_editor/pl_editor_frame.h
View File

@ -217,7 +217,7 @@ public:
* used to print a page
* @param aDC = wxDC given by the calling print function
*/
virtual void PrintPage( RENDER_SETTINGS* aSettings ) override;
virtual void PrintPage( const RENDER_SETTINGS* aSettings ) override;
void OnFileHistory( wxCommandEvent& event );
void OnClearFileHistory( wxCommandEvent& aEvent );

Write Preview
Loading…
Cancel
Save