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

Split base_struct into eda_item and eda_rect

6.0.7
Marek Roszko 5 years ago
parent
b68bfab791
commit
b2e9f6987d
78 changed files with 953 additions and 924 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. 3
      common/CMakeLists.txt
  2. 2
      common/base_screen.cpp
  3. 845
      common/base_struct.cpp
  4. 2
      common/commit.cpp
  5. 2
      common/dialogs/dialog_page_settings.cpp
  6. 330
      common/eda_item.cpp
  7. 544
      common/eda_rect.cpp
  8. 2
      common/eda_text.cpp
  9. 2
      common/gr_basic.cpp
  10. 2
      common/page_layout/page_layout_reader.cpp
  11. 2
      common/page_layout/ws_data_model_io.cpp
  12. 2
      common/plotters/DXF_plotter.cpp
  13. 2
      common/plotters/GERBER_plotter.cpp
  14. 2
      common/plotters/HPGL_plotter.cpp
  15. 2
      common/plotters/PDF_plotter.cpp
  16. 2
      common/plotters/PS_plotter.cpp
  17. 2
      common/plotters/SVG_plotter.cpp
  18. 2
      common/plotters/common_plot_functions.cpp
  19. 2
      common/plotters/plotter.cpp
  20. 2
      common/plotters/plotter_dxf.h
  21. 2
      common/plotters/plotter_gerber.h
  22. 2
      common/plotters/plotter_hpgl.h
  23. 2
      common/plotters/plotters_pslike.h
  24. 2
      common/rc_item.h
  25. 4
      common/swig/kicad.i
  26. 2
      common/undo_redo_container.cpp
  27. 2
      common/view/view.cpp
  28. 2
      eeschema/lib_field.cpp
  29. 2
      eeschema/lib_item.h
  30. 2
      eeschema/sch_component.h
  31. 2
      eeschema/sch_draw_panel.h
  32. 2
      eeschema/sch_field.cpp
  33. 2
      eeschema/sch_item.cpp
  34. 2
      eeschema/sch_item.h
  35. 2
      eeschema/sch_preview_panel.h
  36. 2
      eeschema/sch_screen.h
  37. 2
      eeschema/sch_sheet_path.h
  38. 2
      eeschema/sch_view.h
  39. 2
      eeschema/schematic.h
  40. 2
      eeschema/tools/lib_move_tool.cpp
  41. 2
      eeschema/tools/sch_edit_tool.cpp
  42. 2
      eeschema/tools/sch_line_wire_bus_tool.cpp
  43. 2
      eeschema/tools/sch_move_tool.cpp
  44. 2
      gerbview/am_primitive.h
  45. 2
      gerbview/dcode.h
  46. 2
      gerbview/gerber_draw_item.h
  47. 2
      gerbview/tools/gerbview_inspection_tool.cpp
  48. 2
      gerbview/tools/gerbview_selection.cpp
  49. 2
      gerbview/tools/gerbview_selection_tool.cpp
  50. 2
      include/base_screen.h
  51. 2
      include/class_board_item.h
  52. 2
      include/collector.h
  53. 7
      include/eda_item.h
  54. 2
      include/eda_text.h
  55. 2
      include/gr_text.h
  56. 2
      include/hashtables.h
  57. 2
      include/lib_tree_item.h
  58. 2
      include/page_layout/ws_proxy_undo_item.h
  59. 2
      include/page_layout/ws_proxy_view_item.h
  60. 2
      include/pcb_base_frame.h
  61. 2
      include/plotter.h
  62. 2
      include/preview_items/arc_assistant.h
  63. 2
      include/preview_items/bright_box.h
  64. 2
      include/preview_items/ruler_item.h
  65. 2
      include/preview_items/simple_overlay_item.h
  66. 2
      include/preview_items/two_point_assistant.h
  67. 2
      include/tool/edit_points.h
  68. 2
      include/tool/selection.h
  69. 2
      include/tool/tool_base.h
  70. 2
      include/undo_redo_container.h
  71. 2
      include/widgets/unit_binder.h
  72. 2
      pagelayout_editor/tools/pl_edit_tool.cpp
  73. 2
      pcb_calculator/datafile_read_write.h
  74. 2
      pcbnew/exporters/gen_drill_report_files.cpp
  75. 2
      pcbnew/pcb_text.cpp
  76. 2
      pcbnew/plot_board_layers.cpp
  77. 2
      pcbnew/plot_brditems_plotter.cpp
  78. 2
      pcbnew/ratsnest/ratsnest_viewitem.h

3
common/CMakeLists.txt
View File

@ -301,7 +301,6 @@ set( COMMON_SRCS
array_axis.cpp
array_options.cpp
base64.cpp
base_struct.cpp
bin_mod.cpp
bitmap.cpp
bitmap_base.cpp
@ -319,7 +318,9 @@ set( COMMON_SRCS
eda_dde.cpp
eda_doc.cpp
eda_draw_frame.cpp
eda_item.cpp
eda_pattern_match.cpp
eda_rect.cpp
eda_size_ctrl.cpp
env_paths.cpp
env_vars.cpp

2
common/base_screen.cpp
View File

@ -25,7 +25,7 @@
*/
#include <base_screen.h>
#include <base_struct.h>
#include <eda_item.h>
#include <trace_helpers.h>

845
common/base_struct.cpp
View File

@ -1,845 +0,0 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @brief Implementation of EDA_ITEM base class for KiCad.
*/
#include <deque>
#include <trigo.h>
#include <base_screen.h>
#include <bitmaps.h>
#include <trace_helpers.h>
#include <eda_rect.h>
#include <algorithm>
static const unsigned char dummy_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x5f, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x03, 0x25, 0x98, 0x61, 0x68, 0x1a, 0x00, 0x04, 0x46, 0x40, 0xfc, 0x02, 0x88, 0x45, 0x41, 0x1c,
0x76, 0x20, 0xfe, 0x01, 0xc4, 0xbe, 0x24, 0x18, 0x60, 0x01, 0xc4, 0x20, 0x86, 0x04, 0x88, 0xc3,
0x01, 0xe5, 0x04, 0x0c, 0xb8, 0x01, 0x37, 0x81, 0xf8, 0x04, 0x91, 0xf8, 0x0a, 0x54, 0x8f, 0x06,
0xb2, 0x01, 0x9b, 0x81, 0x78, 0x02, 0x91, 0x78, 0x05, 0x54, 0x8f, 0xca, 0xe0, 0x08, 0x03, 0x36,
0xa8, 0xbf, 0xec, 0xc8, 0x32, 0x80, 0xcc, 0x84, 0x04, 0x0a, 0xbc, 0x1d, 0x40, 0x2c, 0xc8, 0x30,
0xf4, 0x33, 0x13, 0x00, 0x6b, 0x1a, 0x46, 0x7b, 0x68, 0xe7, 0x0f, 0x0b, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
static const BITMAP_OPAQUE dummy_xpm[1] = {{ dummy_png, sizeof( dummy_png ), "dummy_xpm" }};
EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType ) :
m_StructType( idType ),
m_Status( 0 ),
m_Parent( parent ),
m_forceVisible( false ),
m_Flags( 0 )
{ }
EDA_ITEM::EDA_ITEM( KICAD_T idType ) :
m_StructType( idType ),
m_Status( 0 ),
m_Parent( nullptr ),
m_forceVisible( false ),
m_Flags( 0 )
{ }
EDA_ITEM::EDA_ITEM( const EDA_ITEM& base ) :
m_Uuid( base.m_Uuid ),
m_StructType( base.m_StructType ),
m_Status( base.m_Status ),
m_Parent( base.m_Parent ),
m_forceVisible( base.m_forceVisible ),
m_Flags( base.m_Flags )
{ }
void EDA_ITEM::SetModified()
{
SetFlags( IS_CHANGED );
// If this a child object, then the parent modification state also needs to be set.
if( m_Parent )
m_Parent->SetModified();
}
const EDA_RECT EDA_ITEM::GetBoundingBox() const
{
// return a zero-sized box per default. derived classes should override
// this
return EDA_RECT( wxPoint( 0, 0 ), wxSize( 0, 0 ) );
}
EDA_ITEM* EDA_ITEM::Clone() const
{
wxCHECK_MSG( false, NULL, wxT( "Clone not implemented in derived class " ) + GetClass() +
wxT( ". Bad programmer!" ) );
}
// see base_struct.h
// many classes inherit this method, be careful:
//TODO (snh): Fix this to use std::set instead of C-style vector
SEARCH_RESULT EDA_ITEM::Visit( INSPECTOR inspector, void* testData, const KICAD_T scanTypes[] )
{
#if 0 && defined(DEBUG)
std::cout << GetClass().mb_str() << ' ';
#endif
if( IsType( scanTypes ) )
{
if( SEARCH_RESULT::QUIT == inspector( this, testData ) )
return SEARCH_RESULT::QUIT;
}
return SEARCH_RESULT::CONTINUE;
}
wxString EDA_ITEM::GetSelectMenuText( EDA_UNITS aUnits ) const
{
wxFAIL_MSG( wxT( "GetSelectMenuText() was not overridden for schematic item type " ) +
GetClass() );
return wxString( wxT( "Undefined menu text for " ) + GetClass() );
}
bool EDA_ITEM::Matches( const wxString& aText, wxFindReplaceData& aSearchData )
{
wxString text = aText;
wxString searchText = aSearchData.GetFindString();
// Don't match if searching for replaceable item and the item doesn't support text replace.
if( (aSearchData.GetFlags() & FR_SEARCH_REPLACE) && !IsReplaceable() )
return false;
if( aSearchData.GetFlags() & wxFR_WHOLEWORD )
return aText.IsSameAs( searchText, aSearchData.GetFlags() & wxFR_MATCHCASE );
if( aSearchData.GetFlags() & FR_MATCH_WILDCARD )
{
if( aSearchData.GetFlags() & wxFR_MATCHCASE )
return text.Matches( searchText );
return text.MakeUpper().Matches( searchText.MakeUpper() );
}
if( aSearchData.GetFlags() & wxFR_MATCHCASE )
return aText.Find( searchText ) != wxNOT_FOUND;
return text.MakeUpper().Find( searchText.MakeUpper() ) != wxNOT_FOUND;
}
bool EDA_ITEM::Replace( wxFindReplaceData& aSearchData, wxString& aText )
{
wxString searchString = (aSearchData.GetFlags() & wxFR_MATCHCASE) ? aText : aText.Upper();
int result = searchString.Find( (aSearchData.GetFlags() & wxFR_MATCHCASE) ?
aSearchData.GetFindString() :
aSearchData.GetFindString().Upper() );
if( result == wxNOT_FOUND )
return false;
wxString prefix = aText.Left( result );
wxString suffix;
if( aSearchData.GetFindString().length() + result < aText.length() )
suffix = aText.Right( aText.length() - ( aSearchData.GetFindString().length() + result ) );
wxLogTrace( traceFindReplace, wxT( "Replacing '%s', prefix '%s', replace '%s', suffix '%s'." ),
GetChars( aText ), GetChars( prefix ), GetChars( aSearchData.GetReplaceString() ),
GetChars( suffix ) );
aText = prefix + aSearchData.GetReplaceString() + suffix;
return true;
}
bool EDA_ITEM::operator<( const EDA_ITEM& aItem ) const
{
wxFAIL_MSG( wxString::Format( wxT( "Less than operator not defined for item type %s." ),
GetChars( GetClass() ) ) );
return false;
}
EDA_ITEM& EDA_ITEM::operator=( const EDA_ITEM& aItem )
{
// do not call initVars()
m_StructType = aItem.m_StructType;
m_Flags = aItem.m_Flags;
m_Status = aItem.m_Status;
m_Parent = aItem.m_Parent;
m_forceVisible = aItem.m_forceVisible;
return *this;
}
const BOX2I EDA_ITEM::ViewBBox() const
{
// Basic fallback
return BOX2I( VECTOR2I( GetBoundingBox().GetOrigin() ),
VECTOR2I( GetBoundingBox().GetSize() ) );
}
void EDA_ITEM::ViewGetLayers( int aLayers[], int& aCount ) const
{
// Basic fallback
aCount = 1;
aLayers[0] = 0;
}
BITMAP_DEF EDA_ITEM::GetMenuImage() const
{
return dummy_xpm;
}
#if defined(DEBUG)
void EDA_ITEM::ShowDummy( std::ostream& os ) const
{
// XML output:
wxString s = GetClass();
os << '<' << s.Lower().mb_str() << ">"
<< " Need ::Show() override for this class "
<< "</" << s.Lower().mb_str() << ">\n";
}
std::ostream& EDA_ITEM::NestedSpace( int nestLevel, std::ostream& os )
{
for( int i = 0; i<nestLevel; ++i )
os << " ";
// number of spaces here controls indent per nest level
return os;
}
#endif
/******************/
/* Class EDA_RECT */
/******************/
void EDA_RECT::Normalize()
{
if( m_Size.y < 0 )
{
m_Size.y = -m_Size.y;
m_Pos.y -= m_Size.y;
}
if( m_Size.x < 0 )
{
m_Size.x = -m_Size.x;
m_Pos.x -= m_Size.x;
}
}
void EDA_RECT::Move( const wxPoint& aMoveVector )
{
m_Pos += aMoveVector;
}
bool EDA_RECT::Contains( const wxPoint& aPoint ) const
{
wxPoint rel_pos = aPoint - m_Pos;
wxSize size = m_Size;
if( size.x < 0 )
{
size.x = -size.x;
rel_pos.x += size.x;
}
if( size.y < 0 )
{
size.y = -size.y;
rel_pos.y += size.y;
}
return (rel_pos.x >= 0) && (rel_pos.y >= 0) && ( rel_pos.y <= size.y) && ( rel_pos.x <= size.x);
}
bool EDA_RECT::Contains( const EDA_RECT& aRect ) const
{
return Contains( aRect.GetOrigin() ) && Contains( aRect.GetEnd() );
}
bool EDA_RECT::Intersects( const wxPoint& aPoint1, const wxPoint& aPoint2 ) const
{
wxPoint point2, point4;
if( Contains( aPoint1 ) || Contains( aPoint2 ) )
return true;
point2.x = GetEnd().x;
point2.y = GetOrigin().y;
point4.x = GetOrigin().x;
point4.y = GetEnd().y;
//Only need to test 3 sides since a straight line cant enter and exit on same side
if( SegmentIntersectsSegment( aPoint1, aPoint2, GetOrigin() , point2 ) )
return true;
if( SegmentIntersectsSegment( aPoint1, aPoint2, point2 , GetEnd() ) )
return true;
if( SegmentIntersectsSegment( aPoint1, aPoint2, GetEnd() , point4 ) )
return true;
return false;
}
bool EDA_RECT::Intersects( const wxPoint& aPoint1, const wxPoint& aPoint2,
wxPoint* aIntersection1, wxPoint* aIntersection2 ) const
{
wxPoint point2, point4;
point2.x = GetEnd().x;
point2.y = GetOrigin().y;
point4.x = GetOrigin().x;
point4.y = GetEnd().y;
bool intersects = false;
wxPoint* aPointToFill = aIntersection1;
if( SegmentIntersectsSegment( aPoint1, aPoint2, GetOrigin(), point2, aPointToFill ) )
intersects = true;
if( intersects )
aPointToFill = aIntersection2;
if( SegmentIntersectsSegment( aPoint1, aPoint2, point2, GetEnd(), aPointToFill ) )
intersects = true;
if( intersects )
aPointToFill = aIntersection2;
if( SegmentIntersectsSegment( aPoint1, aPoint2, GetEnd(), point4, aPointToFill ) )
intersects = true;
if( intersects )
aPointToFill = aIntersection2;
if( SegmentIntersectsSegment( aPoint1, aPoint2, point4, GetOrigin(), aPointToFill ) )
intersects = true;
return intersects;
}
bool EDA_RECT::Intersects( const EDA_RECT& aRect ) const
{
if( !m_init )
return false;
// this logic taken from wxWidgets' geometry.cpp file:
bool rc;
EDA_RECT me(*this);
EDA_RECT rect(aRect);
me.Normalize(); // ensure size is >= 0
rect.Normalize(); // ensure size is >= 0
// calculate the left common area coordinate:
int left = std::max( me.m_Pos.x, rect.m_Pos.x );
// calculate the right common area coordinate:
int right = std::min( me.m_Pos.x + me.m_Size.x, rect.m_Pos.x + rect.m_Size.x );
// calculate the upper common area coordinate:
int top = std::max( me.m_Pos.y, aRect.m_Pos.y );
// calculate the lower common area coordinate:
int bottom = std::min( me.m_Pos.y + me.m_Size.y, rect.m_Pos.y + rect.m_Size.y );
// if a common area exists, it must have a positive (null accepted) size
if( left <= right && top <= bottom )
rc = true;
else
rc = false;
return rc;
}
bool EDA_RECT::Intersects( const EDA_RECT& aRect, double aRot ) const
{
if( !m_init )
return false;
/* Most rectangles will be axis aligned.
* It is quicker to check for this case and pass the rect
* to the simpler intersection test
*/
// Prevent floating point comparison errors
static const double ROT_EPS = 0.000000001;
static const double ROT_PARALLEL[] = { -3600, -1800, 0, 1800, 3600 };
static const double ROT_PERPENDICULAR[] = { -2700, -900, 0, 900, 2700 };
NORMALIZE_ANGLE_POS<double>( aRot );
// Test for non-rotated rectangle
for( int ii = 0; ii < 5; ii++ )
{
if( std::fabs( aRot - ROT_PARALLEL[ii] ) < ROT_EPS )
{
return Intersects( aRect );
}
}
// Test for rectangle rotated by multiple of 90 degrees
for( int jj = 0; jj < 4; jj++ )
{
if( std::fabs( aRot - ROT_PERPENDICULAR[jj] ) < ROT_EPS )
{
EDA_RECT rotRect;
// Rotate the supplied rect by 90 degrees
rotRect.SetOrigin( aRect.Centre() );
rotRect.Inflate( aRect.GetHeight(), aRect.GetWidth() );
return Intersects( rotRect );
}
}
/* There is some non-orthogonal rotation.
* There are three cases to test:
* A) One point of this rect is inside the rotated rect
* B) One point of the rotated rect is inside this rect
* C) One of the sides of the rotated rect intersect this
*/
wxPoint corners[4];
/* Test A : Any corners exist in rotated rect? */
corners[0] = m_Pos;
corners[1] = m_Pos + wxPoint( m_Size.x, 0 );
corners[2] = m_Pos + wxPoint( m_Size.x, m_Size.y );
corners[3] = m_Pos + wxPoint( 0, m_Size.y );
wxPoint rCentre = aRect.Centre();
for( int i = 0; i < 4; i++ )
{
wxPoint delta = corners[i] - rCentre;
RotatePoint( &delta, -aRot );
delta += rCentre;
if( aRect.Contains( delta ) )
{
return true;
}
}
/* Test B : Any corners of rotated rect exist in this one? */
int w = aRect.GetWidth() / 2;
int h = aRect.GetHeight() / 2;
// Construct corners around center of shape
corners[0] = wxPoint( -w, -h );
corners[1] = wxPoint( w, -h );
corners[2] = wxPoint( w, h );
corners[3] = wxPoint( -w, h );
// Rotate and test each corner
for( int j=0; j<4; j++ )
{
RotatePoint( &corners[j], aRot );
corners[j] += rCentre;
if( Contains( corners[j] ) )
{
return true;
}
}
/* Test C : Any sides of rotated rect intersect this */
if( Intersects( corners[0], corners[1] ) ||
Intersects( corners[1], corners[2] ) ||
Intersects( corners[2], corners[3] ) ||
Intersects( corners[3], corners[0] ) )
{
return true;
}
return false;
}
const wxPoint EDA_RECT::ClosestPointTo( const wxPoint& aPoint ) const
{
EDA_RECT me( *this );
me.Normalize(); // ensure size is >= 0
// Determine closest point to the circle centre within this rect
int nx = std::max( me.GetLeft(), std::min( aPoint.x, me.GetRight() ) );
int ny = std::max( me.GetTop(), std::min( aPoint.y, me.GetBottom() ) );
return wxPoint( nx, ny );
}
const wxPoint EDA_RECT::FarthestPointTo( const wxPoint& aPoint ) const
{
EDA_RECT me( *this );
me.Normalize(); // ensure size is >= 0
int fx = std::max( std::abs( aPoint.x - me.GetLeft() ), std::abs( aPoint.x - me.GetRight() ) );
int fy = std::max( std::abs( aPoint.y - me.GetTop() ), std::abs( aPoint.y - me.GetBottom() ) );
return wxPoint( fx, fy );
}
bool EDA_RECT::IntersectsCircle( const wxPoint& aCenter, const int aRadius ) const
{
if( !m_init )
return false;
wxPoint closest = ClosestPointTo( aCenter );
double dx = static_cast<double>( aCenter.x ) - closest.x;
double dy = static_cast<double>( aCenter.y ) - closest.y;
double r = static_cast<double>( aRadius );
return ( dx * dx + dy * dy ) <= ( r * r );
}
bool EDA_RECT::IntersectsCircleEdge( const wxPoint& aCenter, const int aRadius, const int aWidth ) const
{
if( !m_init )
return false;
EDA_RECT me( *this );
me.Normalize(); // ensure size is >= 0
// Test if the circle intersects at all
if( !IntersectsCircle( aCenter, aRadius + aWidth / 2 ) )
{
return false;
}
wxPoint farpt = FarthestPointTo( aCenter );
// Farthest point must be further than the inside of the line
double fx = (double) farpt.x;
double fy = (double) farpt.y;
double r = (double) aRadius - (double) aWidth / 2;
return ( fx * fx + fy * fy ) > ( r * r );
}
EDA_RECT& EDA_RECT::Inflate( int aDelta )
{
Inflate( aDelta, aDelta );
return *this;
}
EDA_RECT& EDA_RECT::Inflate( wxCoord dx, wxCoord dy )
{
if( m_Size.x >= 0 )
{
if( m_Size.x < -2 * dx )
{
// Don't allow deflate to eat more width than we have,
m_Pos.x += m_Size.x / 2;
m_Size.x = 0;
}
else
{
// The inflate is valid.
m_Pos.x -= dx;
m_Size.x += 2 * dx;
}
}
else // size.x < 0:
{
if( m_Size.x > -2 * dx )
{
// Don't allow deflate to eat more width than we have,
m_Pos.x -= m_Size.x / 2;
m_Size.x = 0;
}
else
{
// The inflate is valid.
m_Pos.x += dx;
m_Size.x -= 2 * dx; // m_Size.x <0: inflate when dx > 0
}
}
if( m_Size.y >= 0 )
{
if( m_Size.y < -2 * dy )
{
// Don't allow deflate to eat more height than we have,
m_Pos.y += m_Size.y / 2;
m_Size.y = 0;
}
else
{
// The inflate is valid.
m_Pos.y -= dy;
m_Size.y += 2 * dy;
}
}
else // size.y < 0:
{
if( m_Size.y > 2 * dy )
{
// Don't allow deflate to eat more height than we have,
m_Pos.y -= m_Size.y / 2;
m_Size.y = 0;
}
else
{
// The inflate is valid.
m_Pos.y += dy;
m_Size.y -= 2 * dy; // m_Size.y <0: inflate when dy > 0
}
}
return *this;
}
void EDA_RECT::Merge( const EDA_RECT& aRect )
{
if( !m_init )
{
if( aRect.IsValid() )
{
m_Pos = aRect.GetPosition();
m_Size = aRect.GetSize();
m_init = true;
}
return;
}
Normalize(); // ensure width and height >= 0
EDA_RECT rect = aRect;
rect.Normalize(); // ensure width and height >= 0
wxPoint end = GetEnd();
wxPoint rect_end = rect.GetEnd();
// Change origin and size in order to contain the given rect
m_Pos.x = std::min( m_Pos.x, rect.m_Pos.x );
m_Pos.y = std::min( m_Pos.y, rect.m_Pos.y );
end.x = std::max( end.x, rect_end.x );
end.y = std::max( end.y, rect_end.y );
SetEnd( end );
}
void EDA_RECT::Merge( const wxPoint& aPoint )
{
if( !m_init )
{
m_Pos = aPoint;
m_Size = wxSize( 0, 0 );
m_init = true;
return;
}
Normalize(); // ensure width and height >= 0
wxPoint end = GetEnd();
// Change origin and size in order to contain the given rect
m_Pos.x = std::min( m_Pos.x, aPoint.x );
m_Pos.y = std::min( m_Pos.y, aPoint.y );
end.x = std::max( end.x, aPoint.x );
end.y = std::max( end.y, aPoint.y );
SetEnd( end );
}
double EDA_RECT::GetArea() const
{
return (double) GetWidth() * (double) GetHeight();
}
EDA_RECT EDA_RECT::Common( const EDA_RECT& aRect ) const
{
EDA_RECT r;
if( Intersects( aRect ) )
{
wxPoint originA( std::min( GetOrigin().x, GetEnd().x ),
std::min( GetOrigin().y, GetEnd().y ) );
wxPoint originB( std::min( aRect.GetOrigin().x, aRect.GetEnd().x ),
std::min( aRect.GetOrigin().y, aRect.GetEnd().y ) );
wxPoint endA( std::max( GetOrigin().x, GetEnd().x ),
std::max( GetOrigin().y, GetEnd().y ) );
wxPoint endB( std::max( aRect.GetOrigin().x, aRect.GetEnd().x ),
std::max( aRect.GetOrigin().y, aRect.GetEnd().y ) );
r.SetOrigin( wxPoint( std::max( originA.x, originB.x ), std::max( originA.y, originB.y ) ) );
r.SetEnd ( wxPoint( std::min( endA.x, endB.x ), std::min( endA.y, endB.y ) ) );
}
return r;
}
const EDA_RECT EDA_RECT::GetBoundingBoxRotated( wxPoint aRotCenter, double aAngle ) const
{
wxPoint corners[4];
// Build the corners list
corners[0] = GetOrigin();
corners[2] = GetEnd();
corners[1].x = corners[0].x;
corners[1].y = corners[2].y;
corners[3].x = corners[2].x;
corners[3].y = corners[0].y;
// Rotate all corners, to find the bounding box
for( int ii = 0; ii < 4; ii ++ )
RotatePoint( &corners[ii], aRotCenter, aAngle );
// Find the corners bounding box
wxPoint start = corners[0];
wxPoint end = corners[0];
for( int ii = 1; ii < 4; ii ++ )
{
start.x = std::min( start.x, corners[ii].x);
start.y = std::min( start.y, corners[ii].y);
end.x = std::max( end.x, corners[ii].x);
end.y = std::max( end.y, corners[ii].y);
}
EDA_RECT bbox;
bbox.SetOrigin( start );
bbox.SetEnd( end );
return bbox;
}
static struct EDA_ITEM_DESC
{
EDA_ITEM_DESC()
{
ENUM_MAP<KICAD_T>::Instance()
.Undefined( TYPE_NOT_INIT )
.Map( NOT_USED, wxT( "<not used>" ) )
.Map( SCREEN_T, _( "Screen" ) )
.Map( PCB_MODULE_T, _( "Footprint" ) )
.Map( PCB_PAD_T, _( "Pad" ) )
.Map( PCB_SHAPE_T, _( "Graphic Shape" ) )
.Map( PCB_TEXT_T, _( "Board Text" ) )
.Map( PCB_FP_TEXT_T, _( "Footprint Text" ) )
.Map( PCB_FP_SHAPE_T, _( "Graphic Shape" ) )
.Map( PCB_TRACE_T, _( "Track" ) )
.Map( PCB_VIA_T, _( "Via" ) )
.Map( PCB_MARKER_T, _( "Board Marker" ) )
.Map( PCB_DIM_ALIGNED_T, _( "Aligned Dimension" ) )
.Map( PCB_DIM_ORTHOGONAL_T, _( "Orthogonal Dimension" ) )
.Map( PCB_DIM_CENTER_T, _( "Center Dimension" ) )
.Map( PCB_DIM_LEADER_T, _( "Leader" ) )
.Map( PCB_TARGET_T, _( "Target" ) )
.Map( PCB_ZONE_AREA_T, _( "Zone" ) )
.Map( PCB_ITEM_LIST_T, _( "Item List" ) )
.Map( PCB_NETINFO_T, _( "Net Info" ) )
.Map( PCB_GROUP_T, _( "Group" ) )
.Map( SCH_MARKER_T, _( "Schematic Marker" ) )
.Map( SCH_JUNCTION_T, _( "Junction" ) )
.Map( SCH_NO_CONNECT_T, _( "No-Connect Flag" ) )
.Map( SCH_BUS_WIRE_ENTRY_T, _( "Wire Entry" ) )
.Map( SCH_BUS_BUS_ENTRY_T, _( "Bus Entry" ) )
.Map( SCH_LINE_T, _( "Graphic Line" ) )
.Map( SCH_BITMAP_T, _( "Bitmap" ) )
.Map( SCH_TEXT_T, _( "Schematic Text" ) )
.Map( SCH_LABEL_T, _( "Net Label" ) )
.Map( SCH_GLOBAL_LABEL_T, _( "Global Label" ) )
.Map( SCH_HIER_LABEL_T, _( "Hierarchical Label" ) )
.Map( SCH_FIELD_T, _( "Schematic Field" ) )
.Map( SCH_COMPONENT_T, _( "Component" ) )
.Map( SCH_SHEET_PIN_T, _( "Sheet Pin" ) )
.Map( SCH_SHEET_T, _( "Sheet" ) )
.Map( SCH_FIELD_LOCATE_REFERENCE_T, _( "Field Locate Reference" ) )
.Map( SCH_FIELD_LOCATE_VALUE_T, _( "Field Locate Value" ) )
.Map( SCH_FIELD_LOCATE_FOOTPRINT_T, _( "Field Locate Footprint" ) )
.Map( SCH_SCREEN_T, _( "SCH Screen" ) )
.Map( LIB_PART_T, _( "Symbol" ) )
.Map( LIB_ALIAS_T, _( "Alias" ) )
.Map( LIB_ARC_T, _( "Arc" ) )
.Map( LIB_CIRCLE_T, _( "Circle" ) )
.Map( LIB_TEXT_T, _( "Symbol Text" ) )
.Map( LIB_RECTANGLE_T, _( "Rectangle" ) )
.Map( LIB_POLYLINE_T, _( "Polyline" ) )
.Map( LIB_BEZIER_T, _( "Bezier" ) )
.Map( LIB_PIN_T, _( "Pin" ) )
.Map( LIB_FIELD_T, _( "Symbol Field" ) )
.Map( GERBER_LAYOUT_T, _( "Gerber Layout" ) )
.Map( GERBER_DRAW_ITEM_T, _( "Draw Item" ) )
.Map( GERBER_IMAGE_T, _( "Image" ) );
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
REGISTER_TYPE( EDA_ITEM );
propMgr.AddProperty( new PROPERTY_ENUM<EDA_ITEM, KICAD_T>( "Type",
NO_SETTER( EDA_ITEM, KICAD_T ), &EDA_ITEM::Type ) );
}
} _EDA_ITEM_DESC;
ENUM_TO_WXANY( KICAD_T );

2
common/commit.cpp
View File

@ -26,7 +26,7 @@
#include <algorithm>
#include <commit.h>
#include <base_struct.h>
#include <eda_item.h>
COMMIT::COMMIT()
{

2
common/dialogs/dialog_page_settings.cpp
View File

@ -22,10 +22,10 @@
*/
#include <base_screen.h>
#include <base_struct.h>
#include <confirm.h>
#include <dialog_page_settings.h>
#include <eda_draw_frame.h>
#include <eda_item.h>
#include <kiface_i.h>
#include <math/util.h> // for KiROUND, Clamp
#include <project.h>

330
common/eda_item.cpp
View File

@ -0,0 +1,330 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @brief Implementation of EDA_ITEM base class for KiCad.
*/
#include <deque>
#include <base_screen.h>
#include <bitmaps.h>
#include <eda_item.h>
#include <trace_helpers.h>
#include <trigo.h>
#include <algorithm>
static const unsigned char dummy_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x5f, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x03, 0x25, 0x98, 0x61, 0x68, 0x1a, 0x00, 0x04, 0x46, 0x40, 0xfc, 0x02, 0x88, 0x45, 0x41, 0x1c,
0x76, 0x20, 0xfe, 0x01, 0xc4, 0xbe, 0x24, 0x18, 0x60, 0x01, 0xc4, 0x20, 0x86, 0x04, 0x88, 0xc3,
0x01, 0xe5, 0x04, 0x0c, 0xb8, 0x01, 0x37, 0x81, 0xf8, 0x04, 0x91, 0xf8, 0x0a, 0x54, 0x8f, 0x06,
0xb2, 0x01, 0x9b, 0x81, 0x78, 0x02, 0x91, 0x78, 0x05, 0x54, 0x8f, 0xca, 0xe0, 0x08, 0x03, 0x36,
0xa8, 0xbf, 0xec, 0xc8, 0x32, 0x80, 0xcc, 0x84, 0x04, 0x0a, 0xbc, 0x1d, 0x40, 0x2c, 0xc8, 0x30,
0xf4, 0x33, 0x13, 0x00, 0x6b, 0x1a, 0x46, 0x7b, 0x68, 0xe7, 0x0f, 0x0b, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
static const BITMAP_OPAQUE dummy_xpm[1] = {{ dummy_png, sizeof( dummy_png ), "dummy_xpm" }};
EDA_ITEM::EDA_ITEM( EDA_ITEM* parent, KICAD_T idType ) :
m_StructType( idType ),
m_Status( 0 ),
m_Parent( parent ),
m_forceVisible( false ),
m_Flags( 0 )
{ }
EDA_ITEM::EDA_ITEM( KICAD_T idType ) :
m_StructType( idType ),
m_Status( 0 ),
m_Parent( nullptr ),
m_forceVisible( false ),
m_Flags( 0 )
{ }
EDA_ITEM::EDA_ITEM( const EDA_ITEM& base ) :
m_Uuid( base.m_Uuid ),
m_StructType( base.m_StructType ),
m_Status( base.m_Status ),
m_Parent( base.m_Parent ),
m_forceVisible( base.m_forceVisible ),
m_Flags( base.m_Flags )
{ }
void EDA_ITEM::SetModified()
{
SetFlags( IS_CHANGED );
// If this a child object, then the parent modification state also needs to be set.
if( m_Parent )
m_Parent->SetModified();
}
const EDA_RECT EDA_ITEM::GetBoundingBox() const
{
// return a zero-sized box per default. derived classes should override
// this
return EDA_RECT( wxPoint( 0, 0 ), wxSize( 0, 0 ) );
}
EDA_ITEM* EDA_ITEM::Clone() const
{
wxCHECK_MSG( false, NULL, wxT( "Clone not implemented in derived class " ) + GetClass() +
wxT( ". Bad programmer!" ) );
}
// see base_struct.h
// many classes inherit this method, be careful:
//TODO (snh): Fix this to use std::set instead of C-style vector
SEARCH_RESULT EDA_ITEM::Visit( INSPECTOR inspector, void* testData, const KICAD_T scanTypes[] )
{
#if 0 && defined(DEBUG)
std::cout << GetClass().mb_str() << ' ';
#endif
if( IsType( scanTypes ) )
{
if( SEARCH_RESULT::QUIT == inspector( this, testData ) )
return SEARCH_RESULT::QUIT;
}
return SEARCH_RESULT::CONTINUE;
}
wxString EDA_ITEM::GetSelectMenuText( EDA_UNITS aUnits ) const
{
wxFAIL_MSG( wxT( "GetSelectMenuText() was not overridden for schematic item type " ) +
GetClass() );
return wxString( wxT( "Undefined menu text for " ) + GetClass() );
}
bool EDA_ITEM::Matches( const wxString& aText, wxFindReplaceData& aSearchData )
{
wxString text = aText;
wxString searchText = aSearchData.GetFindString();
// Don't match if searching for replaceable item and the item doesn't support text replace.
if( (aSearchData.GetFlags() & FR_SEARCH_REPLACE) && !IsReplaceable() )
return false;
if( aSearchData.GetFlags() & wxFR_WHOLEWORD )
return aText.IsSameAs( searchText, aSearchData.GetFlags() & wxFR_MATCHCASE );
if( aSearchData.GetFlags() & FR_MATCH_WILDCARD )
{
if( aSearchData.GetFlags() & wxFR_MATCHCASE )
return text.Matches( searchText );
return text.MakeUpper().Matches( searchText.MakeUpper() );
}
if( aSearchData.GetFlags() & wxFR_MATCHCASE )
return aText.Find( searchText ) != wxNOT_FOUND;
return text.MakeUpper().Find( searchText.MakeUpper() ) != wxNOT_FOUND;
}
bool EDA_ITEM::Replace( wxFindReplaceData& aSearchData, wxString& aText )
{
wxString searchString = (aSearchData.GetFlags() & wxFR_MATCHCASE) ? aText : aText.Upper();
int result = searchString.Find( (aSearchData.GetFlags() & wxFR_MATCHCASE) ?
aSearchData.GetFindString() :
aSearchData.GetFindString().Upper() );
if( result == wxNOT_FOUND )
return false;
wxString prefix = aText.Left( result );
wxString suffix;
if( aSearchData.GetFindString().length() + result < aText.length() )
suffix = aText.Right( aText.length() - ( aSearchData.GetFindString().length() + result ) );
wxLogTrace( traceFindReplace, wxT( "Replacing '%s', prefix '%s', replace '%s', suffix '%s'." ),
GetChars( aText ), GetChars( prefix ), GetChars( aSearchData.GetReplaceString() ),
GetChars( suffix ) );
aText = prefix + aSearchData.GetReplaceString() + suffix;
return true;
}
bool EDA_ITEM::operator<( const EDA_ITEM& aItem ) const
{
wxFAIL_MSG( wxString::Format( wxT( "Less than operator not defined for item type %s." ),
GetChars( GetClass() ) ) );
return false;
}
EDA_ITEM& EDA_ITEM::operator=( const EDA_ITEM& aItem )
{
// do not call initVars()
m_StructType = aItem.m_StructType;
m_Flags = aItem.m_Flags;
m_Status = aItem.m_Status;
m_Parent = aItem.m_Parent;
m_forceVisible = aItem.m_forceVisible;
return *this;
}
const BOX2I EDA_ITEM::ViewBBox() const
{
// Basic fallback
return BOX2I( VECTOR2I( GetBoundingBox().GetOrigin() ),
VECTOR2I( GetBoundingBox().GetSize() ) );
}
void EDA_ITEM::ViewGetLayers( int aLayers[], int& aCount ) const
{
// Basic fallback
aCount = 1;
aLayers[0] = 0;
}
BITMAP_DEF EDA_ITEM::GetMenuImage() const
{
return dummy_xpm;
}
#if defined(DEBUG)
void EDA_ITEM::ShowDummy( std::ostream& os ) const
{
// XML output:
wxString s = GetClass();
os << '<' << s.Lower().mb_str() << ">"
<< " Need ::Show() override for this class "
<< "</" << s.Lower().mb_str() << ">\n";
}
std::ostream& EDA_ITEM::NestedSpace( int nestLevel, std::ostream& os )
{
for( int i = 0; i<nestLevel; ++i )
os << " ";
// number of spaces here controls indent per nest level
return os;
}
#endif
static struct EDA_ITEM_DESC
{
EDA_ITEM_DESC()
{
ENUM_MAP<KICAD_T>::Instance()
.Undefined( TYPE_NOT_INIT )
.Map( NOT_USED, wxT( "<not used>" ) )
.Map( SCREEN_T, _( "Screen" ) )
.Map( PCB_MODULE_T, _( "Footprint" ) )
.Map( PCB_PAD_T, _( "Pad" ) )
.Map( PCB_SHAPE_T, _( "Graphic Shape" ) )
.Map( PCB_TEXT_T, _( "Board Text" ) )
.Map( PCB_FP_TEXT_T, _( "Footprint Text" ) )
.Map( PCB_FP_SHAPE_T, _( "Graphic Shape" ) )
.Map( PCB_TRACE_T, _( "Track" ) )
.Map( PCB_VIA_T, _( "Via" ) )
.Map( PCB_MARKER_T, _( "Board Marker" ) )
.Map( PCB_DIM_ALIGNED_T, _( "Aligned Dimension" ) )
.Map( PCB_DIM_ORTHOGONAL_T, _( "Orthogonal Dimension" ) )
.Map( PCB_DIM_CENTER_T, _( "Center Dimension" ) )
.Map( PCB_DIM_LEADER_T, _( "Leader" ) )
.Map( PCB_TARGET_T, _( "Target" ) )
.Map( PCB_ZONE_AREA_T, _( "Zone" ) )
.Map( PCB_ITEM_LIST_T, _( "Item List" ) )
.Map( PCB_NETINFO_T, _( "Net Info" ) )
.Map( PCB_GROUP_T, _( "Group" ) )
.Map( SCH_MARKER_T, _( "Schematic Marker" ) )
.Map( SCH_JUNCTION_T, _( "Junction" ) )
.Map( SCH_NO_CONNECT_T, _( "No-Connect Flag" ) )
.Map( SCH_BUS_WIRE_ENTRY_T, _( "Wire Entry" ) )
.Map( SCH_BUS_BUS_ENTRY_T, _( "Bus Entry" ) )
.Map( SCH_LINE_T, _( "Graphic Line" ) )
.Map( SCH_BITMAP_T, _( "Bitmap" ) )
.Map( SCH_TEXT_T, _( "Schematic Text" ) )
.Map( SCH_LABEL_T, _( "Net Label" ) )
.Map( SCH_GLOBAL_LABEL_T, _( "Global Label" ) )
.Map( SCH_HIER_LABEL_T, _( "Hierarchical Label" ) )
.Map( SCH_FIELD_T, _( "Schematic Field" ) )
.Map( SCH_COMPONENT_T, _( "Component" ) )
.Map( SCH_SHEET_PIN_T, _( "Sheet Pin" ) )
.Map( SCH_SHEET_T, _( "Sheet" ) )
.Map( SCH_FIELD_LOCATE_REFERENCE_T, _( "Field Locate Reference" ) )
.Map( SCH_FIELD_LOCATE_VALUE_T, _( "Field Locate Value" ) )
.Map( SCH_FIELD_LOCATE_FOOTPRINT_T, _( "Field Locate Footprint" ) )
.Map( SCH_SCREEN_T, _( "SCH Screen" ) )
.Map( LIB_PART_T, _( "Symbol" ) )
.Map( LIB_ALIAS_T, _( "Alias" ) )
.Map( LIB_ARC_T, _( "Arc" ) )
.Map( LIB_CIRCLE_T, _( "Circle" ) )
.Map( LIB_TEXT_T, _( "Symbol Text" ) )
.Map( LIB_RECTANGLE_T, _( "Rectangle" ) )
.Map( LIB_POLYLINE_T, _( "Polyline" ) )
.Map( LIB_BEZIER_T, _( "Bezier" ) )
.Map( LIB_PIN_T, _( "Pin" ) )
.Map( LIB_FIELD_T, _( "Symbol Field" ) )
.Map( GERBER_LAYOUT_T, _( "Gerber Layout" ) )
.Map( GERBER_DRAW_ITEM_T, _( "Draw Item" ) )
.Map( GERBER_IMAGE_T, _( "Image" ) );
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
REGISTER_TYPE( EDA_ITEM );
propMgr.AddProperty( new PROPERTY_ENUM<EDA_ITEM, KICAD_T>( "Type",
NO_SETTER( EDA_ITEM, KICAD_T ), &EDA_ITEM::Type ) );
}
} _EDA_ITEM_DESC;
ENUM_TO_WXANY( KICAD_T );

544
common/eda_rect.cpp
View File

@ -0,0 +1,544 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @brief Implementation of EDA_RECT base class for KiCad.
*/
#include <algorithm>
#include <deque>
#include <eda_rect.h>
#include <trigo.h>
void EDA_RECT::Normalize()
{
if( m_Size.y < 0 )
{
m_Size.y = -m_Size.y;
m_Pos.y -= m_Size.y;
}
if( m_Size.x < 0 )
{
m_Size.x = -m_Size.x;
m_Pos.x -= m_Size.x;
}
}
void EDA_RECT::Move( const wxPoint& aMoveVector )
{
m_Pos += aMoveVector;
}
bool EDA_RECT::Contains( const wxPoint& aPoint ) const
{
wxPoint rel_pos = aPoint - m_Pos;
wxSize size = m_Size;
if( size.x < 0 )
{
size.x = -size.x;
rel_pos.x += size.x;
}
if( size.y < 0 )
{
size.y = -size.y;
rel_pos.y += size.y;
}
return ( rel_pos.x >= 0 ) && ( rel_pos.y >= 0 ) && ( rel_pos.y <= size.y )
&& ( rel_pos.x <= size.x );
}
bool EDA_RECT::Contains( const EDA_RECT& aRect ) const
{
return Contains( aRect.GetOrigin() ) && Contains( aRect.GetEnd() );
}
bool EDA_RECT::Intersects( const wxPoint& aPoint1, const wxPoint& aPoint2 ) const
{
wxPoint point2, point4;
if( Contains( aPoint1 ) || Contains( aPoint2 ) )
return true;
point2.x = GetEnd().x;
point2.y = GetOrigin().y;
point4.x = GetOrigin().x;
point4.y = GetEnd().y;
//Only need to test 3 sides since a straight line cant enter and exit on same side
if( SegmentIntersectsSegment( aPoint1, aPoint2, GetOrigin(), point2 ) )
return true;
if( SegmentIntersectsSegment( aPoint1, aPoint2, point2, GetEnd() ) )
return true;
if( SegmentIntersectsSegment( aPoint1, aPoint2, GetEnd(), point4 ) )
return true;
return false;
}
bool EDA_RECT::Intersects( const wxPoint& aPoint1, const wxPoint& aPoint2, wxPoint* aIntersection1,
wxPoint* aIntersection2 ) const
{
wxPoint point2, point4;
point2.x = GetEnd().x;
point2.y = GetOrigin().y;
point4.x = GetOrigin().x;
point4.y = GetEnd().y;
bool intersects = false;
wxPoint* aPointToFill = aIntersection1;
if( SegmentIntersectsSegment( aPoint1, aPoint2, GetOrigin(), point2, aPointToFill ) )
intersects = true;
if( intersects )
aPointToFill = aIntersection2;
if( SegmentIntersectsSegment( aPoint1, aPoint2, point2, GetEnd(), aPointToFill ) )
intersects = true;
if( intersects )
aPointToFill = aIntersection2;
if( SegmentIntersectsSegment( aPoint1, aPoint2, GetEnd(), point4, aPointToFill ) )
intersects = true;
if( intersects )
aPointToFill = aIntersection2;
if( SegmentIntersectsSegment( aPoint1, aPoint2, point4, GetOrigin(), aPointToFill ) )
intersects = true;
return intersects;
}
bool EDA_RECT::Intersects( const EDA_RECT& aRect ) const
{
if( !m_init )
return false;
// this logic taken from wxWidgets' geometry.cpp file:
bool rc;
EDA_RECT me( *this );
EDA_RECT rect( aRect );
me.Normalize(); // ensure size is >= 0
rect.Normalize(); // ensure size is >= 0
// calculate the left common area coordinate:
int left = std::max( me.m_Pos.x, rect.m_Pos.x );
// calculate the right common area coordinate:
int right = std::min( me.m_Pos.x + me.m_Size.x, rect.m_Pos.x + rect.m_Size.x );
// calculate the upper common area coordinate:
int top = std::max( me.m_Pos.y, aRect.m_Pos.y );
// calculate the lower common area coordinate:
int bottom = std::min( me.m_Pos.y + me.m_Size.y, rect.m_Pos.y + rect.m_Size.y );
// if a common area exists, it must have a positive (null accepted) size
if( left <= right && top <= bottom )
rc = true;
else
rc = false;
return rc;
}
bool EDA_RECT::Intersects( const EDA_RECT& aRect, double aRot ) const
{
if( !m_init )
return false;
/* Most rectangles will be axis aligned.
* It is quicker to check for this case and pass the rect
* to the simpler intersection test
*/
// Prevent floating point comparison errors
static const double ROT_EPS = 0.000000001;
static const double ROT_PARALLEL[] = { -3600, -1800, 0, 1800, 3600 };
static const double ROT_PERPENDICULAR[] = { -2700, -900, 0, 900, 2700 };
NORMALIZE_ANGLE_POS<double>( aRot );
// Test for non-rotated rectangle
for( int ii = 0; ii < 5; ii++ )
{
if( std::fabs( aRot - ROT_PARALLEL[ii] ) < ROT_EPS )
{
return Intersects( aRect );
}
}
// Test for rectangle rotated by multiple of 90 degrees
for( int jj = 0; jj < 4; jj++ )
{
if( std::fabs( aRot - ROT_PERPENDICULAR[jj] ) < ROT_EPS )
{
EDA_RECT rotRect;
// Rotate the supplied rect by 90 degrees
rotRect.SetOrigin( aRect.Centre() );
rotRect.Inflate( aRect.GetHeight(), aRect.GetWidth() );
return Intersects( rotRect );
}
}
/* There is some non-orthogonal rotation.
* There are three cases to test:
* A) One point of this rect is inside the rotated rect
* B) One point of the rotated rect is inside this rect
* C) One of the sides of the rotated rect intersect this
*/
wxPoint corners[4];
/* Test A : Any corners exist in rotated rect? */
corners[0] = m_Pos;
corners[1] = m_Pos + wxPoint( m_Size.x, 0 );
corners[2] = m_Pos + wxPoint( m_Size.x, m_Size.y );
corners[3] = m_Pos + wxPoint( 0, m_Size.y );
wxPoint rCentre = aRect.Centre();
for( int i = 0; i < 4; i++ )
{
wxPoint delta = corners[i] - rCentre;
RotatePoint( &delta, -aRot );
delta += rCentre;
if( aRect.Contains( delta ) )
{
return true;
}
}
/* Test B : Any corners of rotated rect exist in this one? */
int w = aRect.GetWidth() / 2;
int h = aRect.GetHeight() / 2;
// Construct corners around center of shape
corners[0] = wxPoint( -w, -h );
corners[1] = wxPoint( w, -h );
corners[2] = wxPoint( w, h );
corners[3] = wxPoint( -w, h );
// Rotate and test each corner
for( int j = 0; j < 4; j++ )
{
RotatePoint( &corners[j], aRot );
corners[j] += rCentre;
if( Contains( corners[j] ) )
{
return true;
}
}
/* Test C : Any sides of rotated rect intersect this */
if( Intersects( corners[0], corners[1] ) || Intersects( corners[1], corners[2] )
|| Intersects( corners[2], corners[3] ) || Intersects( corners[3], corners[0] ) )
{
return true;
}
return false;
}
const wxPoint EDA_RECT::ClosestPointTo( const wxPoint& aPoint ) const
{
EDA_RECT me( *this );
me.Normalize(); // ensure size is >= 0
// Determine closest point to the circle centre within this rect
int nx = std::max( me.GetLeft(), std::min( aPoint.x, me.GetRight() ) );
int ny = std::max( me.GetTop(), std::min( aPoint.y, me.GetBottom() ) );
return wxPoint( nx, ny );
}
const wxPoint EDA_RECT::FarthestPointTo( const wxPoint& aPoint ) const
{
EDA_RECT me( *this );
me.Normalize(); // ensure size is >= 0
int fx = std::max( std::abs( aPoint.x - me.GetLeft() ), std::abs( aPoint.x - me.GetRight() ) );
int fy = std::max( std::abs( aPoint.y - me.GetTop() ), std::abs( aPoint.y - me.GetBottom() ) );
return wxPoint( fx, fy );
}
bool EDA_RECT::IntersectsCircle( const wxPoint& aCenter, const int aRadius ) const
{
if( !m_init )
return false;
wxPoint closest = ClosestPointTo( aCenter );
double dx = static_cast<double>( aCenter.x ) - closest.x;
double dy = static_cast<double>( aCenter.y ) - closest.y;
double r = static_cast<double>( aRadius );
return ( dx * dx + dy * dy ) <= ( r * r );
}
bool EDA_RECT::IntersectsCircleEdge(
const wxPoint& aCenter, const int aRadius, const int aWidth ) const
{
if( !m_init )
return false;
EDA_RECT me( *this );
me.Normalize(); // ensure size is >= 0
// Test if the circle intersects at all
if( !IntersectsCircle( aCenter, aRadius + aWidth / 2 ) )
{
return false;
}
wxPoint farpt = FarthestPointTo( aCenter );
// Farthest point must be further than the inside of the line
double fx = (double) farpt.x;
double fy = (double) farpt.y;
double r = (double) aRadius - (double) aWidth / 2;
return ( fx * fx + fy * fy ) > ( r * r );
}
EDA_RECT& EDA_RECT::Inflate( int aDelta )
{
Inflate( aDelta, aDelta );
return *this;
}
EDA_RECT& EDA_RECT::Inflate( wxCoord dx, wxCoord dy )
{
if( m_Size.x >= 0 )
{
if( m_Size.x < -2 * dx )
{
// Don't allow deflate to eat more width than we have,
m_Pos.x += m_Size.x / 2;
m_Size.x = 0;
}
else
{
// The inflate is valid.
m_Pos.x -= dx;
m_Size.x += 2 * dx;
}
}
else // size.x < 0:
{
if( m_Size.x > -2 * dx )
{
// Don't allow deflate to eat more width than we have,
m_Pos.x -= m_Size.x / 2;
m_Size.x = 0;
}
else
{
// The inflate is valid.
m_Pos.x += dx;
m_Size.x -= 2 * dx; // m_Size.x <0: inflate when dx > 0
}
}
if( m_Size.y >= 0 )
{
if( m_Size.y < -2 * dy )
{
// Don't allow deflate to eat more height than we have,
m_Pos.y += m_Size.y / 2;
m_Size.y = 0;
}
else
{
// The inflate is valid.
m_Pos.y -= dy;
m_Size.y += 2 * dy;
}
}
else // size.y < 0:
{
if( m_Size.y > 2 * dy )
{
// Don't allow deflate to eat more height than we have,
m_Pos.y -= m_Size.y / 2;
m_Size.y = 0;
}
else
{
// The inflate is valid.
m_Pos.y += dy;
m_Size.y -= 2 * dy; // m_Size.y <0: inflate when dy > 0
}
}
return *this;
}
void EDA_RECT::Merge( const EDA_RECT& aRect )
{
if( !m_init )
{
if( aRect.IsValid() )
{
m_Pos = aRect.GetPosition();
m_Size = aRect.GetSize();
m_init = true;
}
return;
}
Normalize(); // ensure width and height >= 0
EDA_RECT rect = aRect;
rect.Normalize(); // ensure width and height >= 0
wxPoint end = GetEnd();
wxPoint rect_end = rect.GetEnd();
// Change origin and size in order to contain the given rect
m_Pos.x = std::min( m_Pos.x, rect.m_Pos.x );
m_Pos.y = std::min( m_Pos.y, rect.m_Pos.y );
end.x = std::max( end.x, rect_end.x );
end.y = std::max( end.y, rect_end.y );
SetEnd( end );
}
void EDA_RECT::Merge( const wxPoint& aPoint )
{
if( !m_init )
{
m_Pos = aPoint;
m_Size = wxSize( 0, 0 );
m_init = true;
return;
}
Normalize(); // ensure width and height >= 0
wxPoint end = GetEnd();
// Change origin and size in order to contain the given rect
m_Pos.x = std::min( m_Pos.x, aPoint.x );
m_Pos.y = std::min( m_Pos.y, aPoint.y );
end.x = std::max( end.x, aPoint.x );
end.y = std::max( end.y, aPoint.y );
SetEnd( end );
}
double EDA_RECT::GetArea() const
{
return (double) GetWidth() * (double) GetHeight();
}
EDA_RECT EDA_RECT::Common( const EDA_RECT& aRect ) const
{
EDA_RECT r;
if( Intersects( aRect ) )
{
wxPoint originA(
std::min( GetOrigin().x, GetEnd().x ), std::min( GetOrigin().y, GetEnd().y ) );
wxPoint originB( std::min( aRect.GetOrigin().x, aRect.GetEnd().x ),
std::min( aRect.GetOrigin().y, aRect.GetEnd().y ) );
wxPoint endA(
std::max( GetOrigin().x, GetEnd().x ), std::max( GetOrigin().y, GetEnd().y ) );
wxPoint endB( std::max( aRect.GetOrigin().x, aRect.GetEnd().x ),
std::max( aRect.GetOrigin().y, aRect.GetEnd().y ) );
r.SetOrigin(
wxPoint( std::max( originA.x, originB.x ), std::max( originA.y, originB.y ) ) );
r.SetEnd( wxPoint( std::min( endA.x, endB.x ), std::min( endA.y, endB.y ) ) );
}
return r;
}
const EDA_RECT EDA_RECT::GetBoundingBoxRotated( wxPoint aRotCenter, double aAngle ) const
{
wxPoint corners[4];
// Build the corners list
corners[0] = GetOrigin();
corners[2] = GetEnd();
corners[1].x = corners[0].x;
corners[1].y = corners[2].y;
corners[3].x = corners[2].x;
corners[3].y = corners[0].y;
// Rotate all corners, to find the bounding box
for( int ii = 0; ii < 4; ii++ )
RotatePoint( &corners[ii], aRotCenter, aAngle );
// Find the corners bounding box
wxPoint start = corners[0];
wxPoint end = corners[0];
for( int ii = 1; ii < 4; ii++ )
{
start.x = std::min( start.x, corners[ii].x );
start.y = std::min( start.y, corners[ii].y );
end.x = std::max( end.x, corners[ii].x );
end.y = std::max( end.y, corners[ii].y );
}
EDA_RECT bbox;
bbox.SetOrigin( start );
bbox.SetEnd( end );
return bbox;
}

2
common/eda_text.cpp
View File

@ -32,7 +32,7 @@
#include <type_traits> // for swap
#include <vector> // for vector
#include <base_struct.h> // for EDA_ITEM
#include <eda_item.h> // for EDA_ITEM
#include <base_units.h>
#include <basic_gal.h> // for BASIC_GAL, basic_gal
#include <common.h> // for wxStringSplit

2
common/gr_basic.cpp
View File

@ -26,7 +26,7 @@
#include <gr_basic.h>
#include <trigo.h>
#include <base_struct.h>
#include <eda_item.h>
#include <base_screen.h>
#include <bezier_curves.h>
#include <math_for_graphics.h>

2
common/page_layout/page_layout_reader.cpp
View File

@ -29,7 +29,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <base_struct.h>
#include <eda_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_draw_item.h>

2
common/page_layout/ws_data_model_io.cpp
View File

@ -30,7 +30,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <base_struct.h>
#include <eda_item.h>
#include <page_layout/ws_painter.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_data_item.h>

2
common/plotters/DXF_plotter.cpp
View File

@ -28,7 +28,7 @@
#include <config.h>
#include <eda_base_frame.h>
#include <base_struct.h>
#include <eda_item.h>
#include <plotters_specific.h>
#include <macros.h>
#include <kicad_string.h>

2
common/plotters/GERBER_plotter.cpp
View File

@ -25,7 +25,7 @@
#include <config.h>
#include <eda_base_frame.h>
#include <base_struct.h>
#include <eda_item.h>
#include <kicad_string.h>
#include <convert_basic_shapes_to_polygon.h>
#include <math/util.h> // for KiROUND

2
common/plotters/HPGL_plotter.cpp
View File

@ -196,7 +196,7 @@
#include <config.h>
#include <eda_base_frame.h>
#include <base_struct.h>
#include <eda_item.h>
#include <kicad_string.h>
#include <convert_basic_shapes_to_polygon.h>
#include <math/util.h> // for KiROUND

2
common/plotters/PDF_plotter.cpp
View File

@ -29,7 +29,7 @@
#include <trigo.h>
#include <eda_base_frame.h>
#include <base_struct.h>
#include <eda_item.h>
#include <wx/zstream.h>
#include <wx/mstream.h>
#include <math/util.h> // for KiROUND

2
common/plotters/PS_plotter.cpp
View File

@ -29,7 +29,7 @@
#include <config.h>
#include <eda_base_frame.h>
#include <base_struct.h>
#include <eda_item.h>
#include <convert_basic_shapes_to_polygon.h>
#include <math/util.h> // for KiROUND

2
common/plotters/SVG_plotter.cpp
View File

@ -95,7 +95,7 @@
#include <base64.h>
#include <eda_base_frame.h>
#include <eda_rect.h>
#include <base_struct.h>
#include <eda_item.h>
#include <common.h>
#include <kicad_string.h>

2
common/plotters/common_plot_functions.cpp
View File

@ -22,7 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <base_struct.h>
#include <eda_item.h>
#include <plotters_specific.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_draw_item.h>

2
common/plotters/plotter.cpp
View File

@ -39,7 +39,7 @@
#include <vector>
#include <trigo.h>
#include <base_struct.h>
#include <eda_item.h>
#include <plotter.h>
#include <geometry/shape_line_chain.h>
#include <geometry/geometry_utils.h>

2
common/plotters/plotter_dxf.h
View File

@ -27,7 +27,7 @@
#include <vector>
#include <math/box2.h>
#include <base_struct.h> // FILL_T
#include <eda_item.h> // FILL_T
#include <plotter.h>

2
common/plotters/plotter_gerber.h
View File

@ -28,7 +28,7 @@
#include <vector>
#include <math/box2.h>
#include <base_struct.h> // FILL_T
#include <eda_item.h> // FILL_T
#include <plotter.h>
#include "gbr_plotter_apertures.h"

2
common/plotters/plotter_hpgl.h
View File

@ -27,7 +27,7 @@
#include <vector>
#include <math/box2.h>
#include <base_struct.h> // FILL_T
#include <eda_item.h> // FILL_T
#include <plotter.h>

2
common/plotters/plotters_pslike.h
View File

@ -27,7 +27,7 @@
#include <vector>
#include <math/box2.h>
#include <base_struct.h> // FILL_T
#include <eda_item.h> // FILL_T
#include <plotter.h>

2
common/rc_item.h
View File

@ -26,7 +26,7 @@
#include <wx/dataview.h>
#include <macros.h>
#include <base_struct.h>
#include <eda_item.h>
#include <reporter.h>
class MARKER_BASE;

4
common/swig/kicad.i
View File

@ -82,7 +82,7 @@ principle should be easily implemented by adapting the current STL containers.
%{
#include <macros.h>
#include <cstddef>
#include <base_struct.h>
#include <eda_item.h>
#include <eda_rect.h>
#include <common.h>
#include <wx_python_helpers.h>
@ -109,7 +109,7 @@ principle should be easily implemented by adapting the current STL containers.
// header files that must be wrapped
%include macros.h
%include core/typeinfo.h
%include base_struct.h
%include eda_item.h
%include eda_rect.h
%include common.h
%include title_block.h

2
common/undo_redo_container.cpp
View File

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <base_struct.h>
#include <eda_item.h>
#include <undo_redo_container.h>

2
common/view/view.cpp
View File

@ -24,7 +24,7 @@
*/
#include <base_struct.h>
#include <eda_item.h>
#include <layers_id_colors_and_visibility.h>
#include <view/view.h>

2
eeschema/lib_field.cpp
View File

@ -23,7 +23,7 @@
*/
#include <pgm_base.h>
#include <base_struct.h>
#include <eda_item.h>
#include <gr_text.h>
#include <kicad_string.h>
#include <sch_draw_panel.h>

2
eeschema/lib_item.h
View File

@ -26,7 +26,7 @@
#ifndef _LIB_ITEM_H_
#define _LIB_ITEM_H_
#include <base_struct.h>
#include <eda_item.h>
#include <eda_rect.h>
#include <transform.h>
#include <gr_basic.h>

2
eeschema/sch_component.h
View File

@ -27,7 +27,7 @@
#ifndef COMPONENT_CLASS_H
#define COMPONENT_CLASS_H
#include <base_struct.h>
#include <eda_item.h>
#include <common.h>
#include <core/typeinfo.h>
#include <layers_id_colors_and_visibility.h>

2
eeschema/sch_draw_panel.h
View File

@ -25,7 +25,7 @@
#define __SCH_DRAW_PANEL_H
#include <class_draw_panel_gal.h>
#include <base_struct.h>
#include <eda_item.h>
#include <gr_basic.h>
#include <eda_rect.h>
#include <sch_view.h>

2
eeschema/sch_field.cpp
View File

@ -30,7 +30,7 @@
* They can be renamed and can appear in reports
*/
#include <base_struct.h>
#include <eda_item.h>
#include <gr_text.h>
#include <sch_edit_frame.h>
#include <plotter.h>

2
eeschema/sch_item.cpp
View File

@ -22,7 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <base_struct.h>
#include <eda_item.h>
#include <trace_helpers.h>
#include <sch_item.h>
#include <sch_screen.h>

2
eeschema/sch_item.h
View File

@ -29,7 +29,7 @@
#include <unordered_set>
#include <vector>
#include <base_struct.h>
#include <eda_item.h>
#include <plotter.h> // for PLOT_DASH_TYPE definition
#include <gal/color4d.h>

2
eeschema/sch_preview_panel.h
View File

@ -26,7 +26,7 @@
#define SCH_PREVIEW_PANEL_H
#include <class_draw_panel_gal.h>
#include <base_struct.h>
#include <eda_item.h>
#include <gr_basic.h>
#include <eda_rect.h>

2
eeschema/sch_screen.h
View File

@ -35,7 +35,7 @@
#include <wx/string.h>
#include <base_screen.h>
#include <base_struct.h>
#include <eda_item.h>
#include <core/typeinfo.h>
#include <kiway_holder.h>
#include <layers_id_colors_and_visibility.h>

2
eeschema/sch_sheet_path.h
View File

@ -31,7 +31,7 @@
#ifndef CLASS_DRAWSHEET_PATH_H
#define CLASS_DRAWSHEET_PATH_H
#include <base_struct.h>
#include <eda_item.h>
#include <erc_item.h>
#include <map>

2
eeschema/sch_view.h
View File

@ -24,7 +24,7 @@
#ifndef SCH_VIEW_H_
#define SCH_VIEW_H_
#include <base_struct.h>
#include <eda_item.h>
#include <layers_id_colors_and_visibility.h>
#include <math/vector2d.h>
#include <view/view.h>

2
eeschema/schematic.h
View File

@ -20,7 +20,7 @@
#ifndef KICAD_SCHEMATIC_H
#define KICAD_SCHEMATIC_H
#include <base_struct.h>
#include <eda_item.h>
#include <sch_sheet_path.h>
#include <schematic_settings.h>

2
eeschema/tools/lib_move_tool.cpp
View File

@ -26,7 +26,7 @@
#include <tools/ee_selection_tool.h>
#include <ee_actions.h>
#include <bitmaps.h>
#include <base_struct.h>
#include <eda_item.h>
#include <lib_edit_frame.h>
#include "lib_move_tool.h"
#include "lib_pin_tool.h"

2
eeschema/tools/sch_edit_tool.cpp
View File

@ -32,7 +32,7 @@
#include <ee_actions.h>
#include <bitmaps.h>
#include <confirm.h>
#include <base_struct.h>
#include <eda_item.h>
#include <reporter.h>
#include <sch_item.h>
#include <sch_component.h>

2
eeschema/tools/sch_line_wire_bus_tool.cpp
View File

@ -36,7 +36,7 @@
#include <utility>
#include <vector>
#include <base_struct.h>
#include <eda_item.h>
#include <bitmaps.h>
#include <core/typeinfo.h>
#include <layers_id_colors_and_visibility.h>

2
eeschema/tools/sch_move_tool.cpp
View File

@ -28,7 +28,7 @@
#include <tools/sch_line_wire_bus_tool.h>
#include <ee_actions.h>
#include <bitmaps.h>
#include <base_struct.h>
#include <eda_item.h>
#include <sch_iref.h>
#include <sch_item.h>
#include <sch_component.h>

2
gerbview/am_primitive.h
View File

@ -33,7 +33,7 @@
#include <vector>
#include <set>
#include <base_struct.h>
#include <eda_item.h>
#include <am_param.h>
#include <eda_rect.h>

2
gerbview/dcode.h
View File

@ -32,7 +32,7 @@
#include <vector>
#include <base_struct.h>
#include <eda_item.h>
#include <gal/color4d.h>
#include <geometry/shape_poly_set.h>

2
gerbview/gerber_draw_item.h
View File

@ -29,7 +29,7 @@
#ifndef GERBER_DRAW_ITEM_H
#define GERBER_DRAW_ITEM_H
#include <base_struct.h>
#include <eda_item.h>
#include <layers_id_colors_and_visibility.h>
#include <gr_basic.h>
#include <gbr_netlist_metadata.h>

2
gerbview/tools/gerbview_inspection_tool.cpp
View File

@ -19,7 +19,7 @@
*/
#include <base_struct.h>
#include <eda_item.h>
#include <bitmaps.h>
#include <class_draw_panel_gal.h>
#include <dialogs/dialog_layers_select_to_pcb.h>

2
gerbview/tools/gerbview_selection.cpp
View File

@ -18,7 +18,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <base_struct.h>
#include <eda_item.h>
#include <view/view_group.h>
#include <gerber_draw_item.h>
#include <tools/gerbview_selection.h>

2
gerbview/tools/gerbview_selection_tool.cpp
View File

@ -22,7 +22,7 @@
#include <functional>
using namespace std::placeholders;
#include <base_struct.h>
#include <eda_item.h>
#include <bitmaps.h>
#include <gerber_collectors.h>
#include <class_draw_panel_gal.h>

2
include/base_screen.h
View File

@ -32,7 +32,7 @@
#define BASE_SCREEN_H
#include <eda_draw_frame.h>
#include <base_struct.h>
#include <eda_item.h>
#include <common.h>

2
include/class_board_item.h
View File

@ -31,7 +31,7 @@
#define BOARD_ITEM_STRUCT_H
#include <base_struct.h>
#include <eda_item.h>
#include <common.h>
#include <convert_to_biu.h>
#include <gr_basic.h>

2
include/collector.h
View File

@ -32,7 +32,7 @@
#include <vector>
#include <base_struct.h> // SEARCH_RESULT
#include <eda_item.h> // SEARCH_RESULT
#include <common.h> // GetNewTimeStamp()
#include <eda_rect.h>

7
include/base_struct.h → include/eda_item.h
View File

@ -24,8 +24,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef BASE_STRUCT_H_
#define BASE_STRUCT_H_
#ifndef EDA_ITEM_H
#define EDA_ITEM_H
#include <deque>
@ -587,5 +587,4 @@ inline EDA_ITEM* new_clone( const EDA_ITEM& aItem ) { return aItem.Clone(); }
*/
typedef std::vector< EDA_ITEM* > EDA_ITEMS;
#endif // BASE_STRUCT_H_
#endif // EDA_ITEM_H

2
include/eda_text.h
View File

@ -28,7 +28,7 @@
#include <trigo.h> // NORMALIZE_ANGLE_POS( angle );
#include <common.h> // wxStringSplit
#include <gr_basic.h> // EDA_DRAW_MODE_T
#include <base_struct.h> // EDA_RECT
#include <eda_item.h> // EDA_RECT
#include "kicad_string.h"
#include "painter.h"

2
include/gr_text.h
View File

@ -31,7 +31,7 @@
#ifndef __INCLUDE__DRAWTXT_H__
#define __INCLUDE__DRAWTXT_H__ 1
#include <base_struct.h>
#include <eda_item.h>
#include <eda_text.h> // EDA_TEXT_HJUSTIFY_T and EDA_TEXT_VJUSTIFY_T
/* Minimum dimension in pixel for drawing/no drawing a text

2
include/hashtables.h
View File

@ -25,7 +25,7 @@
#ifndef HASHTABLES_H_
#define HASHTABLES_H_
#include <base_struct.h>
#include <eda_item.h>
#include <wx/string.h>
// Two competing strategies for providing portable hashtables are given:

2
include/lib_tree_item.h
View File

@ -25,7 +25,7 @@
#ifndef LIB_TREE_ITEM_H
#define LIB_TREE_ITEM_H
#include <base_struct.h>
#include <eda_item.h>
#include <lib_id.h>
#include <import_export.h>

2
include/page_layout/ws_proxy_undo_item.h
View File

@ -25,7 +25,7 @@
#ifndef WS_PROXY_UNDO_ITEM_H
#define WS_PROXY_UNDO_ITEM_H
#include <base_struct.h>
#include <eda_item.h>
#include <title_block.h>
#include <page_info.h>

2
include/page_layout/ws_proxy_view_item.h
View File

@ -25,7 +25,7 @@
#ifndef WS_PROXY_VIEW_ITEM_H
#define WS_PROXY_VIEW_ITEM_H
#include <base_struct.h>
#include <eda_item.h>
class BOARD;
class PAGE_INFO;

2
include/pcb_base_frame.h
View File

@ -32,7 +32,7 @@
#define PCB_BASE_FRAME_H
#include <base_struct.h>
#include <eda_item.h>
#include <class_board.h>
#include <eda_draw_frame.h>
#include <eda_text.h> // EDA_DRAW_MODE_T

2
include/plotter.h
View File

@ -36,7 +36,7 @@
#include <math/box2.h>
#include <gr_text.h>
#include <page_info.h>
#include <base_struct.h> // FILL_T
#include <eda_item.h> // FILL_T
class COLOR_SETTINGS;
class SHAPE_POLY_SET;

2
include/preview_items/arc_assistant.h
View File

@ -24,7 +24,7 @@
#ifndef PREVIEW_ITEMS_ARC_ASSISTANT_H
#define PREVIEW_ITEMS_ARC_ASSISTANT_H
#include <base_struct.h>
#include <eda_item.h>
#include <preview_items/arc_geom_manager.h>
#include <layers_id_colors_and_visibility.h>

2
include/preview_items/bright_box.h
View File

@ -27,7 +27,7 @@
#include <math/box2.h>
#include <view/view.h>
#include <base_struct.h>
#include <eda_item.h>
#include <layers_id_colors_and_visibility.h>
#include <gal/color4d.h>

2
include/preview_items/ruler_item.h
View File

@ -24,7 +24,7 @@
#ifndef PREVIEW_ITEMS_RULER_ITEM_H
#define PREVIEW_ITEMS_RULER_ITEM_H
#include <base_struct.h>
#include <eda_item.h>
#include <preview_items/two_point_geom_manager.h>
namespace KIGFX

2
include/preview_items/simple_overlay_item.h
View File

@ -24,7 +24,7 @@
#ifndef PREVIEW_SIMPLE_OUTLINE_ITEM__H_
#define PREVIEW_SIMPLE_OUTLINE_ITEM__H_
#include <base_struct.h>
#include <eda_item.h>
#include <layers_id_colors_and_visibility.h>
#include <gal/color4d.h>

2
include/preview_items/two_point_assistant.h
View File

@ -24,7 +24,7 @@
#ifndef PREVIEW_ITEMS_TWO_POINT_ASSISTANT_H
#define PREVIEW_ITEMS_TWO_POINT_ASSISTANT_H
#include <base_struct.h>
#include <eda_item.h>
#include <preview_items/two_point_geom_manager.h>
#include <layers_id_colors_and_visibility.h>

2
include/tool/edit_points.h
View File

@ -25,7 +25,7 @@
#ifndef EDIT_POINTS_H_
#define EDIT_POINTS_H_
#include <base_struct.h>
#include <eda_item.h>
#include <layers_id_colors_and_visibility.h>
#include <list>

2
include/tool/selection.h
View File

@ -30,7 +30,7 @@
#include <core/optional.h>
#include <deque>
#include <eda_rect.h>
#include <base_struct.h>
#include <eda_item.h>
#include <view/view_group.h>

2
include/tool/tool_base.h
View File

@ -27,7 +27,7 @@
#define __TOOL_BASE_H
#include <cassert>
#include <base_struct.h> // for KICAD_T
#include <eda_item.h> // for KICAD_T
#include <tool/tool_event.h>

2
include/undo_redo_container.h
View File

@ -27,7 +27,7 @@
#define _CLASS_UNDOREDO_CONTAINER_H
#include <vector>
#include <base_struct.h>
#include <eda_item.h>
class PICKED_ITEMS_LIST;

2
include/widgets/unit_binder.h
View File

@ -28,7 +28,7 @@
#include <common.h>
#include <base_units.h>
#include <base_struct.h>
#include <eda_item.h>
#include <origin_transforms.h>
#include <libeval/numeric_evaluator.h>

2
pagelayout_editor/tools/pl_edit_tool.cpp
View File

@ -29,7 +29,7 @@
#include <page_layout/ws_draw_item.h>
#include <bitmaps.h>
#include <confirm.h>
#include <base_struct.h>
#include <eda_item.h>
#include <view/view.h>
#include <math/util.h> // for KiROUND

2
pcb_calculator/datafile_read_write.h
View File

@ -21,7 +21,7 @@
#include <wx/wx.h>
#include <pcb_calculator_datafile_lexer.h>
#include <base_struct.h>
#include <eda_item.h>
class PCB_CALCULATOR_DATAFILE_PARSER;

2
pcbnew/exporters/gen_drill_report_files.cpp
View File

@ -28,7 +28,7 @@
*/
#include <plotter.h>
#include <base_struct.h>
#include <eda_item.h>
#include <gr_text.h>
#include <confirm.h>
#include <kicad_string.h>

2
pcbnew/pcb_text.cpp
View File

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <base_struct.h>
#include <eda_item.h>
#include <pcb_edit_frame.h>
#include <base_units.h>
#include <bitmaps.h>

2
pcbnew/plot_board_layers.cpp
View File

@ -29,7 +29,7 @@
*/
#include <base_struct.h>
#include <eda_item.h>
#include <geometry/geometry_utils.h>
#include <geometry/shape_segment.h>
#include <pcb_base_frame.h>

2
pcbnew/plot_brditems_plotter.cpp
View File

@ -27,7 +27,7 @@
#include <stddef.h> // for NULL, size_t
#include <vector> // for vector, __vector_base<>...
#include <base_struct.h>
#include <eda_item.h>
#include <common.h>
#include <convert_basic_shapes_to_polygon.h>
#include <geometry/seg.h> // for SEG

2
pcbnew/ratsnest/ratsnest_viewitem.h
View File

@ -31,7 +31,7 @@
#define RATSNEST_VIEWITEM_H
#include <memory>
#include <base_struct.h>
#include <eda_item.h>
#include <math/vector2d.h>
class GAL;

Write Preview
Loading…
Cancel
Save