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

Formatting.

Browse Source
This commit is contained in:
Jeff Young 2025-07-29 11:32:54 +01:00
parent ff5a309386
commit 0128fb2eaf
3 changed files with 140 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcbnew/dialogs/dialog_position_relative.cpp
View File

@ -263,10 +263,9 @@ void DIALOG_POSITION_RELATIVE::updateAnchorInfo( const BOARD_ITEM* aItem )
}
case ANCHOR_POINT:
m_referenceInfo->SetLabel( wxString::Format(
_( "Reference location: selected point (%s, %s)" ),
m_parentFrame->MessageTextFromValue( m_anchorItemPosition.x ),
m_parentFrame->MessageTextFromValue( m_anchorItemPosition.y ) ) );
m_referenceInfo->SetLabel( wxString::Format( _( "Reference location: selected point (%s, %s)" ),
m_parentFrame->MessageTextFromValue( m_anchorItemPosition.x ),
m_parentFrame->MessageTextFromValue( m_anchorItemPosition.y ) ) );
break;
}
}

165
pcbnew/tools/multichannel_tool.cpp
View File

@ -81,10 +81,11 @@ bool MULTICHANNEL_TOOL::identifyComponentsInRuleArea( ZONE* aRul
PCBEXPR_UCODE ucode;
PCBEXPR_CONTEXT ctx, preflightCtx;
auto reportError = [&]( const wxString& aMessage, int aOffset )
{
wxLogTrace( traceMultichannelTool, wxT( "ERROR: %s"), aMessage );
};
auto reportError =
[&]( const wxString& aMessage, int aOffset )
{
wxLogTrace( traceMultichannelTool, wxT( "ERROR: %s"), aMessage );
};
ctx.SetErrorCallback( reportError );
preflightCtx.SetErrorCallback( reportError );
@ -111,18 +112,18 @@ bool MULTICHANNEL_TOOL::identifyComponentsInRuleArea( ZONE* aRul
auto ok = compiler.Compile( ruleText, &ucode, &preflightCtx );
if( !ok )
{
return false;
}
for( FOOTPRINT* fp : board()->Footprints() )
{
ctx.SetItems( fp, fp );
auto val = ucode.Run( &ctx );
LIBEVAL::VALUE* val = ucode.Run( &ctx );
if( val->AsDouble() != 0.0 )
{
wxLogTrace( traceMultichannelTool, wxT( " - %s [sheet %s]" ), fp->GetReference(),
fp->GetSheetname() );
wxLogTrace( traceMultichannelTool, wxT( " - %s [sheet %s]" ),
fp->GetReference(),
fp->GetSheetname() );
aComponents.insert( fp );
}
@ -140,10 +141,11 @@ bool MULTICHANNEL_TOOL::findOtherItemsInRuleArea( ZONE* aRuleArea, std::set<BOAR
PCBEXPR_UCODE ucode;
PCBEXPR_CONTEXT ctx, preflightCtx;
auto reportError = [&]( const wxString& aMessage, int aOffset )
{
wxLogTrace( traceMultichannelTool, wxT( "ERROR: %s"), aMessage );
};
auto reportError =
[&]( const wxString& aMessage, int aOffset )
{
wxLogTrace( traceMultichannelTool, wxT( "ERROR: %s"), aMessage );
};
ctx.SetErrorCallback( reportError );
preflightCtx.SetErrorCallback( reportError );
@ -168,14 +170,14 @@ bool MULTICHANNEL_TOOL::findOtherItemsInRuleArea( ZONE* aRuleArea, std::set<BOAR
}
auto testAndAdd =
[&]( BOARD_ITEM* aItem )
{
ctx.SetItems( aItem, aItem );
auto val = ucode.Run( &ctx );
[&]( BOARD_ITEM* aItem )
{
ctx.SetItems( aItem, aItem );
auto val = ucode.Run( &ctx );
if( val->AsDouble() != 0.0 )
aItems.insert( aItem );
};
if( val->AsDouble() != 0.0 )
aItems.insert( aItem );
};
for( ZONE* zone : board()->Zones() )
{
@ -199,7 +201,7 @@ bool MULTICHANNEL_TOOL::findOtherItemsInRuleArea( ZONE* aRuleArea, std::set<BOAR
if( aItem->IsType( { PCB_ZONE_T, PCB_SHAPE_T, PCB_DIMENSION_T } ) )
{
ctx.SetItems( aItem, aItem );
auto val = ucode.Run( &ctx );
LIBEVAL::VALUE* val = ucode.Run( &ctx );
if( val->AsDouble() == 0.0 )
addGroup = false;
@ -221,19 +223,18 @@ bool MULTICHANNEL_TOOL::findOtherItemsInRuleArea( ZONE* aRuleArea, std::set<BOAR
std::set<FOOTPRINT*> MULTICHANNEL_TOOL::queryComponentsInSheet( wxString aSheetName ) const
{
std::set<FOOTPRINT*> rv;
if( aSheetName.EndsWith( wxT( "/" ) ) )
aSheetName.RemoveLast();
for( auto& fp : board()->Footprints() )
for( FOOTPRINT* fp : board()->Footprints() )
{
auto sn = fp->GetSheetname();
if( sn.EndsWith( wxT( "/" ) ) )
sn.RemoveLast();
if( sn == aSheetName )
{
rv.insert( fp );
}
}
return rv;
@ -245,7 +246,7 @@ MULTICHANNEL_TOOL::queryComponentsInComponentClass( const wxString& aComponentCl
{
std::set<FOOTPRINT*> rv;
for( auto& fp : board()->Footprints() )
for( FOOTPRINT* fp : board()->Footprints() )
{
if( fp->GetComponentClass()->ContainsClassName( aComponentClassName ) )
rv.insert( fp );
@ -255,12 +256,11 @@ MULTICHANNEL_TOOL::queryComponentsInComponentClass( const wxString& aComponentCl
}
std::set<FOOTPRINT*>
MULTICHANNEL_TOOL::queryComponentsInGroup( const wxString& aGroupName ) const
std::set<FOOTPRINT*> MULTICHANNEL_TOOL::queryComponentsInGroup( const wxString& aGroupName ) const
{
std::set<FOOTPRINT*> rv;
for( auto& group : board()->Groups() )
for( PCB_GROUP* group : board()->Groups() )
{
if( group->GetName() == aGroupName )
{
@ -282,7 +282,7 @@ const SHAPE_LINE_CHAIN MULTICHANNEL_TOOL::buildRAOutline( std::set<FOOTPRINT*>&
std::vector<VECTOR2I> bbCorners;
bbCorners.reserve( aFootprints.size() * 4 );
for( auto fp : aFootprints )
for( FOOTPRINT* fp : aFootprints )
{
const BOX2I bb = fp->GetBoundingBox( false ).GetInflated( aMargin );
KIGEOM::CollectBoxCorners( bb, bbCorners );
@ -332,7 +332,9 @@ void MULTICHANNEL_TOOL::QuerySheetsAndComponentClasses()
m_areas.m_areas.push_back( ent );
wxLogTrace( traceMultichannelTool, wxT("found sheet '%s' @ '%s' s %d\n"),
ent.m_sheetName, ent.m_sheetPath, (int)m_areas.m_areas.size() );
ent.m_sheetName,
ent.m_sheetPath,
(int) m_areas.m_areas.size() );
}
for( const wxString& compClass : uniqueComponentClasses )
@ -346,7 +348,8 @@ void MULTICHANNEL_TOOL::QuerySheetsAndComponentClasses()
m_areas.m_areas.push_back( ent );
wxLogTrace( traceMultichannelTool, wxT( "found component class '%s' s %d\n" ),
ent.m_componentClass, static_cast<int>( m_areas.m_areas.size() ) );
ent.m_componentClass,
static_cast<int>( m_areas.m_areas.size() ) );
}
for( const wxString& groupName : uniqueGroups )
@ -360,7 +363,8 @@ void MULTICHANNEL_TOOL::QuerySheetsAndComponentClasses()
m_areas.m_areas.push_back( ent );
wxLogTrace( traceMultichannelTool, wxT( "found group '%s' s %d\n" ),
ent.m_componentClass, static_cast<int>( m_areas.m_areas.size() ) );
ent.m_componentClass,
static_cast<int>( m_areas.m_areas.size() ) );
}
}
@ -373,6 +377,7 @@ void MULTICHANNEL_TOOL::FindExistingRuleAreas()
{
if( !zone->GetIsRuleArea() )
continue;
if( !zone->GetPlacementAreaEnabled() )
continue;
@ -387,7 +392,9 @@ void MULTICHANNEL_TOOL::FindExistingRuleAreas()
area.m_center = zone->Outline()->COutline( 0 ).Centre();
m_areas.m_areas.push_back( area );
wxLogTrace( traceMultichannelTool, wxT("RA '%s', %d footprints\n"), area.m_ruleName, (int) area.m_raFootprints.size() );
wxLogTrace( traceMultichannelTool, wxT("RA '%s', %d footprints\n"),
area.m_ruleName,
(int) area.m_raFootprints.size() );
}
wxLogTrace( traceMultichannelTool, wxT("Total RAs found: %d\n"), (int) m_areas.m_areas.size() );
@ -416,21 +423,22 @@ int MULTICHANNEL_TOOL::repeatLayout( const TOOL_EVENT& aEvent )
{
std::vector<ZONE*> refRAs;
auto isSelectedItemAnRA = []( EDA_ITEM* aItem ) -> ZONE*
{
if( !aItem || aItem->Type() != PCB_ZONE_T )
return nullptr;
auto isSelectedItemAnRA =
[]( EDA_ITEM* aItem ) -> ZONE*
{
if( !aItem || aItem->Type() != PCB_ZONE_T )
return nullptr;
ZONE* zone = static_cast<ZONE*>( aItem );
ZONE* zone = static_cast<ZONE*>( aItem );
if( !zone->GetIsRuleArea() )
return nullptr;
if( !zone->GetIsRuleArea() )
return nullptr;
if( !zone->GetPlacementAreaEnabled() )
return nullptr;
if( !zone->GetPlacementAreaEnabled() )
return nullptr;
return zone;
};
return zone;
};
for( EDA_ITEM* item : selection() )
{
@ -445,9 +453,7 @@ int MULTICHANNEL_TOOL::repeatLayout( const TOOL_EVENT& aEvent )
for( EDA_ITEM* grpItem : group->GetItems() )
{
if( auto grpZone = isSelectedItemAnRA( grpItem ) )
{
refRAs.push_back( grpZone );
}
}
}
}
@ -476,8 +482,7 @@ int MULTICHANNEL_TOOL::repeatLayout( const TOOL_EVENT& aEvent )
if( m_areas.m_areas.size() <= 1 )
{
frame()->ShowInfoBarError( _( "No Rule Areas to repeat layout to have been found." ),
true );
frame()->ShowInfoBarError( _( "No Rule Areas to repeat layout to have been found." ), true );
return 0;
}
@ -583,10 +588,7 @@ int MULTICHANNEL_TOOL::RepeatLayout( const TOOL_EVENT& aEvent, ZONE* aRefZone )
commit.Push( _( "Repeat layout" ) );
if( Pgm().IsGUI() )
{
frame()->ShowInfoBarMsg( wxString::Format( _( "Copied to %d Rule Areas." ), totalCopied ),
true );
}
frame()->ShowInfoBarMsg( wxString::Format( _( "Copied to %d Rule Areas." ), totalCopied ), true );
return 0;
}
@ -602,6 +604,7 @@ wxString MULTICHANNEL_TOOL::stripComponentIndex( const wxString& aRef ) const
{
if( !k.IsAscii() )
break;
char c;
k.GetAsChar( &c );
@ -647,24 +650,23 @@ int MULTICHANNEL_TOOL::findRouting( std::set<BOARD_CONNECTED_ITEM*>&
aRA->m_area->SetZoneName( aRA->m_area->m_Uuid.AsString() );
}
wxString ruleText = wxString::Format( wxT( "A.enclosedByArea('%s')" ),
aRA->m_area->GetZoneName() );
wxString ruleText = wxString::Format( wxT( "A.enclosedByArea('%s')" ), aRA->m_area->GetZoneName() );
auto testAndAdd =
[&]( BOARD_CONNECTED_ITEM* aItem )
{
if( aOutput.contains( aItem ) )
return;
ctx.SetItems( aItem, aItem );
auto val = ucode.Run( &ctx );
if( val->AsDouble() != 0.0 )
[&]( BOARD_CONNECTED_ITEM* aItem )
{
aOutput.insert( aItem );
count++;
}
};
if( aOutput.contains( aItem ) )
return;
ctx.SetItems( aItem, aItem );
LIBEVAL::VALUE* val = ucode.Run( &ctx );
if( val->AsDouble() != 0.0 )
{
aOutput.insert( aItem );
count++;
}
};
if( compiler.Compile( ruleText, &ucode, &preflightCtx ) )
{
@ -691,6 +693,7 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
FOOTPRINT* targetAnchorFp = nullptr;
VECTOR2I disp = aTargetArea->m_center - aRefArea->m_center;
EDA_ANGLE rot = EDA_ANGLE( 0 );
if( aOpts.m_anchorFp )
{
for( auto& fpPair : aMatches )
@ -804,8 +807,7 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
for( BOARD_ITEM* item : targetItems )
{
if( item->Type() == PCB_TEXT_T && item->GetParent()
&& item->GetParent()->Type() == PCB_FOOTPRINT_T )
if( item->Type() == PCB_TEXT_T && item->GetParent() && item->GetParent()->Type() == PCB_FOOTPRINT_T )
continue;
if( item->IsLocked() && !aOpts.m_includeLockedItems )
@ -847,8 +849,7 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
for( BOARD_ITEM* item : sourceItems )
{
if( item->Type() == PCB_TEXT_T && item->GetParent()
&& item->GetParent()->Type() == PCB_FOOTPRINT_T )
if( item->Type() == PCB_TEXT_T && item->GetParent() && item->GetParent()->Type() == PCB_FOOTPRINT_T )
continue;
if( item->IsLocked() && !aOpts.m_includeLockedItems )
@ -860,17 +861,14 @@ bool MULTICHANNEL_TOOL::copyRuleAreaContents( TMATCH::COMPONENT_MATCHES& aMatche
{
if( !aRefArea->m_area->GetLayerSet().Contains( item->GetLayer() ) )
continue;
if( !aTargetArea->m_area->GetLayerSet().Contains( item->GetLayer() ) )
continue;
if( item->Type() == PCB_GROUP_T )
{
copied = static_cast<PCB_GROUP*>( item )->DeepClone();
}
else
{
copied = static_cast<BOARD_ITEM*>( item->Clone() );
}
}
else
{
@ -981,8 +979,8 @@ void MULTICHANNEL_TOOL::fixupNet( BOARD_CONNECTED_ITEM* aRef, BOARD_CONNECTED_IT
TMATCH::COMPONENT_MATCHES& aComponentMatches )
{
auto connectivity = board()->GetConnectivity();
const std::vector<BOARD_CONNECTED_ITEM*> refConnectedPads =
connectivity->GetNetItems( aRef->GetNetCode(), { PCB_PAD_T } );
const std::vector<BOARD_CONNECTED_ITEM*> refConnectedPads = connectivity->GetNetItems( aRef->GetNetCode(),
{ PCB_PAD_T } );
for( const BOARD_CONNECTED_ITEM* refConItem : refConnectedPads )
{
@ -1014,8 +1012,8 @@ bool MULTICHANNEL_TOOL::resolveConnectionTopology( RULE_AREA* aRefArea, RULE_ARE
{
using namespace TMATCH;
std::unique_ptr<CONNECTION_GRAPH> cgRef ( CONNECTION_GRAPH::BuildFromFootprintSet( aRefArea->m_raFootprints ) );
std::unique_ptr<CONNECTION_GRAPH> cgTarget ( CONNECTION_GRAPH::BuildFromFootprintSet( aTargetArea->m_raFootprints ) );
std::unique_ptr<CONNECTION_GRAPH> cgRef( CONNECTION_GRAPH::BuildFromFootprintSet( aRefArea->m_raFootprints ) );
std::unique_ptr<CONNECTION_GRAPH> cgTarget( CONNECTION_GRAPH::BuildFromFootprintSet( aTargetArea->m_raFootprints ) );
auto status = cgRef->FindIsomorphism( cgTarget.get(), aMatches.m_matchingComponents );
@ -1109,6 +1107,7 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
{
if( !zone->GetIsRuleArea() )
continue;
if( !zone->GetPlacementAreaEnabled() )
continue;
@ -1174,7 +1173,8 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
newZone->SetZoneName( wxString::Format( wxT( "auto-placement-area-%s" ), ra.m_groupName ) );
wxLogTrace( traceMultichannelTool, wxT( "Generated rule area '%s' (%d components)\n" ),
newZone->GetZoneName(), (int) ra.m_components.size() );
newZone->GetZoneName(),
(int) ra.m_components.size() );
newZone->SetIsRuleArea( true );
newZone->SetLayerSet( LSET::AllCuMask() );
@ -1205,9 +1205,7 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
newZone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
if( ra.m_existsAlready )
{
commit.Remove( ra.m_oldArea );
}
ra.m_area = newZone.release();
commit.Add( ra.m_area );
@ -1228,8 +1226,7 @@ int MULTICHANNEL_TOOL::AutogenerateRuleAreas( const TOOL_EVENT& aEvent )
std::unordered_set<BOARD_ITEM*> toPrune;
std::copy( ra.m_components.begin(), ra.m_components.end(),
std::inserter( toPrune, toPrune.begin() ) );
std::copy( ra.m_components.begin(), ra.m_components.end(), std::inserter( toPrune, toPrune.begin() ) );
if( ra.m_existsAlready )
toPrune.insert( ra.m_area );

132
pcbnew/widgets/appearance_controls.cpp
View File

@ -402,8 +402,7 @@ LAYER_PRESET APPEARANCE_CONTROLS::presetBackAssembly( _HKI( "Back Assembly View"
LAYER_PRESET APPEARANCE_CONTROLS::m_lastBuiltinPreset;
APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFocusOwner,
bool aFpEditorMode ) :
APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFocusOwner, bool aFpEditorMode ) :
APPEARANCE_CONTROLS_BASE( aParent ),
m_frame( aParent ),
m_focusOwner( aFocusOwner ),
@ -417,10 +416,9 @@ APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFo
// Correct the min size from wxformbuilder not using fromdip
SetMinSize( FromDIP( GetMinSize() ) );
int screenHeight = wxSystemSettings::GetMetric( wxSYS_SCREEN_Y );
m_iconProvider = new ROW_ICON_PROVIDER( KIUI::c_IndicatorSizeDIP, this );
m_pointSize = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ).GetPointSize();
int screenHeight = wxSystemSettings::GetMetric( wxSYS_SCREEN_Y );
m_iconProvider = new ROW_ICON_PROVIDER( KIUI::c_IndicatorSizeDIP, this );
m_pointSize = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ).GetPointSize();
m_layerPanelColour = m_panelLayers->GetBackgroundColour().ChangeLightness( 110 );
SetBorders( true, false, false, false );
@ -531,8 +529,8 @@ APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFo
syncLayerPresetSelection();
} );
m_toggleGridRenderer = new GRID_BITMAP_TOGGLE_RENDERER(
KiBitmapBundle( BITMAPS::visibility ), KiBitmapBundle( BITMAPS::visibility_off ) );
m_toggleGridRenderer = new GRID_BITMAP_TOGGLE_RENDERER( KiBitmapBundle( BITMAPS::visibility ),
KiBitmapBundle( BITMAPS::visibility_off ) );
m_netsGrid->RegisterDataType( wxT( "bool" ), m_toggleGridRenderer, new wxGridCellBoolEditor );
@ -564,12 +562,10 @@ APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFo
m_netsGrid->SetDefaultCellFont( font );
m_netsGrid->SetDefaultRowSize( font.GetPixelSize().y + rowHeightPadding );
m_netsGrid->GetGridWindow()->Bind( wxEVT_MOTION, &APPEARANCE_CONTROLS::OnNetGridMouseEvent,
this );
m_netsGrid->GetGridWindow()->Bind( wxEVT_MOTION, &APPEARANCE_CONTROLS::OnNetGridMouseEvent, this );
// To handle middle click on color swatches
m_netsGrid->GetGridWindow()->Bind( wxEVT_MIDDLE_UP, &APPEARANCE_CONTROLS::OnNetGridMouseEvent,
this );
m_netsGrid->GetGridWindow()->Bind( wxEVT_MIDDLE_UP, &APPEARANCE_CONTROLS::OnNetGridMouseEvent, this );
m_netsGrid->ShowScrollbars( wxSHOW_SB_NEVER, wxSHOW_SB_DEFAULT );
m_netclassScrolledWindow->ShowScrollbars( wxSHOW_SB_NEVER, wxSHOW_SB_DEFAULT );
@ -986,14 +982,9 @@ void APPEARANCE_CONTROLS::OnNetGridMouseEvent( wxMouseEvent& aEvent )
wxString tip;
if( cell.GetCol() == NET_GRID_TABLE::COL_VISIBILITY )
{
tip.Printf( showOrHide, name );
}
else if( cell.GetCol() == NET_GRID_TABLE::COL_COLOR )
{
tip = _( "Double click (or middle click) to change color; "
"right click for more actions" );
}
tip = _( "Double click (or middle click) to change color; right click for more actions" );
m_netsGrid->GetGridWindow()->SetToolTip( tip );
}
@ -1468,9 +1459,14 @@ void APPEARANCE_CONTROLS::loadDefaultLayerPresets()
m_layerPresets.clear();
// Load the read-only defaults
for( const LAYER_PRESET& preset :
{ presetAllLayers, presetNoLayers, presetAllCopper, presetInnerCopper, presetFront,
presetFrontAssembly, presetBack, presetBackAssembly } )
for( const LAYER_PRESET& preset : { presetAllLayers,
presetNoLayers,
presetAllCopper,
presetInnerCopper,
presetFront,
presetFrontAssembly,
presetBack,
presetBackAssembly } )
{
m_layerPresets[preset.name] = preset;
m_layerPresets[preset.name].readOnly = true;
@ -1579,14 +1575,11 @@ void APPEARANCE_CONTROLS::rebuildLayers()
// TODO(JE) consider restyling this indicator
INDICATOR_ICON* indicator = new INDICATOR_ICON( panel, *m_iconProvider,
ROW_ICON_PROVIDER::STATE::OFF,
layer );
ROW_ICON_PROVIDER::STATE::OFF, layer );
COLOR_SWATCH* swatch = new COLOR_SWATCH( panel, COLOR4D::UNSPECIFIED, layer,
bgColor, theme->GetColor( layer ),
SWATCH_SMALL );
swatch->SetToolTip( _( "Double click or middle click for color change, "
"right click for menu" ) );
COLOR_SWATCH* swatch = new COLOR_SWATCH( panel, COLOR4D::UNSPECIFIED, layer, bgColor,
theme->GetColor( layer ), SWATCH_SMALL );
swatch->SetToolTip( _( "Double click or middle click for color change, right click for menu" ) );
BITMAP_TOGGLE* btn_visible = new BITMAP_TOGGLE( panel, layer,
KiBitmapBundle( BITMAPS::visibility ),
@ -1884,17 +1877,15 @@ void APPEARANCE_CONTROLS::rebuildLayerContextMenu()
m_layerContextMenu->AppendSeparator();
KIUI::AddMenuItem( m_layerContextMenu, ID_HIDE_ALL_BUT_ACTIVE,
_( "Hide All Layers But Active" ), KiBitmap( BITMAPS::select_w_layer ) );
KIUI::AddMenuItem( m_layerContextMenu, ID_HIDE_ALL_BUT_ACTIVE, _( "Hide All Layers But Active" ),
KiBitmap( BITMAPS::select_w_layer ) );
m_layerContextMenu->AppendSeparator();
KIUI::AddMenuItem( m_layerContextMenu, ID_SHOW_ALL_NON_COPPER,
_( "Show All Non Copper Layers" ),
KIUI::AddMenuItem( m_layerContextMenu, ID_SHOW_ALL_NON_COPPER, _( "Show All Non Copper Layers" ),
KiBitmap( BITMAPS::show_no_copper_layers ) );
KIUI::AddMenuItem( m_layerContextMenu, ID_HIDE_ALL_NON_COPPER,
_( "Hide All Non Copper Layers" ),
KIUI::AddMenuItem( m_layerContextMenu, ID_HIDE_ALL_NON_COPPER, _( "Hide All Non Copper Layers" ),
KiBitmap( BITMAPS::show_all_copper_layers ) );
m_layerContextMenu->AppendSeparator();
@ -1907,8 +1898,7 @@ void APPEARANCE_CONTROLS::rebuildLayerContextMenu()
m_layerContextMenu->AppendSeparator();
KIUI::AddMenuItem( m_layerContextMenu, ID_PRESET_FRONT_ASSEMBLY,
_( "Show Only Front Assembly Layers" ),
KIUI::AddMenuItem( m_layerContextMenu, ID_PRESET_FRONT_ASSEMBLY, _( "Show Only Front Assembly Layers" ),
KiBitmap( BITMAPS::show_front_assembly_layers ) );
KIUI::AddMenuItem( m_layerContextMenu, ID_PRESET_FRONT, _( "Show Only Front Layers" ),
@ -1917,16 +1907,14 @@ void APPEARANCE_CONTROLS::rebuildLayerContextMenu()
// Only show the internal layer option if internal layers are enabled
if( m_frame->GetBoard()->GetCopperLayerCount() > 2 )
{
KIUI::AddMenuItem( m_layerContextMenu, ID_PRESET_INNER_COPPER,
_( "Show Only Inner Layers" ),
KiBitmap( BITMAPS::show_all_copper_layers ) );
KIUI::AddMenuItem( m_layerContextMenu, ID_PRESET_INNER_COPPER, _( "Show Only Inner Layers" ),
KiBitmap( BITMAPS::show_all_copper_layers ) );
}
KIUI::AddMenuItem( m_layerContextMenu, ID_PRESET_BACK, _( "Show Only Back Layers" ),
KiBitmap( BITMAPS::show_all_back_layers ) );
KIUI::AddMenuItem( m_layerContextMenu, ID_PRESET_BACK_ASSEMBLY,
_( "Show Only Back Assembly Layers" ),
KIUI::AddMenuItem( m_layerContextMenu, ID_PRESET_BACK_ASSEMBLY, _( "Show Only Back Assembly Layers" ),
KiBitmap( BITMAPS::show_back_assembly_layers ) );
}
@ -2122,8 +2110,7 @@ void APPEARANCE_CONTROLS::onLayerVisibilityToggled( PCB_LAYER_ID aLayer )
}
void APPEARANCE_CONTROLS::onObjectVisibilityChanged( GAL_LAYER_ID aLayer, bool isVisible,
bool isFinal )
void APPEARANCE_CONTROLS::onObjectVisibilityChanged( GAL_LAYER_ID aLayer, bool isVisible, bool isFinal )
{
// Special-case controls
switch( aLayer )
@ -2206,8 +2193,7 @@ void APPEARANCE_CONTROLS::rebuildObjects()
int swatchWidth = m_windowObjects->ConvertDialogToPixels( wxSize( 8, 0 ) ).x;
int labelWidth = 0;
int btnWidth =
KiBitmapBundle( BITMAPS::visibility ).GetPreferredLogicalSizeFor( m_windowObjects ).x;
int btnWidth = KiBitmapBundle( BITMAPS::visibility ).GetPreferredLogicalSizeFor( m_windowObjects ).x;
m_objectSettings.clear();
m_objectsOuterSizer->Clear( true );
@ -2233,11 +2219,9 @@ void APPEARANCE_CONTROLS::rebuildObjects()
sizer->Add( swatch, 0, wxALIGN_CENTER_VERTICAL, 0 );
aSetting->ctl_color = swatch;
swatch->Bind( COLOR_SWATCH_CHANGED, &APPEARANCE_CONTROLS::OnColorSwatchChanged,
this );
swatch->Bind( COLOR_SWATCH_CHANGED, &APPEARANCE_CONTROLS::OnColorSwatchChanged, this );
swatch->SetReadOnlyCallback( std::bind( &APPEARANCE_CONTROLS::onReadOnlySwatch,
this ) );
swatch->SetReadOnlyCallback( std::bind( &APPEARANCE_CONTROLS::onReadOnlySwatch, this ) );
}
else
{
@ -2249,9 +2233,10 @@ void APPEARANCE_CONTROLS::rebuildObjects()
if( aSetting->can_control_visibility )
{
btn_visible = new BITMAP_TOGGLE(
m_windowObjects, layer, KiBitmapBundle( BITMAPS::visibility ),
KiBitmapBundle( BITMAPS::visibility_off ), aSetting->visible );
btn_visible = new BITMAP_TOGGLE( m_windowObjects, layer,
KiBitmapBundle( BITMAPS::visibility ),
KiBitmapBundle( BITMAPS::visibility_off ),
aSetting->visible );
tip.Printf( _( "Show or hide %s" ), aSetting->label.Lower() );
btn_visible->SetToolTip( tip );
@ -2295,8 +2280,7 @@ void APPEARANCE_CONTROLS::rebuildObjects()
#endif
wxSlider* slider = new wxSlider( m_windowObjects, wxID_ANY, 100, 0, 100,
wxDefaultPosition, wxDefaultSize,
wxSL_HORIZONTAL );
wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL );
#ifdef __WXMAC__
slider->SetMinSize( wxSize( 80, 16 ) );
#else
@ -2425,9 +2409,9 @@ void APPEARANCE_CONTROLS::buildNetClassMenu( wxMenu& aMenu, bool isDefaultClass,
aMenu.Append( new wxMenuItem( &aMenu, ID_SET_NET_COLOR, _( "Set Netclass Color" ),
wxEmptyString, wxITEM_NORMAL ) );
wxMenuItem* schematicColor =
new wxMenuItem( &aMenu, ID_USE_SCHEMATIC_NET_COLOR, _( "Use Color from Schematic" ),
wxEmptyString, wxITEM_NORMAL );
wxMenuItem* schematicColor = new wxMenuItem( &aMenu, ID_USE_SCHEMATIC_NET_COLOR,
_( "Use Color from Schematic" ),
wxEmptyString, wxITEM_NORMAL );
std::shared_ptr<NETCLASS> nc = netSettings->GetNetClassByName( aName );
const KIGFX::COLOR4D ncColor = nc->GetSchematicColor();
aMenu.Append( schematicColor );
@ -2501,7 +2485,7 @@ void APPEARANCE_CONTROLS::rebuildNets()
: COLOR4D::UNSPECIFIED;
setting->ctl_color = new COLOR_SWATCH( setting->ctl_panel, color, aId, bgColor,
COLOR4D::UNSPECIFIED, SWATCH_SMALL );
COLOR4D::UNSPECIFIED, SWATCH_SMALL );
setting->ctl_color->SetToolTip( _( "Left double click or middle click for color "
"change, right click for menu" ) );
@ -2512,9 +2496,10 @@ void APPEARANCE_CONTROLS::rebuildNets()
if( isDefaultClass )
setting->ctl_color->Hide();
setting->ctl_visibility = new BITMAP_TOGGLE(
setting->ctl_panel, aId, KiBitmapBundle( BITMAPS::visibility ),
KiBitmapBundle( BITMAPS::visibility_off ), !hiddenClasses.count( name ) );
setting->ctl_visibility = new BITMAP_TOGGLE( setting->ctl_panel, aId,
KiBitmapBundle( BITMAPS::visibility ),
KiBitmapBundle( BITMAPS::visibility_off ),
!hiddenClasses.count( name ) );
wxString tip;
tip.Printf( _( "Show or hide ratsnest for nets in %s" ), name );
@ -2525,11 +2510,11 @@ void APPEARANCE_CONTROLS::rebuildNets()
int flags = wxALIGN_CENTER_VERTICAL;
sizer->Add( setting->ctl_color, 0, flags | wxRESERVE_SPACE_EVEN_IF_HIDDEN, 5 );
sizer->Add( setting->ctl_color, 0, flags | wxRESERVE_SPACE_EVEN_IF_HIDDEN, 5 );
sizer->AddSpacer( 7 );
sizer->Add( setting->ctl_visibility, 0, flags, 5 );
sizer->Add( setting->ctl_visibility, 0, flags, 5 );
sizer->AddSpacer( 3 );
sizer->Add( setting->ctl_text, 1, flags, 5 );
sizer->Add( setting->ctl_text, 1, flags, 5 );
m_netclassOuterSizer->Add( setting->ctl_panel, 0, wxEXPAND, 5 );
m_netclassOuterSizer->AddSpacer( 2 );
@ -2691,8 +2676,7 @@ void APPEARANCE_CONTROLS::syncLayerPresetSelection()
m_cbLayerPresets->SetSelection( m_cbLayerPresets->GetCount() - 3 ); // separator
}
m_currentPreset = static_cast<LAYER_PRESET*>(
m_cbLayerPresets->GetClientData( m_cbLayerPresets->GetSelection() ) );
m_currentPreset = static_cast<LAYER_PRESET*>( m_cbLayerPresets->GetClientData( m_cbLayerPresets->GetSelection() ) );
}
@ -2995,8 +2979,7 @@ void APPEARANCE_CONTROLS::onViewportChanged( wxCommandEvent& aEvent )
// Save current state to new preset
wxString name;
wxTextEntryDialog dlg( wxGetTopLevelParent( this ),
_( "Viewport name:" ), _( "Save Viewport" ), name );
wxTextEntryDialog dlg( wxGetTopLevelParent( this ), _( "Viewport name:" ), _( "Save Viewport" ), name );
if( dlg.ShowModal() != wxID_OK )
{
@ -3368,8 +3351,7 @@ void APPEARANCE_CONTROLS::onNetclassContextMenu( wxCommandEvent& aEvent )
{
setting->ctl_color->SetSwatchColor( COLOR4D( 0, 0, 0, 0 ), true );
netSettings->GetNetClassByName( m_contextMenuNetclass )
->SetPcbColor( COLOR4D::UNSPECIFIED );
netSettings->GetNetClassByName( m_contextMenuNetclass )->SetPcbColor( COLOR4D::UNSPECIFIED );
netSettings->RecomputeEffectiveNetclasses();
view->UpdateAllLayersColor();
@ -3382,8 +3364,7 @@ void APPEARANCE_CONTROLS::onNetclassContextMenu( wxCommandEvent& aEvent )
{
if( setting )
{
std::shared_ptr<NETCLASS> nc =
netSettings->GetNetClassByName( m_contextMenuNetclass );
std::shared_ptr<NETCLASS> nc = netSettings->GetNetClassByName( m_contextMenuNetclass );
const KIGFX::COLOR4D ncColor = nc->GetSchematicColor();
setting->ctl_color->SetSwatchColor( ncColor, true );
@ -3504,8 +3485,7 @@ void APPEARANCE_CONTROLS::onReadOnlySwatch()
{
WX_INFOBAR* infobar = m_frame->GetInfoBar();
wxHyperlinkCtrl* button = new wxHyperlinkCtrl( infobar, wxID_ANY, _( "Open Preferences" ),
wxEmptyString );
wxHyperlinkCtrl* button = new wxHyperlinkCtrl( infobar, wxID_ANY, _( "Open Preferences" ), wxEmptyString );
button->Bind( wxEVT_COMMAND_HYPERLINK, std::function<void( wxHyperlinkEvent& aEvent )>(
[&]( wxHyperlinkEvent& aEvent )
@ -3517,8 +3497,8 @@ void APPEARANCE_CONTROLS::onReadOnlySwatch()
infobar->AddButton( button );
infobar->AddCloseButton();
infobar->ShowMessageFor( _( "The current color theme is read-only. Create a new theme in "
"Preferences to enable color editing." ),
infobar->ShowMessageFor( _( "The current color theme is read-only. Create a new theme in Preferences to "
"enable color editing." ),
10000, wxICON_INFORMATION );
}