realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Less auto.

Browse Source
This commit is contained in:
Jeff Young 2025-07-11 15:31:19 +01:00
parent dc0e211e1e
commit b2ba9d3371
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/tools/drawing_tool.cpp
View File

@ -3110,6 +3110,7 @@ std::unique_ptr<PCB_SHAPE> DRAWING_TOOL::drawOneBezier( const TOOL_EVENT& aToo
return bezier; return bezier;
}; };
bool DRAWING_TOOL::getSourceZoneForAction( ZONE_MODE aMode, ZONE** aZone ) bool DRAWING_TOOL::getSourceZoneForAction( ZONE_MODE aMode, ZONE** aZone )
{ {
bool clearSelection = false; bool clearSelection = false;
@ -3144,6 +3145,7 @@ bool DRAWING_TOOL::getSourceZoneForAction( ZONE_MODE aMode, ZONE** aZone )
return true; return true;
} }
int DRAWING_TOOL::DrawZone( const TOOL_EVENT& aEvent ) int DRAWING_TOOL::DrawZone( const TOOL_EVENT& aEvent )
{ {
if( m_isFootprintEditor && !m_frame->GetModel() ) if( m_isFootprintEditor && !m_frame->GetModel() )

18
pcbnew/tools/zone_create_helper.cpp
View File

@ -167,7 +167,7 @@ void ZONE_CREATE_HELPER::performZoneCutout( ZONE& aZone, const ZONE& aCutout )
std::vector<ZONE*> newZones; std::vector<ZONE*> newZones;
// Clear the selection before removing the old zone // Clear the selection before removing the old zone
auto toolMgr = m_tool.GetManager(); TOOL_MANAGER* toolMgr = m_tool.GetManager();
toolMgr->RunAction( ACTIONS::selectionClear ); toolMgr->RunAction( ACTIONS::selectionClear );
SHAPE_POLY_SET originalOutline( *aZone.Outline() ); SHAPE_POLY_SET originalOutline( *aZone.Outline() );
@ -178,15 +178,15 @@ void ZONE_CREATE_HELPER::performZoneCutout( ZONE& aZone, const ZONE& aCutout )
// contains main outlines: // contains main outlines:
for( int outline = 0; outline < originalOutline.OutlineCount(); outline++ ) for( int outline = 0; outline < originalOutline.OutlineCount(); outline++ )
{ {
auto newZoneOutline = new SHAPE_POLY_SET; SHAPE_POLY_SET* newZoneOutline = new SHAPE_POLY_SET;
newZoneOutline->AddOutline( originalOutline.Outline( outline ) ); newZoneOutline->AddOutline( originalOutline.Outline( outline ) );
// Add holes (if any) to the new zone outline: // Add holes (if any) to the new zone outline:
for (int hole = 0; hole < originalOutline.HoleCount( outline ) ; hole++ ) for (int hole = 0; hole < originalOutline.HoleCount( outline ) ; hole++ )
newZoneOutline->AddHole( originalOutline.CHole( outline, hole ) ); newZoneOutline->AddHole( originalOutline.CHole( outline, hole ) );
auto newZone = new ZONE( aZone ); ZONE* newZone = new ZONE( aZone );
newZone->SetOutline( newZoneOutline ); newZone->SetOutline( newZoneOutline ); // zone takes ownership
newZone->SetLocalFlags( 1 ); newZone->SetLocalFlags( 1 );
newZone->HatchBorder(); newZone->HatchBorder();
newZone->UnFill(); newZone->UnFill();
@ -273,8 +273,8 @@ bool ZONE_CREATE_HELPER::OnFirstPoint( POLYGON_GEOM_MANAGER& aMgr )
m_tool.GetManager()->RunAction( ACTIONS::selectionClear ); m_tool.GetManager()->RunAction( ACTIONS::selectionClear );
// set up properties from zone // set up properties from zone
const auto& settings = *m_parentView.GetPainter()->GetSettings(); const RENDER_SETTINGS& settings = *m_parentView.GetPainter()->GetSettings();
COLOR4D color = settings.GetColor( nullptr, m_zone->GetFirstLayer() ); COLOR4D color = settings.GetColor( nullptr, m_zone->GetFirstLayer() );
m_previewItem.SetStrokeColor( COLOR4D::WHITE ); m_previewItem.SetStrokeColor( COLOR4D::WHITE );
m_previewItem.SetFillColor( color.WithAlpha( 0.2 ) ); m_previewItem.SetFillColor( color.WithAlpha( 0.2 ) );
@ -309,7 +309,7 @@ void ZONE_CREATE_HELPER::OnGeometryChange( const POLYGON_GEOM_MANAGER& aMgr )
void ZONE_CREATE_HELPER::OnComplete( const POLYGON_GEOM_MANAGER& aMgr ) void ZONE_CREATE_HELPER::OnComplete( const POLYGON_GEOM_MANAGER& aMgr )
{ {
auto& finalPoints = aMgr.GetLockedInPoints(); const SHAPE_LINE_CHAIN& finalPoints = aMgr.GetLockedInPoints();
if( finalPoints.PointCount() < 3 ) if( finalPoints.PointCount() < 3 )
{ {
@ -321,7 +321,7 @@ void ZONE_CREATE_HELPER::OnComplete( const POLYGON_GEOM_MANAGER& aMgr )
// if m_params.m_mode == DRAWING_TOOL::ZONE_MODE::CUTOUT, m_zone will be merged to the // if m_params.m_mode == DRAWING_TOOL::ZONE_MODE::CUTOUT, m_zone will be merged to the
// existing zone as a new hole. // existing zone as a new hole.
m_zone->Outline()->NewOutline(); m_zone->Outline()->NewOutline();
auto* outline = m_zone->Outline(); SHAPE_POLY_SET* outline = m_zone->Outline();
for( int i = 0; i < finalPoints.PointCount(); ++i ) for( int i = 0; i < finalPoints.PointCount(); ++i )
outline->Append( finalPoints.CPoint( i ) ); outline->Append( finalPoints.CPoint( i ) );
@ -331,10 +331,12 @@ void ZONE_CREATE_HELPER::OnComplete( const POLYGON_GEOM_MANAGER& aMgr )
if( aMgr.GetLeaderMode() == POLYGON_GEOM_MANAGER::LEADER_MODE::DEG45 ) if( aMgr.GetLeaderMode() == POLYGON_GEOM_MANAGER::LEADER_MODE::DEG45 )
{ {
const SHAPE_LINE_CHAIN leaderPts = aMgr.GetLeaderLinePoints(); const SHAPE_LINE_CHAIN leaderPts = aMgr.GetLeaderLinePoints();
for( int i = 1; i < leaderPts.PointCount(); i++ ) for( int i = 1; i < leaderPts.PointCount(); i++ )
outline->Append( leaderPts.CPoint( i ) ); outline->Append( leaderPts.CPoint( i ) );
const SHAPE_LINE_CHAIN loopPts = aMgr.GetLoopLinePoints(); const SHAPE_LINE_CHAIN loopPts = aMgr.GetLoopLinePoints();
for( int i = 1; i < loopPts.PointCount() - 1; i++ ) for( int i = 1; i < loopPts.PointCount() - 1; i++ )
outline->Append( loopPts.CPoint( i ) ); outline->Append( loopPts.CPoint( i ) );
} }