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

Refactor GAL dialog prompt for new zone settings 

Break a chunk of the new zone tool out into a separate function to keep
the code clear. When zone cutouts and similar zone tools are added,
they'll get the settings from existing zones.

This commit now used std::unique_ptr for the temporary zone item, which
simplifies handling of the ownership of that item.
pull/3/merge
John Beard 9 years ago
committed by Maciej Suminski
parent
1f9c483535
commit
d37586aeaf
2 changed files with 67 additions and 44 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. 100
      pcbnew/tools/drawing_tool.cpp
  2. 11
      pcbnew/tools/drawing_tool.h

100
pcbnew/tools/drawing_tool.cpp
View File

@ -1143,9 +1143,52 @@ bool DRAWING_TOOL::drawArc( DRAWSEGMENT*& aGraphic )
}
std::unique_ptr<ZONE_CONTAINER> DRAWING_TOOL::createNewZone(
bool aKeepout )
{
const auto& board = *getModel<BOARD>();
// Get the current default settings for zones
ZONE_SETTINGS zoneInfo = m_frame->GetZoneSettings();
zoneInfo.m_CurrentZone_Layer = m_frame->GetScreen()->m_Active_Layer;
zoneInfo.m_NetcodeSelection = board.GetHighLightNetCode();
zoneInfo.SetIsKeepout( aKeepout );
m_controls->SetAutoPan( true );
m_controls->CaptureCursor( true );
// Show options dialog
ZONE_EDIT_T dialogResult;
if( aKeepout )
dialogResult = InvokeKeepoutAreaEditor( m_frame, &zoneInfo );
else
{
if( IsCopperLayer( zoneInfo.m_CurrentZone_Layer ) )
dialogResult = InvokeCopperZonesEditor( m_frame, &zoneInfo );
else
dialogResult = InvokeNonCopperZonesEditor( m_frame, NULL, &zoneInfo );
}
if( dialogResult == ZONE_ABORT )
{
m_controls->SetAutoPan( false );
m_controls->CaptureCursor( false );
return nullptr;
}
auto newZone = std::make_unique<ZONE_CONTAINER>( m_board );
// Apply the selected settings
zoneInfo.ExportSetting( *newZone );
return newZone;
}
int DRAWING_TOOL::drawZone( bool aKeepout )
{
ZONE_CONTAINER* zone = NULL;
std::unique_ptr<ZONE_CONTAINER> zone;
DRAWSEGMENT line45;
DRAWSEGMENT* helperLine = NULL; // we will need more than one helper line
BOARD_COMMIT commit( m_frame );
@ -1192,8 +1235,7 @@ int DRAWING_TOOL::drawZone( bool aKeepout )
{
if( numPoints > 0 ) // cancel the current zone
{
delete zone;
zone = NULL;
zone = nullptr;
m_controls->SetAutoPan( false );
m_controls->CaptureCursor( false );
@ -1235,19 +1277,16 @@ int DRAWING_TOOL::drawZone( bool aKeepout )
zone->Outline()->RemoveNullSegments();
if( !aKeepout )
static_cast<PCB_EDIT_FRAME*>( m_frame )->Fill_Zone( zone );
static_cast<PCB_EDIT_FRAME*>( m_frame )->Fill_Zone( zone.get() );
commit.Add( zone );
commit.Add( zone.release() );
commit.Push( _( "Draw a zone" ) );
zone = NULL;
}
else
{
delete zone;
zone = NULL;
}
// if kept, this was released. if still not null,
// this zone is now unwanted and can be removed
zone = nullptr;
numPoints = 0;
m_controls->SetAutoPan( false );
m_controls->CaptureCursor( false );
@ -1265,44 +1304,17 @@ int DRAWING_TOOL::drawZone( bool aKeepout )
{
if( numPoints == 0 ) // it's the first click
{
const auto& board = *getModel<BOARD>();
// Get the current default settings for zones
ZONE_SETTINGS zoneInfo = m_frame->GetZoneSettings();
zoneInfo.m_CurrentZone_Layer = m_frame->GetScreen()->m_Active_Layer;
zoneInfo.m_NetcodeSelection = board.GetHighLightNetCode();
zoneInfo.SetIsKeepout( aKeepout );
m_controls->SetAutoPan( true );
m_controls->CaptureCursor( true );
// Show options dialog
ZONE_EDIT_T dialogResult;
if( aKeepout )
dialogResult = InvokeKeepoutAreaEditor( m_frame, &zoneInfo );
else
{
if( IsCopperLayer( zoneInfo.m_CurrentZone_Layer ) )
dialogResult = InvokeCopperZonesEditor( m_frame, &zoneInfo );
else
dialogResult = InvokeNonCopperZonesEditor( m_frame, NULL, &zoneInfo );
}
zone = createNewZone( aKeepout );
if( dialogResult == ZONE_ABORT )
if( !zone )
{
m_controls->SetAutoPan( false );
m_controls->CaptureCursor( false );
continue;
}
// Apply the selected settings
zone = new ZONE_CONTAINER( m_board );
zoneInfo.ExportSetting( *zone );
m_frame->GetGalCanvas()->SetTopLayer( zoneInfo.m_CurrentZone_Layer );
m_frame->GetGalCanvas()->SetTopLayer( zone->GetLayer() );
// Add the first point
zone->Outline()->Start( zoneInfo.m_CurrentZone_Layer,
zone->Outline()->Start( zone->GetLayer(),
cursorPos.x, cursorPos.y,
zone->GetHatchStyle() );
origin = cursorPos;
@ -1311,7 +1323,7 @@ int DRAWING_TOOL::drawZone( bool aKeepout )
helperLine = new DRAWSEGMENT;
helperLine->SetShape( S_SEGMENT );
helperLine->SetWidth( 1 );
helperLine->SetLayer( zoneInfo.m_CurrentZone_Layer );
helperLine->SetLayer( zone->GetLayer() );
helperLine->SetStart( wxPoint( cursorPos.x, cursorPos.y ) );
helperLine->SetEnd( wxPoint( cursorPos.x, cursorPos.y ) );
line45 = *helperLine;

11
pcbnew/tools/drawing_tool.h
View File

@ -184,6 +184,17 @@ private:
///> @param aKeepout decides if the drawn polygon is a zone or a keepout area.
int drawZone( bool aKeepout );
/**
* Function createNewZone()
*
* Prompt the user for new zone settings, and create a new zone with
* those settings
*
* @param aKeepout should the zone be a keepout
* @return the new zone, can be null if the user aborted
*/
std::unique_ptr<ZONE_CONTAINER> createNewZone( bool aKeepout );
/**
* Function make45DegLine()
* Forces a DRAWSEGMENT to be drawn at multiple of 45 degrees. The origin stays the same,

Write Preview
Loading…
Cancel
Save