Code formatting
This commit is contained in:
parent
728349ea12
commit
95794df088
|
@ -254,7 +254,7 @@ int DRAWING_TOOL::PlaceText( const TOOL_EVENT& aEvent )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else if ( evt->IsClick( BUT_RIGHT ) )
|
else if( evt->IsClick( BUT_RIGHT ) )
|
||||||
{
|
{
|
||||||
m_menu.ShowContextMenu();
|
m_menu.ShowContextMenu();
|
||||||
}
|
}
|
||||||
|
@ -429,7 +429,7 @@ int DRAWING_TOOL::DrawDimension( const TOOL_EVENT& aEvent )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else if ( evt->IsClick( BUT_RIGHT ) )
|
else if( evt->IsClick( BUT_RIGHT ) )
|
||||||
{
|
{
|
||||||
m_menu.ShowContextMenu();
|
m_menu.ShowContextMenu();
|
||||||
}
|
}
|
||||||
|
@ -659,7 +659,7 @@ int DRAWING_TOOL::PlaceDXF( const TOOL_EVENT& aEvent )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else if ( evt->IsClick( BUT_RIGHT ) )
|
else if( evt->IsClick( BUT_RIGHT ) )
|
||||||
{
|
{
|
||||||
m_menu.ShowContextMenu();
|
m_menu.ShowContextMenu();
|
||||||
}
|
}
|
||||||
|
@ -796,7 +796,7 @@ int DRAWING_TOOL::SetAnchor( const TOOL_EVENT& aEvent )
|
||||||
// so deselect the active tool
|
// so deselect the active tool
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if ( evt->IsClick( BUT_RIGHT ) )
|
else if( evt->IsClick( BUT_RIGHT ) )
|
||||||
{
|
{
|
||||||
m_menu.ShowContextMenu();
|
m_menu.ShowContextMenu();
|
||||||
}
|
}
|
||||||
|
@ -1218,8 +1218,7 @@ std::unique_ptr<ZONE_CONTAINER> DRAWING_TOOL::createZoneFromExisting(
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool DRAWING_TOOL::getSourceZoneForAction( ZONE_MODE aMode,
|
bool DRAWING_TOOL::getSourceZoneForAction( ZONE_MODE aMode, ZONE_CONTAINER*& aZone )
|
||||||
ZONE_CONTAINER*& aZone )
|
|
||||||
{
|
{
|
||||||
aZone = nullptr;
|
aZone = nullptr;
|
||||||
|
|
||||||
|
@ -1247,13 +1246,12 @@ bool DRAWING_TOOL::getSourceZoneForAction( ZONE_MODE aMode,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void DRAWING_TOOL::performZoneCutout( ZONE_CONTAINER& aExistingZone,
|
void DRAWING_TOOL::performZoneCutout( ZONE_CONTAINER& aExistingZone, ZONE_CONTAINER& aCutout )
|
||||||
ZONE_CONTAINER& cutout )
|
|
||||||
{
|
{
|
||||||
// Copy cutout corners into existing zone
|
// Copy cutout corners into existing zone
|
||||||
for( int ii = 0; ii < cutout.GetNumCorners(); ii++ )
|
for( int ii = 0; ii < aCutout.GetNumCorners(); ii++ )
|
||||||
{
|
{
|
||||||
aExistingZone.AppendCorner( cutout.GetCornerPosition( ii ) );
|
aExistingZone.AppendCorner( aCutout.GetCornerPosition( ii ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close the current corner list
|
// Close the current corner list
|
||||||
|
@ -1374,7 +1372,7 @@ int DRAWING_TOOL::drawZone( bool aKeepout, ZONE_MODE aMode )
|
||||||
if( !aKeepout )
|
if( !aKeepout )
|
||||||
static_cast<PCB_EDIT_FRAME*>( m_frame )->Fill_Zone( zone.get() );
|
static_cast<PCB_EDIT_FRAME*>( m_frame )->Fill_Zone( zone.get() );
|
||||||
|
|
||||||
if ( aMode == ZONE_MODE::CUTOUT )
|
if( aMode == ZONE_MODE::CUTOUT )
|
||||||
{
|
{
|
||||||
// For cutouts, subtract from the source
|
// For cutouts, subtract from the source
|
||||||
commit.Modify( sourceZone );
|
commit.Modify( sourceZone );
|
||||||
|
|
|
@ -234,8 +234,7 @@ private:
|
||||||
* @param aSrcZone the zone to copy settings from
|
* @param aSrcZone the zone to copy settings from
|
||||||
* @return the new zone
|
* @return the new zone
|
||||||
*/
|
*/
|
||||||
std::unique_ptr<ZONE_CONTAINER> createZoneFromExisting(
|
std::unique_ptr<ZONE_CONTAINER> createZoneFromExisting( const ZONE_CONTAINER& aSrcZone );
|
||||||
const ZONE_CONTAINER& aSrcZone );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function getSourceZoneForAction()
|
* Function getSourceZoneForAction()
|
||||||
|
@ -261,8 +260,7 @@ private:
|
||||||
* @param aExistingZone the zone to removed area from
|
* @param aExistingZone the zone to removed area from
|
||||||
* @param aCutout the area to remove
|
* @param aCutout the area to remove
|
||||||
*/
|
*/
|
||||||
void performZoneCutout( ZONE_CONTAINER& aExistingZone,
|
void performZoneCutout( ZONE_CONTAINER& aExistingZone, ZONE_CONTAINER& aCutout );
|
||||||
ZONE_CONTAINER& cutout );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function make45DegLine()
|
* Function make45DegLine()
|
||||||
|
|
|
@ -94,9 +94,9 @@ private:
|
||||||
&& SELECTION_CONDITIONS::OnlyType( PCB_ZONE_AREA_T )
|
&& SELECTION_CONDITIONS::OnlyType( PCB_ZONE_AREA_T )
|
||||||
)( selTool->GetSelection() );
|
)( selTool->GetSelection() );
|
||||||
|
|
||||||
Enable( getMenuId( COMMON_ACTIONS::zoneDuplicate), singleZoneActionsEnabled );
|
Enable( getMenuId( COMMON_ACTIONS::zoneDuplicate ), singleZoneActionsEnabled );
|
||||||
Enable( getMenuId( COMMON_ACTIONS::drawZoneCutout), singleZoneActionsEnabled );
|
Enable( getMenuId( COMMON_ACTIONS::drawZoneCutout ), singleZoneActionsEnabled );
|
||||||
Enable( getMenuId( COMMON_ACTIONS::drawSimilarZone), singleZoneActionsEnabled );
|
Enable( getMenuId( COMMON_ACTIONS::drawSimilarZone ), singleZoneActionsEnabled );
|
||||||
|
|
||||||
// enable zone actions that ably to a specific set of zones (as opposed to all of them)
|
// enable zone actions that ably to a specific set of zones (as opposed to all of them)
|
||||||
bool nonGlobalActionsEnabled = ( SELECTION_CONDITIONS::MoreThan( 0 ) )( selTool->GetSelection() );
|
bool nonGlobalActionsEnabled = ( SELECTION_CONDITIONS::MoreThan( 0 ) )( selTool->GetSelection() );
|
||||||
|
|
Loading…
Reference in New Issue