Remove trigo.h from eda_text.h

This commit is contained in:
Marek Roszko 2020-10-13 23:37:48 -04:00
parent 9656bd310b
commit 12d21e34e2
36 changed files with 40 additions and 5 deletions

View File

@ -58,6 +58,7 @@
#include <page_layout/ws_data_item.h> #include <page_layout/ws_data_item.h>
#include <page_layout/ws_draw_item.h> #include <page_layout/ws_draw_item.h>
#include <page_layout/ws_painter.h> #include <page_layout/ws_painter.h>
#include <trigo.h>
using KIGFX::COLOR4D; using KIGFX::COLOR4D;

View File

@ -57,6 +57,7 @@
#include <page_info.h> #include <page_info.h>
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
#include <gr_basic.h> #include <gr_basic.h>
#include <trigo.h>
// ============================ BASE CLASS ============================== // ============================ BASE CLASS ==============================
@ -187,6 +188,11 @@ wxString WS_DRAW_ITEM_TEXT::GetSelectMenuText( EDA_UNITS aUnits ) const
} }
void WS_DRAW_ITEM_TEXT::SetTextAngle( double aAngle )
{
EDA_TEXT::SetTextAngle( NormalizeAngle360Min( aAngle ) );
}
// ============================ POLYGON ================================= // ============================ POLYGON =================================
void WS_DRAW_ITEM_POLYPOLYGONS::PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) void WS_DRAW_ITEM_POLYPOLYGONS::PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset )

View File

@ -33,6 +33,7 @@
#include <macros.h> #include <macros.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>
#include <trigo.h>
/** /**
* Oblique angle for DXF native text * Oblique angle for DXF native text

View File

@ -29,6 +29,7 @@
#include <kicad_string.h> #include <kicad_string.h>
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND
#include <trigo.h>
#include <build_version.h> #include <build_version.h>

View File

@ -200,6 +200,7 @@
#include <kicad_string.h> #include <kicad_string.h>
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND
#include <trigo.h>
#include "plotter_hpgl.h" #include "plotter_hpgl.h"

View File

@ -32,6 +32,7 @@
#include <eda_item.h> #include <eda_item.h>
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND
#include <trigo.h>
#include "plotters_pslike.h" #include "plotters_pslike.h"

View File

@ -98,6 +98,7 @@
#include <eda_item.h> #include <eda_item.h>
#include <common.h> #include <common.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <trigo.h>
#include <cstdint> #include <cstdint>
#include <wx/mstream.h> #include <wx/mstream.h>

View File

@ -31,6 +31,7 @@
#include <common.h> #include <common.h>
#include <base_units.h> #include <base_units.h>
#include <trigo.h>
using namespace KIGFX::PREVIEW; using namespace KIGFX::PREVIEW;

View File

@ -28,6 +28,7 @@
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
#include <painter.h> #include <painter.h>
#include <view/view.h> #include <view/view.h>
#include <trigo.h>
#include <common.h> #include <common.h>

View File

@ -38,6 +38,7 @@
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <tools/ee_actions.h> #include <tools/ee_actions.h>
#include <tools/ee_selection_tool.h> #include <tools/ee_selection_tool.h>
#include <trigo.h>
std::vector<wxPoint> SCH_EDIT_FRAME::GetSchematicConnections() std::vector<wxPoint> SCH_EDIT_FRAME::GetSchematicConnections()

View File

@ -34,6 +34,7 @@
#include <lib_pin.h> #include <lib_pin.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <libedit/libedit_settings.h> #include <libedit/libedit_settings.h>
#include <trigo.h>
#include "sch_painter.h" #include "sch_painter.h"
// small margin in internal units between the pin text and the pin line // small margin in internal units between the pin text and the pin line

View File

@ -33,6 +33,7 @@
#include <base_units.h> #include <base_units.h>
#include <eda_draw_frame.h> #include <eda_draw_frame.h>
#include <sch_bitmap.h> #include <sch_bitmap.h>
#include <trigo.h>
#include <wx/mstream.h> #include <wx/mstream.h>

View File

@ -31,6 +31,7 @@
#include <sch_text.h> #include <sch_text.h>
#include <settings/color_settings.h> #include <settings/color_settings.h>
#include <netclass.h> #include <netclass.h>
#include <trigo.h>
#include "sch_painter.h" #include "sch_painter.h"

View File

@ -32,6 +32,7 @@
#include <sch_sheet_path.h> #include <sch_sheet_path.h>
#include <schematic.h> #include <schematic.h>
#include <trace_helpers.h> #include <trace_helpers.h>
#include <trigo.h>
/** /**

View File

@ -44,6 +44,7 @@
#include <settings/color_settings.h> #include <settings/color_settings.h>
#include <kicad_string.h> #include <kicad_string.h>
#include <trace_helpers.h> #include <trace_helpers.h>
#include <trigo.h>
SCH_FIELD::SCH_FIELD( const wxPoint& aPos, int aFieldId, SCH_ITEM* aParent, SCH_FIELD::SCH_FIELD( const wxPoint& aPos, int aFieldId, SCH_ITEM* aParent,

View File

@ -30,6 +30,7 @@
#include <schematic.h> #include <schematic.h>
#include <project/project_file.h> #include <project/project_file.h>
#include <project/net_settings.h> #include <project/net_settings.h>
#include <trigo.h>
SCH_LINE::SCH_LINE( const wxPoint& pos, int layer ) : SCH_LINE::SCH_LINE( const wxPoint& pos, int layer ) :

View File

@ -34,6 +34,7 @@
#include <sch_no_connect.h> #include <sch_no_connect.h>
#include <settings/color_settings.h> #include <settings/color_settings.h>
#include <default_values.h> // For some default values #include <default_values.h> // For some default values
#include <trigo.h>
SCH_NO_CONNECT::SCH_NO_CONNECT( const wxPoint& pos ) : SCH_NO_CONNECT::SCH_NO_CONNECT( const wxPoint& pos ) :

View File

@ -45,6 +45,7 @@
#include <project/net_settings.h> #include <project/net_settings.h>
#include <sch_iref.h> #include <sch_iref.h>
#include <dialog_helpers.h> #include <dialog_helpers.h>
#include <trigo.h>
using KIGFX::SCH_RENDER_SETTINGS; using KIGFX::SCH_RENDER_SETTINGS;

View File

@ -49,6 +49,7 @@
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <tools/ee_grid_helper.h> #include <tools/ee_grid_helper.h>
#include <tools/sch_line_wire_bus_tool.h> #include <tools/sch_line_wire_bus_tool.h>
#include <trigo.h>
#include <view/view.h> #include <view/view.h>
#include <view/view_controls.h> #include <view/view_controls.h>
#include <view/view_group.h> #include <view/view_group.h>

View File

@ -51,6 +51,7 @@
#include <tools/gerbview_selection.h> #include <tools/gerbview_selection.h>
#include <tools/gerbview_selection_tool.h> #include <tools/gerbview_selection_tool.h>
#include <tools/gerbview_control.h> #include <tools/gerbview_control.h>
#include <trigo.h>
#include <view/view.h> #include <view/view.h>
#include <base_screen.h> #include <base_screen.h>
#include <gerbview_painter.h> #include <gerbview_painter.h>

View File

@ -24,6 +24,7 @@
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>
#include <convert_to_biu.h> #include <convert_to_biu.h>
#include <gerbview.h> #include <gerbview.h>
#include <trigo.h>
#include <dcode.h> #include <dcode.h>
#include <gerber_draw_item.h> #include <gerber_draw_item.h>

View File

@ -25,7 +25,6 @@
#ifndef EDA_TEXT_H_ #ifndef EDA_TEXT_H_
#define EDA_TEXT_H_ #define EDA_TEXT_H_
#include <trigo.h> // NORMALIZE_ANGLE_POS( angle );
#include <common.h> // wxStringSplit #include <common.h> // wxStringSplit
#include <eda_rect.h> #include <eda_rect.h>
#include "kicad_string.h" #include "kicad_string.h"

View File

@ -295,10 +295,7 @@ public:
void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override; void PrintWsItem( RENDER_SETTINGS* aSettings, const wxPoint& aOffset ) override;
void SetTextAngle( double aAngle ) override void SetTextAngle( double aAngle ) override;
{
EDA_TEXT::SetTextAngle( NormalizeAngle360Min( aAngle ) );
}
wxPoint GetPosition() const override { return GetTextPos(); } wxPoint GetPosition() const override { return GetTextPos(); }
void SetPosition( const wxPoint& aPos ) override { SetTextPos( aPos ); } void SetPosition( const wxPoint& aPos ) override { SetTextPos( aPos ); }

View File

@ -35,6 +35,7 @@
#include <geometry/shape_segment.h> #include <geometry/shape_segment.h>
#include <settings/color_settings.h> #include <settings/color_settings.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <trigo.h>
DIMENSION::DIMENSION( BOARD_ITEM* aParent, KICAD_T aType ) : DIMENSION::DIMENSION( BOARD_ITEM* aParent, KICAD_T aType ) :

View File

@ -34,6 +34,7 @@
#include <widgets/ui_common.h> #include <widgets/ui_common.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <drc/drc_item.h> #include <drc/drc_item.h>
#include <trigo.h>
/// Factor to convert the maker unit shape to internal units: /// Factor to convert the maker unit shape to internal units:

View File

@ -36,6 +36,7 @@
#include <base_units.h> #include <base_units.h>
#include <settings/color_settings.h> #include <settings/color_settings.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <trigo.h>
PCB_TARGET::PCB_TARGET( BOARD_ITEM* aParent ) : PCB_TARGET::PCB_TARGET( BOARD_ITEM* aParent ) :

View File

@ -35,6 +35,7 @@
#include <math_for_graphics.h> #include <math_for_graphics.h>
#include <settings/color_settings.h> #include <settings/color_settings.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <trigo.h>
ZONE_CONTAINER::ZONE_CONTAINER( BOARD_ITEM_CONTAINER* aParent, bool aInModule ) ZONE_CONTAINER::ZONE_CONTAINER( BOARD_ITEM_CONTAINER* aParent, bool aInModule )
: BOARD_CONNECTED_ITEM( aParent, aInModule ? PCB_FP_ZONE_AREA_T : PCB_ZONE_AREA_T ), : BOARD_CONNECTED_ITEM( aParent, aInModule ? PCB_FP_ZONE_AREA_T : PCB_ZONE_AREA_T ),

View File

@ -32,6 +32,7 @@
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include <class_zone.h> #include <class_zone.h>
#include <class_board.h> #include <class_board.h>
#include <trigo.h>
#include <dialog_copper_zones_base.h> #include <dialog_copper_zones_base.h>

View File

@ -26,6 +26,7 @@
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND
#include <widgets/tab_traversal.h> #include <widgets/tab_traversal.h>
#include <pcb_edit_frame.h> #include <pcb_edit_frame.h>
#include <trigo.h>
// initialise statics // initialise statics
DIALOG_MOVE_EXACT::MOVE_EXACT_OPTIONS DIALOG_MOVE_EXACT::m_options; DIALOG_MOVE_EXACT::MOVE_EXACT_OPTIONS DIALOG_MOVE_EXACT::m_options;

View File

@ -26,6 +26,7 @@
#include <tools/pcb_actions.h> #include <tools/pcb_actions.h>
#include <widgets/tab_traversal.h> #include <widgets/tab_traversal.h>
#include <pcb_edit_frame.h> #include <pcb_edit_frame.h>
#include <trigo.h>
// initialise statics // initialise statics
DIALOG_POSITION_RELATIVE::POSITION_RELATIVE_OPTIONS DIALOG_POSITION_RELATIVE::m_options; DIALOG_POSITION_RELATIVE::POSITION_RELATIVE_OPTIONS DIALOG_POSITION_RELATIVE::m_options;

View File

@ -41,6 +41,7 @@
#include <pgm_base.h> #include <pgm_base.h>
#include <build_version.h> #include <build_version.h>
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND
#include <trigo.h>
#include <pcbplot.h> #include <pcbplot.h>
#include <class_board.h> #include <class_board.h>

View File

@ -29,6 +29,7 @@
#include <class_board.h> #include <class_board.h>
#include <class_module.h> #include <class_module.h>
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <trigo.h>
FP_TEXT::FP_TEXT( MODULE* parent, TEXT_TYPE text_type ) : FP_TEXT::FP_TEXT( MODULE* parent, TEXT_TYPE text_type ) :
BOARD_ITEM( parent, PCB_FP_TEXT_T ), BOARD_ITEM( parent, PCB_FP_TEXT_T ),

View File

@ -26,6 +26,7 @@
#include <confirm.h> #include <confirm.h>
#include <dialog_text_entry.h> #include <dialog_text_entry.h>
#include <microwave/microwave_tool.h> #include <microwave/microwave_tool.h>
#include <trigo.h>
MODULE* MICROWAVE_TOOL::createFootprint( MICROWAVE_FOOTPRINT_SHAPE aFootprintShape ) MODULE* MICROWAVE_TOOL::createFootprint( MICROWAVE_FOOTPRINT_SHAPE aFootprintShape )

View File

@ -30,6 +30,7 @@
#include <class_board.h> #include <class_board.h>
#include <pcb_text.h> #include <pcb_text.h>
#include <pcb_painter.h> #include <pcb_painter.h>
#include <trigo.h>
using KIGFX::PCB_RENDER_SETTINGS; using KIGFX::PCB_RENDER_SETTINGS;

View File

@ -33,6 +33,7 @@
#include <common.h> #include <common.h>
#include <convert_to_biu.h> #include <convert_to_biu.h>
#include <math/util.h> // for KiROUND #include <math/util.h> // for KiROUND
#include <trigo.h>
#include <pcad2kicad_common.h> #include <pcad2kicad_common.h>

View File

@ -26,6 +26,7 @@
#include <text_mod_grid_table.h> #include <text_mod_grid_table.h>
#include <widgets/grid_icon_text_helpers.h> #include <widgets/grid_icon_text_helpers.h>
#include <widgets/grid_combobox.h> #include <widgets/grid_combobox.h>
#include <trigo.h>
#include "grid_layer_box_helpers.h" #include "grid_layer_box_helpers.h"
enum enum