AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-04 23:35:31 +00:00
Files Issues Releases Activity

Unify flip direction handling

Browse Source 
There was a gentle mish-mash of booleans, some with
true being left/right and some up/down, and some functions that
can flip in both axes (which is never actually done, and doesn't
really make geometric sense).

Replace all this with the FLIP_DIRECTION enum class, which makes
the intention completely unambiguous.

This also then allows a small scattering of simplifications,
because everything takes the same type and you don't have to
fiddle booleans to fit.
This commit is contained in:
John Beard 2024-09-27 09:08:31 +01:00
parent 3066ad2088
commit 215533f31a
75 changed files with 293 additions and 448 deletions
3d-viewer/dialogs
panel_preview_3d_model.cpp
common
bitmap_base.cppeda_shape.cpp
widgets
footprint_diff_widget.cpp
eeschema
sch_bitmap.cpp
gerbview
export_to_pcbnew.cppgerber_draw_item.cpp
include
bitmap_base.hboard_item.h
core
mirror.h
eda_shape.h
settings
app_settings.h
libs/kimath
include/geometry
shape_arc.hshape_line_chain.hshape_poly_set.h
src/geometry
shape_arc.cppshape_line_chain.cppshape_poly_set.cpp
pcbnew
board_item.cpp
dialogs
dialog_footprint_properties.cppdialog_pad_properties.cpppanel_edit_options.cpp
drc
drc_test_provider_library_parity.cpp
exporters
export_gencad_writer.cpp
footprint.cppfootprint.hfootprint_editor_settings.cppfootprint_viewer_frame.cpp
generators
pcb_tuning_pattern.cpp
load_select_footprint.cpppad.cpppad.hpcb_base_frame.cpppcb_dimension.cpppcb_dimension.hpcb_edit_frame.cpppcb_generator.cpppcb_generator.hpcb_group.cpppcb_group.h
pcb_io
cadstar
cadstar_pcb_archive_loader.cpp
eagle
pcb_io_eagle.cpp
easyedapro
pcb_io_easyedapro_parser.cpp
fabmaster
import_fabmaster.cpp
ipc2581
pcb_io_ipc2581.cpp
kicad_sexpr
pcb_io_kicad_sexpr.cpp
odbpp
odb_eda_data.cpp
pcb_marker.cpppcb_marker.hpcb_reference_image.cpppcb_reference_image.hpcb_shape.cpppcb_shape.hpcb_table.cpppcb_table.hpcb_target.cpppcb_target.hpcb_text.cpppcb_text.hpcb_textbox.cpppcb_textbox.hpcb_track.cpppcb_track.hpcbnew_settings.cpppcbnew_settings.h
specctra_import_export
specctra_export.cppspecctra_import.cpp
tools
board_editor_control.cppedit_tool.cppedit_tool_move_fct.cpppcb_tool_base.cpp
zone.cppzone.h
qa/tests
common
test_bitmap_base.cpp
pcbnew
test_board_item.cpp

2
3d-viewer/dialogs/panel_preview_3d_model.cpp
View File

@ -117,7 +117,7 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
// Ensure the footprint is shown like in Fp editor: rot 0, not flipped
// to avoid mistakes when setting the3D shape position/rotation
if( m_dummyFootprint->IsFlipped() )
m_dummyFootprint->Flip( m_dummyFootprint->GetPosition(), false );
m_dummyFootprint->Flip( m_dummyFootprint->GetPosition(), FLIP_DIRECTION::TOP_BOTTOM );
m_dummyFootprint->SetOrientation( ANGLE_0 );

11
common/bitmap_base.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2017 jean-pierre.charras
* Copyright (C) 2011-2023 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2011-2024 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
@ -22,7 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <bitmap_base.h>
#include "bitmap_base.h"
#include <gr_basic.h>
#include <math/util.h> // for KiROUND
#include <memory> // for make_unique, unique_ptr
@ -408,7 +409,7 @@ VECTOR2I BITMAP_BASE::GetSize() const
}
void BITMAP_BASE::Mirror( bool aVertically )
void BITMAP_BASE::Mirror( FLIP_DIRECTION aFlipDirection )
{
if( m_image )
{
@ -420,13 +421,13 @@ void BITMAP_BASE::Mirror( bool aVertically )
int resY = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONY );
int unit = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONUNIT );
*m_image = m_image->Mirror( not aVertically );
*m_image = m_image->Mirror( aFlipDirection == FLIP_DIRECTION::LEFT_RIGHT );
m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONUNIT , unit);
m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONX, resX);
m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONY, resY);
if( aVertically )
if( aFlipDirection == FLIP_DIRECTION::TOP_BOTTOM )
m_isMirroredY = !m_isMirroredY;
else
m_isMirroredX = !m_isMirroredX;

61
common/eda_shape.cpp
View File

@ -428,73 +428,38 @@ void EDA_SHAPE::rotate( const VECTOR2I& aRotCentre, const EDA_ANGLE& aAngle )
}
void EDA_SHAPE::flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
void EDA_SHAPE::flip( const VECTOR2I& aCentre, FLIP_DIRECTION aFlipDirection )
{
switch ( m_shape )
{
case SHAPE_T::SEGMENT:
case SHAPE_T::RECTANGLE:
if( aFlipLeftRight )
{
m_start.x = aCentre.x - ( m_start.x - aCentre.x );
m_end.x = aCentre.x - ( m_end.x - aCentre.x );
}
else
{
m_start.y = aCentre.y - ( m_start.y - aCentre.y );
m_end.y = aCentre.y - ( m_end.y - aCentre.y );
}
MIRROR( m_start, aCentre, aFlipDirection );
MIRROR( m_end, aCentre, aFlipDirection );
break;
case SHAPE_T::CIRCLE:
if( aFlipLeftRight )
{
m_start.x = aCentre.x - ( m_start.x - aCentre.x );
m_end.x = aCentre.x - ( m_end.x - aCentre.x );
}
else
{
m_start.y = aCentre.y - ( m_start.y - aCentre.y );
m_end.y = aCentre.y - ( m_end.y - aCentre.y );
}
MIRROR( m_start, aCentre, aFlipDirection );
MIRROR( m_end, aCentre, aFlipDirection );
break;
case SHAPE_T::ARC:
if( aFlipLeftRight )
{
m_start.x = aCentre.x - ( m_start.x - aCentre.x );
m_end.x = aCentre.x - ( m_end.x - aCentre.x );
m_arcCenter.x = aCentre.x - ( m_arcCenter.x - aCentre.x );
}
else
{
m_start.y = aCentre.y - ( m_start.y - aCentre.y );
m_end.y = aCentre.y - ( m_end.y - aCentre.y );
m_arcCenter.y = aCentre.y - ( m_arcCenter.y - aCentre.y );
}
MIRROR( m_start, aCentre, aFlipDirection );
MIRROR( m_end, aCentre, aFlipDirection );
MIRROR( m_arcCenter, aCentre, aFlipDirection );
std::swap( m_start, m_end );
break;
case SHAPE_T::POLY:
m_poly.Mirror( aFlipLeftRight, !aFlipLeftRight, aCentre );
m_poly.Mirror( aCentre, aFlipDirection );
break;
case SHAPE_T::BEZIER:
if( aFlipLeftRight )
{
m_start.x = aCentre.x - ( m_start.x - aCentre.x );
m_end.x = aCentre.x - ( m_end.x - aCentre.x );
m_bezierC1.x = aCentre.x - ( m_bezierC1.x - aCentre.x );
m_bezierC2.x = aCentre.x - ( m_bezierC2.x - aCentre.x );
}
else
{
m_start.y = aCentre.y - ( m_start.y - aCentre.y );
m_end.y = aCentre.y - ( m_end.y - aCentre.y );
m_bezierC1.y = aCentre.y - ( m_bezierC1.y - aCentre.y );
m_bezierC2.y = aCentre.y - ( m_bezierC2.y - aCentre.y );
}
MIRROR( m_start, aCentre, aFlipDirection );
MIRROR( m_end, aCentre, aFlipDirection );
MIRROR( m_bezierC1, aCentre, aFlipDirection );
MIRROR( m_bezierC2, aCentre, aFlipDirection );
RebuildBezierToSegmentsPointsList( m_stroke.GetWidth() / 2 );
break;

4
common/widgets/footprint_diff_widget.cpp
View File

@ -74,10 +74,10 @@ void FOOTPRINT_DIFF_WIDGET::DisplayDiff( FOOTPRINT* aBoardFootprint,
m_boardItemCopy->Move( -m_boardItemCopy->GetPosition() );
if( m_boardItemCopy->IsFlipped() )
m_boardItemCopy->Flip( {0,0}, false );
m_boardItemCopy->Flip( { 0, 0 }, FLIP_DIRECTION::TOP_BOTTOM );
if( m_boardItemCopy->GetOrientation() != ANGLE_0 )
m_boardItemCopy->Rotate( {0,0}, -m_boardItemCopy->GetOrientation() );
m_boardItemCopy->Rotate( { 0, 0 }, -m_boardItemCopy->GetOrientation() );
m_libraryItem = aLibFootprint;

4
eeschema/sch_bitmap.cpp
View File

@ -152,14 +152,14 @@ VECTOR2I SCH_BITMAP::GetSize() const
void SCH_BITMAP::MirrorVertically( int aCenter )
{
MIRROR( m_pos.y, aCenter );
m_bitmapBase->Mirror( true );
m_bitmapBase->Mirror( FLIP_DIRECTION::TOP_BOTTOM );
}
void SCH_BITMAP::MirrorHorizontally( int aCenter )
{
MIRROR( m_pos.x, aCenter );
m_bitmapBase->Mirror( false );
m_bitmapBase->Mirror( FLIP_DIRECTION::LEFT_RIGHT );
}

4
gerbview/export_to_pcbnew.cpp
View File

@ -186,7 +186,7 @@ void GBR_TO_PCB_EXPORTER::export_non_copper_item( const GERBER_DRAW_ITEM* aGbrIt
SHAPE_POLY_SET polyshape = d_codeDescr->m_Polygon;
// Compensate the Y axis orientation ( writePcbPolygon invert the Y coordinate )
polyshape.Outline( 0 ).Mirror( false, true );
polyshape.Outline( 0 ).Mirror( { 0, 0 }, FLIP_DIRECTION::TOP_BOTTOM );
writePcbPolygon( polyshape, aLayer, aGbrItem->GetABPosition( seg_start ) );
}
break;
@ -470,7 +470,7 @@ void GBR_TO_PCB_EXPORTER::export_flashed_copper_item( const GERBER_DRAW_ITEM* aG
macroShape = *macro->GetApertureMacroShape( aGbrItem, VECTOR2I( 0, 0 ) );
// Compensate the Y axis orientation ( writePcbPolygon invert the Y coordinate )
macroShape.Outline( 0 ).Mirror( false, true );
macroShape.Outline( 0 ).Mirror( { 0, 0 }, FLIP_DIRECTION::TOP_BOTTOM );
writePcbPolygon( macroShape, aLayer, offset );
}

2
gerbview/gerber_draw_item.cpp
View File

@ -627,7 +627,7 @@ void GERBER_DRAW_ITEM::ConvertSegmentToPolygon( SHAPE_POLY_SET* aPolygon ) const
// Create final polygon:
if( change )
aPolygon->Mirror( false, true );
aPolygon->Mirror( { 0, 0 }, FLIP_DIRECTION::TOP_BOTTOM );
aPolygon->Move( VECTOR2I( start ) );
}

14
include/bitmap_base.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2018 jean-pierre.charras jp.charras at wanadoo.fr
* Copyright (C) 2013-2023 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2013-2024 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
@ -22,11 +22,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef BITMAP_BASE_H
#define BITMAP_BASE_H
#pragma once
#include <wx/bitmap.h>
#include <wx/image.h>
#include <core/mirror.h>
#include <kiid.h>
#include <math/box2.h>
#include <gal/color4d.h>
@ -194,9 +195,9 @@ public:
/**
* Mirror image vertically (i.e. relative to its horizontal X axis ) or horizontally (i.e
* relative to its vertical Y axis).
* @param aVertically false to mirror horizontally or true to mirror vertically.
* @param aFlipDirection the direction to flip the image.
*/
void Mirror( bool aVertically );
void Mirror( FLIP_DIRECTION aFlipDirection );
/**
* Rotate image CW or CCW.
@ -274,6 +275,3 @@ private:
bool m_isMirroredY; // Used for OpenGL rendering only
EDA_ANGLE m_rotation; // Used for OpenGL rendering only
};
#endif // BITMAP_BASE_H

15
include/board_item.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wandadoo.fr
* Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2024 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
@ -22,15 +22,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef BOARD_ITEM_STRUCT_H
#define BOARD_ITEM_STRUCT_H
#pragma once
#include <core/mirror.h>
#include <eda_item.h>
#include <geometry/approximation.h>
#include <layer_ids.h>
#include <lseq.h>
#include <lset.h>
#include <geometry/approximation.h>
#include <stroke_params.h>
#include <geometry/eda_angle.h>
@ -358,9 +358,9 @@ public:
* Flip this object, i.e. change the board side for this object.
*
* @param aCentre the rotation point.
* @param aFlipLeftRight mirror across Y axis instead of X (the default).
* @param aFlipDirection the flip direction
*/
virtual void Flip( const VECTOR2I& aCentre, bool aFlipLeftRight );
virtual void Flip( const VECTOR2I& aCentre, FLIP_DIRECTION aFlipDirection );
/**
* Perform any normalization required after a user rotate and/or flip.
@ -489,6 +489,3 @@ public:
void Show( int , std::ostream& ) const override {}
#endif
};
#endif /* BOARD_ITEM_STRUCT_H */

29
include/core/mirror.h
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 KiCad Developers, see AUTHORS.TXT for contributors.
* Copyright (C) 2024 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
@ -21,14 +21,19 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef MIRROR_H
#define MIRROR_H
#pragma once
enum class FLIP_DIRECTION
{
LEFT_RIGHT, ///< Flip left to right (around the Y axis)
TOP_BOTTOM ///< Flip top to bottom (around the X axis)
};
/**
* Returns the mirror of aPoint relative to the aMirrorRef.
*/
template <typename T>
T MIRRORVAL( T aPoint, T aMirrorRef )
constexpr T MIRRORVAL( T aPoint, T aMirrorRef )
{
return -( aPoint - aMirrorRef ) + aMirrorRef;
}
@ -37,9 +42,21 @@ T MIRRORVAL( T aPoint, T aMirrorRef )
* Updates aPoint with the mirror of aPoint relative to the aMirrorRef.
*/
template <typename T>
void MIRROR( T& aPoint, const T& aMirrorRef )
constexpr void MIRROR( T& aPoint, const T& aMirrorRef )
{
aPoint = MIRRORVAL( aPoint, aMirrorRef );
}
#endif /* MIRROR_H */
/**
* Updates aPoint with the mirror of aPoint relative to the aMirrorRef,
* in the specified direction.
*/
template <typename VT>
constexpr void MIRROR( VT& aPoint, const VT& aMirrorRef, FLIP_DIRECTION aFlipDirection )
{
if( aFlipDirection == FLIP_DIRECTION::LEFT_RIGHT )
MIRROR( aPoint.x, aMirrorRef.x );
else
MIRROR( aPoint.y, aMirrorRef.y );
}

10
include/eda_shape.h
View File

@ -22,14 +22,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef EDA_SHAPE_H
#define EDA_SHAPE_H
#pragma once
#include <trigo.h>
#include <core/mirror.h>
#include <geometry/shape_poly_set.h>
#include <geometry/approximation.h>
#include <properties/property.h>
#include <stroke_params.h>
#include <trigo.h>
class LINE_READER;
class EDA_DRAW_FRAME;
@ -375,7 +375,7 @@ protected:
void move( const VECTOR2I& aMoveVector );
void rotate( const VECTOR2I& aRotCentre, const EDA_ANGLE& aAngle );
void flip( const VECTOR2I& aCentre, bool aFlipLeftRight );
void flip( const VECTOR2I& aCentre, FLIP_DIRECTION aFlipDirection );
void scale( double aScale );
const BOX2I getBoundingBox() const;
@ -443,5 +443,3 @@ protected:
DECLARE_ENUM_TO_WXANY( SHAPE_T );
DECLARE_ENUM_TO_WXANY( LINE_STYLE );
#endif
#endif // EDA_SHAPE_H

9
include/settings/app_settings.h
View File

@ -54,15 +54,6 @@ enum class ARC_EDIT_MODE
KEEP_ENDPOINTS_OR_START_DIRECTION
};
/**
* Settings for board items flip. Used by pcbnew
*/
enum class FLIP_DIRECTION
{
LEFT_RIGHT,
TOP_BOTTOM
};
/**
* Stores the window positioning/state
*/

8
libs/kimath/include/geometry/shape_arc.h
View File

@ -23,9 +23,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __SHAPE_ARC_H
#define __SHAPE_ARC_H
#pragma once
#include <core/mirror.h> // for FLIP_DIRECTION
#include <geometry/shape.h>
#include <base_units.h>
#include <math/vector2d.h> // for VECTOR2I
@ -185,7 +185,7 @@ public:
*/
void Rotate( const EDA_ANGLE& aAngle, const VECTOR2I& aCenter ) override;
void Mirror( bool aX = true, bool aY = false, const VECTOR2I& aVector = { 0, 0 } );
void Mirror( const VECTOR2I& aRef, FLIP_DIRECTION aFlipDirection );
void Mirror( const SEG& axis );
@ -290,5 +290,3 @@ private:
// Required for Boost Test BOOST_CHECK_EQUAL:
std::ostream& operator<<( std::ostream& aStream, const SHAPE_ARC& aArc );
#endif

5
libs/kimath/include/geometry/shape_line_chain.h
View File

@ -758,11 +758,10 @@ public:
/**
* Mirror the line points about y or x (or both).
*
* @param aX If true, mirror about the y axis (flip X coordinate).
* @param aY If true, mirror about the x axis (flip Y coordinate).
* @param aRef sets the reference point about which to mirror.
* @param aFlipDirection is the direction to mirror.
*/
void Mirror( bool aX = true, bool aY = false, const VECTOR2I& aRef = { 0, 0 } );
void Mirror( const VECTOR2I& aRef, FLIP_DIRECTION aFlipDirection );
/**
* Mirror the line points using an given axis.

6
libs/kimath/include/geometry/shape_poly_set.h
View File

@ -41,6 +41,7 @@
#include <clipper.hpp> // for ClipType, PolyTree (ptr only)
#include <clipper2/clipper.h>
#include <core/mirror.h> // for FLIP_DIRECTION
#include <geometry/corner_strategy.h>
#include <geometry/seg.h> // for SEG
#include <geometry/shape.h>
@ -1140,11 +1141,10 @@ public:
/**
* Mirror the line points about y or x (or both)
*
* @param aX If true, mirror about the y axis (flip x coordinate)
* @param aY If true, mirror about the x axis
* @param aRef sets the reference point about which to mirror
* @param aFlipDirection is the direction to mirror the points.
*/
void Mirror( bool aX = true, bool aY = false, const VECTOR2I& aRef = { 0, 0 } );
void Mirror( const VECTOR2I& aRef, FLIP_DIRECTION aFlipDirection );
/**
* Rotate all vertices by a given angle.

7
libs/kimath/src/geometry/shape_arc.cpp
View File

@ -642,16 +642,15 @@ void SHAPE_ARC::Rotate( const EDA_ANGLE& aAngle, const VECTOR2I& aCenter )
}
void SHAPE_ARC::Mirror( bool aX, bool aY, const VECTOR2I& aVector )
void SHAPE_ARC::Mirror( const VECTOR2I& aVector, FLIP_DIRECTION aFlipDirection )
{
if( aX )
if( aFlipDirection == FLIP_DIRECTION::LEFT_RIGHT )
{
m_start.x = -m_start.x + 2 * aVector.x;
m_end.x = -m_end.x + 2 * aVector.x;
m_mid.x = -m_mid.x + 2 * aVector.x;
}
if( aY )
else
{
m_start.y = -m_start.y + 2 * aVector.y;
m_end.y = -m_end.y + 2 * aVector.y;

9
libs/kimath/src/geometry/shape_line_chain.cpp
View File

@ -1018,19 +1018,18 @@ long long int SHAPE_LINE_CHAIN::Length() const
}
void SHAPE_LINE_CHAIN::Mirror( bool aX, bool aY, const VECTOR2I& aRef )
void SHAPE_LINE_CHAIN::Mirror( const VECTOR2I& aRef, FLIP_DIRECTION aFlipDirection )
{
for( auto& pt : m_points )
{
if( aX )
if( aFlipDirection == FLIP_DIRECTION::LEFT_RIGHT )
pt.x = -pt.x + 2 * aRef.x;
if( aY )
else
pt.y = -pt.y + 2 * aRef.y;
}
for( auto& arc : m_arcs )
arc.Mirror( aX, aY, aRef );
arc.Mirror( aRef, aFlipDirection );
}

4
libs/kimath/src/geometry/shape_poly_set.cpp
View File

@ -2740,12 +2740,12 @@ void SHAPE_POLY_SET::Move( const VECTOR2I& aVector )
}
void SHAPE_POLY_SET::Mirror( bool aX, bool aY, const VECTOR2I& aRef )
void SHAPE_POLY_SET::Mirror( const VECTOR2I& aRef, FLIP_DIRECTION aFlipDirection )
{
for( POLYGON& poly : m_polys )
{
for( SHAPE_LINE_CHAIN& path : poly )
path.Mirror( aX, aY, aRef );
path.Mirror( aRef, aFlipDirection );
}
if( m_triangulationValid )

2
pcbnew/board_item.cpp
View File

@ -359,7 +359,7 @@ void BOARD_ITEM::Rotate( const VECTOR2I& aRotCentre, const EDA_ANGLE& aAngle )
}
void BOARD_ITEM::Flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
void BOARD_ITEM::Flip( const VECTOR2I& aCentre, FLIP_DIRECTION aFlipDirection )
{
wxMessageBox( wxT( "virtual BOARD_ITEM::Flip used, should not occur" ), GetClass() );
}

5
pcbnew/dialogs/dialog_footprint_properties.cpp
View File

@ -611,7 +611,10 @@ bool DIALOG_FOOTPRINT_PROPERTIES::TransferDataFromWindow()
change_layer = true;
if( change_layer )
m_footprint->Flip( m_footprint->GetPosition(), m_frame->GetPcbNewSettings()->m_FlipLeftRight );
{
m_footprint->Flip( m_footprint->GetPosition(),
m_frame->GetPcbNewSettings()->m_FlipDirection );
}
// Copy the models from the panel to the footprint
std::vector<FP_3DMODEL>& panelList = m_3dPanel->GetModelList();

4
pcbnew/dialogs/dialog_pad_properties.cpp
View File

@ -553,7 +553,7 @@ void DIALOG_PAD_PROPERTIES::initValues()
if( footprint->IsFlipped() )
{
// flip pad (up/down) around its position
m_previewPad->Flip( m_previewPad->GetPosition(), false );
m_previewPad->Flip( m_previewPad->GetPosition(), FLIP_DIRECTION::TOP_BOTTOM );
relPos.y = - relPos.y;
}
@ -1489,7 +1489,7 @@ bool DIALOG_PAD_PROPERTIES::TransferDataFromWindow()
if( m_currentPad->GetParentFootprint() && m_currentPad->GetParentFootprint()->IsFlipped() )
{
// flip pad (up/down) around its position
m_currentPad->Flip( m_currentPad->GetPosition(), false );
m_currentPad->Flip( m_currentPad->GetPosition(), FLIP_DIRECTION::TOP_BOTTOM );
}
m_currentPad->SetPosition( m_masterPad->GetPosition() );

7
pcbnew/dialogs/panel_edit_options.cpp
View File

@ -65,9 +65,7 @@ void PANEL_EDIT_OPTIONS::loadPCBSettings( PCBNEW_SETTINGS* aCfg )
m_rotationAngle.SetAngleValue( aCfg->m_RotationAngle );
m_arcEditMode->SetSelection( (int) aCfg->m_ArcEditMode );
m_trackMouseDragCtrl->SetSelection( (int) aCfg->m_TrackDragAction );
FLIP_DIRECTION flipDirection =
aCfg->m_FlipLeftRight ? FLIP_DIRECTION::LEFT_RIGHT : FLIP_DIRECTION::TOP_BOTTOM;
m_boardItemsFlip->SetSelection( (int) flipDirection );
m_boardItemsFlip->SetSelection( static_cast<int>( aCfg->m_FlipDirection ) );
m_allowFreePads->SetValue( aCfg->m_AllowFreePads );
m_autoRefillZones->SetValue( aCfg->m_AutoRefillZones );
@ -153,8 +151,7 @@ bool PANEL_EDIT_OPTIONS::TransferDataFromWindow()
cfg->m_RotationAngle = m_rotationAngle.GetAngleValue();
cfg->m_ArcEditMode = (ARC_EDIT_MODE) m_arcEditMode->GetSelection();
cfg->m_TrackDragAction = (TRACK_DRAG_ACTION) m_trackMouseDragCtrl->GetSelection();
FLIP_DIRECTION flipDirection = (FLIP_DIRECTION) m_boardItemsFlip->GetSelection();
cfg->m_FlipLeftRight = ( flipDirection == FLIP_DIRECTION::LEFT_RIGHT );
cfg->m_FlipDirection = static_cast<FLIP_DIRECTION>( m_boardItemsFlip->GetSelection() );
cfg->m_AllowFreePads = m_allowFreePads->GetValue();
cfg->m_AutoRefillZones = m_autoRefillZones->GetValue();

2
pcbnew/drc/drc_test_provider_library_parity.cpp
View File

@ -553,7 +553,7 @@ bool FOOTPRINT::FootprintNeedsUpdate( const FOOTPRINT* aLibFP, int aCompareFlags
temp->SetParent( GetBoard() ); // Needed to know the copper layer count;
if( IsFlipped() != temp->IsFlipped() )
temp->Flip( { 0, 0 }, false );
temp->Flip( { 0, 0 }, FLIP_DIRECTION::TOP_BOTTOM );
if( GetOrientation() != temp->GetOrientation() )
temp->SetOrientation( GetOrientation() );

4
pcbnew/exporters/export_gencad_writer.cpp
View File

@ -183,7 +183,7 @@ bool GENCAD_EXPORTER::WriteFile( wxString& aFullFileName )
if( footprint->GetLayer() == B_Cu )
{
footprint->Flip( footprint->GetPosition(), false );
footprint->Flip( footprint->GetPosition(), FLIP_DIRECTION::TOP_BOTTOM );
footprint->SetFlag( 1 );
}
}
@ -217,7 +217,7 @@ bool GENCAD_EXPORTER::WriteFile( wxString& aFullFileName )
{
if( footprint->GetFlag() )
{
footprint->Flip( footprint->GetPosition(), false );
footprint->Flip( footprint->GetPosition(), FLIP_DIRECTION::TOP_BOTTOM );
footprint->SetFlag( 0 );
}
}

19
pcbnew/footprint.cpp
View File

@ -33,7 +33,6 @@
#include <confirm.h>
#include <convert_basic_shapes_to_polygon.h>
#include <convert_shape_list_to_polygon.h>
#include <core/mirror.h>
#include <drc/drc_item.h>
#include <embedded_files.h>
#include <font/font.h>
@ -1215,7 +1214,7 @@ BOX2I FOOTPRINT::GetFpPadsLocalBbox() const
dummy.SetOrientation( ANGLE_0 );
if( dummy.IsFlipped() )
dummy.Flip( VECTOR2I( 0, 0 ), false );
dummy.Flip( VECTOR2I( 0, 0 ), FLIP_DIRECTION::TOP_BOTTOM );
for( PAD* pad : dummy.Pads() )
bbox.Merge( pad->GetBoundingBox() );
@ -2260,11 +2259,11 @@ void FOOTPRINT::SetLayerAndFlip( PCB_LAYER_ID aLayer )
wxASSERT( aLayer == F_Cu || aLayer == B_Cu );
if( aLayer != GetLayer() )
Flip( GetPosition(), true );
Flip( GetPosition(), FLIP_DIRECTION::LEFT_RIGHT );
}
void FOOTPRINT::Flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
void FOOTPRINT::Flip( const VECTOR2I& aCentre, FLIP_DIRECTION aFlipDirection )
{
// Move footprint to its final position:
VECTOR2I finalPos = m_pos;
@ -2292,31 +2291,31 @@ void FOOTPRINT::Flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
// Mirror fields to other side of board.
for( PCB_FIELD* field : m_fields )
field->Flip( m_pos, false );
field->Flip( m_pos, FLIP_DIRECTION::TOP_BOTTOM );
// Mirror pads to other side of board.
for( PAD* pad : m_pads )
pad->Flip( m_pos, false );
pad->Flip( m_pos, FLIP_DIRECTION::TOP_BOTTOM );
// Now set the new orientation.
m_orient = newOrientation;
// Mirror zones to other side of board.
for( ZONE* zone : m_zones )
zone->Flip( m_pos, false );
zone->Flip( m_pos, FLIP_DIRECTION::TOP_BOTTOM );
// Reverse mirror footprint graphics and texts.
for( BOARD_ITEM* item : m_drawings )
item->Flip( m_pos, false );
item->Flip( m_pos, FLIP_DIRECTION::TOP_BOTTOM );
// Now rotate 180 deg if required
if( aFlipLeftRight )
if( aFlipDirection == FLIP_DIRECTION::LEFT_RIGHT )
Rotate( aCentre, ANGLE_180 );
m_boundingBoxCacheTimeStamp = 0;
m_textExcludedBBoxCacheTimeStamp = 0;
m_cachedHull.Mirror( aFlipLeftRight, !aFlipLeftRight, m_pos );
m_cachedHull.Mirror( m_pos, aFlipDirection );
std::swap( m_courtyard_cache_front, m_courtyard_cache_back );
}

Some files were not shown because too many files have changed in this diff Show More