haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep line stroke params as long as layer doesn't change. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6210
This commit is contained in:
Jeff Young 2021-10-22 17:00:55 +01:00
parent 889970a449
commit 3f90b3e2a0
3 changed files with 59 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/dialogs/dialog_graphic_item_properties.cpp
View File

@ -41,6 +41,7 @@
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include <dialog_graphic_item_properties_base.h> #include <dialog_graphic_item_properties_base.h>
#include <tools/drawing_tool.h>
class DIALOG_GRAPHIC_ITEM_PROPERTIES : public DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE class DIALOG_GRAPHIC_ITEM_PROPERTIES : public DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE
{ {
@ -154,7 +155,15 @@ void PCB_BASE_EDIT_FRAME::ShowGraphicItemPropertiesDialog( BOARD_ITEM* aItem )
wxCHECK_RET( aItem != NULL, wxT( "ShowGraphicItemPropertiesDialog() error: NULL item" ) ); wxCHECK_RET( aItem != NULL, wxT( "ShowGraphicItemPropertiesDialog() error: NULL item" ) );
DIALOG_GRAPHIC_ITEM_PROPERTIES dlg( this, aItem ); DIALOG_GRAPHIC_ITEM_PROPERTIES dlg( this, aItem );
dlg.ShowQuasiModal();
if( dlg.ShowQuasiModal() == wxID_OK )
{
if( aItem->IsOnLayer( GetActiveLayer() ) )
{
DRAWING_TOOL* drawingTool = m_toolManager->GetTool<DRAWING_TOOL>();
drawingTool->SetStroke( aItem->GetStroke(), GetActiveLayer() );
}
}
} }

71
pcbnew/tools/drawing_tool.cpp
View File

@ -166,6 +166,7 @@ DRAWING_TOOL::DRAWING_TOOL() :
m_frame( nullptr ), m_frame( nullptr ),
m_mode( MODE::NONE ), m_mode( MODE::NONE ),
m_inDrawingTool( false ), m_inDrawingTool( false ),
m_layer( UNDEFINED_LAYER ),
m_stroke( 1, PLOT_DASH_TYPE::DEFAULT, COLOR4D::UNSPECIFIED ) m_stroke( 1, PLOT_DASH_TYPE::DEFAULT, COLOR4D::UNSPECIFIED )
{ {
} }
@ -1441,9 +1442,14 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
EDA_UNITS userUnits = m_frame->GetUserUnits(); EDA_UNITS userUnits = m_frame->GetUserUnits();
PCB_GRID_HELPER grid( m_toolMgr, m_frame->GetMagneticItemsSettings() ); PCB_GRID_HELPER grid( m_toolMgr, m_frame->GetMagneticItemsSettings() );
PCB_SHAPE*& graphic = *aGraphic; PCB_SHAPE*& graphic = *aGraphic;
PCB_LAYER_ID drawingLayer = m_frame->GetActiveLayer();
m_stroke.SetWidth( getSegmentWidth( drawingLayer ) ); if( m_layer != m_frame->GetActiveLayer() )
{
m_layer = m_frame->GetActiveLayer();
m_stroke.SetWidth( getSegmentWidth( m_layer ) );
m_stroke.SetPlotStyle( PLOT_DASH_TYPE::DEFAULT );
m_stroke.SetColor( COLOR4D::UNSPECIFIED );
}
// geometric construction manager // geometric construction manager
KIGFX::PREVIEW::TWO_POINT_GEOMETRY_MANAGER twoPointManager; KIGFX::PREVIEW::TWO_POINT_GEOMETRY_MANAGER twoPointManager;
@ -1501,7 +1507,7 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
grid.SetSnap( !evt->Modifier( MD_SHIFT ) ); grid.SetSnap( !evt->Modifier( MD_SHIFT ) );
grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() ); grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() );
cursorPos = grid.BestSnapAnchor( m_controls->GetMousePosition(), drawingLayer ); cursorPos = grid.BestSnapAnchor( m_controls->GetMousePosition(), m_layer );
m_controls->ForceCursorPosition( true, cursorPos ); m_controls->ForceCursorPosition( true, cursorPos );
if( evt->IsCancelInteractive() ) if( evt->IsCancelInteractive() )
@ -1541,18 +1547,23 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
} }
else if( evt->IsAction( &PCB_ACTIONS::layerChanged ) ) else if( evt->IsAction( &PCB_ACTIONS::layerChanged ) )
{ {
drawingLayer = m_frame->GetActiveLayer(); if( m_layer != m_frame->GetActiveLayer() )
m_stroke.SetWidth( getSegmentWidth( drawingLayer ) ); {
m_layer = m_frame->GetActiveLayer();
m_stroke.SetWidth( getSegmentWidth( m_layer ) );
m_stroke.SetPlotStyle( PLOT_DASH_TYPE::DEFAULT );
m_stroke.SetColor( COLOR4D::UNSPECIFIED );
}
if( graphic ) if( graphic )
{ {
if( !m_view->IsLayerVisible( drawingLayer ) ) if( !m_view->IsLayerVisible( m_layer ) )
{ {
m_frame->GetAppearancePanel()->SetLayerVisible( drawingLayer, true ); m_frame->GetAppearancePanel()->SetLayerVisible( m_layer, true );
m_frame->GetCanvas()->Refresh(); m_frame->GetCanvas()->Refresh();
} }
graphic->SetLayer( drawingLayer ); graphic->SetLayer( m_layer );
graphic->SetStroke( m_stroke ); graphic->SetStroke( m_stroke );
m_view->Update( &preview ); m_view->Update( &preview );
frame()->SetMsgPanel( graphic ); frame()->SetMsgPanel( graphic );
@ -1592,13 +1603,11 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
aStartingPoint = NULLOPT; aStartingPoint = NULLOPT;
} }
m_stroke.SetWidth( getSegmentWidth( drawingLayer ) );
// Init the new item attributes // Init the new item attributes
graphic->SetShape( static_cast<SHAPE_T>( shape ) ); graphic->SetShape( static_cast<SHAPE_T>( shape ) );
graphic->SetFilled( false ); graphic->SetFilled( false );
graphic->SetStroke( m_stroke ); graphic->SetStroke( m_stroke );
graphic->SetLayer( drawingLayer ); graphic->SetLayer( m_layer );
grid.SetSkipPoint( cursorPos ); grid.SetSkipPoint( cursorPos );
twoPointManager.SetOrigin( (wxPoint) cursorPos ); twoPointManager.SetOrigin( (wxPoint) cursorPos );
@ -1612,9 +1621,9 @@ bool DRAWING_TOOL::drawSegment( const std::string& aTool, PCB_SHAPE** aGraphic,
m_controls->SetAutoPan( true ); m_controls->SetAutoPan( true );
m_controls->CaptureCursor( true ); m_controls->CaptureCursor( true );
if( !m_view->IsLayerVisible( drawingLayer ) ) if( !m_view->IsLayerVisible( m_layer ) )
{ {
m_frame->GetAppearancePanel()->SetLayerVisible( drawingLayer, true ); m_frame->GetAppearancePanel()->SetLayerVisible( m_layer, true );
m_frame->GetCanvas()->Refresh(); m_frame->GetCanvas()->Refresh();
} }
@ -1762,11 +1771,13 @@ bool DRAWING_TOOL::drawArc( const std::string& aTool, PCB_SHAPE** aGraphic, bool
{ {
PCB_SHAPE*& graphic = *aGraphic; PCB_SHAPE*& graphic = *aGraphic;
wxCHECK( graphic, 0 ); if( m_layer != m_frame->GetActiveLayer() )
{
PCB_LAYER_ID drawingLayer = m_frame->GetActiveLayer(); m_layer = m_frame->GetActiveLayer();
m_stroke.SetWidth( getSegmentWidth( m_layer ) );
m_stroke.SetWidth( getSegmentWidth( drawingLayer ) ); m_stroke.SetPlotStyle( PLOT_DASH_TYPE::DEFAULT );
m_stroke.SetColor( COLOR4D::UNSPECIFIED );
}
// Arc geometric construction manager // Arc geometric construction manager
KIGFX::PREVIEW::ARC_GEOM_MANAGER arcManager; KIGFX::PREVIEW::ARC_GEOM_MANAGER arcManager;
@ -1815,7 +1826,7 @@ bool DRAWING_TOOL::drawArc( const std::string& aTool, PCB_SHAPE** aGraphic, bool
setCursor(); setCursor();
graphic->SetLayer( drawingLayer ); graphic->SetLayer( m_layer );
grid.SetSnap( !evt->Modifier( MD_SHIFT ) ); grid.SetSnap( !evt->Modifier( MD_SHIFT ) );
grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() ); grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() );
@ -1866,17 +1877,14 @@ bool DRAWING_TOOL::drawArc( const std::string& aTool, PCB_SHAPE** aGraphic, bool
m_controls->SetAutoPan( true ); m_controls->SetAutoPan( true );
m_controls->CaptureCursor( true ); m_controls->CaptureCursor( true );
drawingLayer = m_frame->GetActiveLayer();
m_stroke.SetWidth( getSegmentWidth( drawingLayer ) );
// Init the new item attributes // Init the new item attributes
// (non-geometric, those are handled by the manager) // (non-geometric, those are handled by the manager)
graphic->SetShape( SHAPE_T::ARC ); graphic->SetShape( SHAPE_T::ARC );
graphic->SetStroke( m_stroke ); graphic->SetStroke( m_stroke );
if( !m_view->IsLayerVisible( drawingLayer ) ) if( !m_view->IsLayerVisible( m_layer ) )
{ {
m_frame->GetAppearancePanel()->SetLayerVisible( drawingLayer, true ); m_frame->GetAppearancePanel()->SetLayerVisible( m_layer, true );
m_frame->GetCanvas()->Refresh(); m_frame->GetCanvas()->Refresh();
} }
@ -1901,18 +1909,23 @@ bool DRAWING_TOOL::drawArc( const std::string& aTool, PCB_SHAPE** aGraphic, bool
} }
else if( evt->IsAction( &PCB_ACTIONS::layerChanged ) ) else if( evt->IsAction( &PCB_ACTIONS::layerChanged ) )
{ {
drawingLayer = m_frame->GetActiveLayer(); if( m_layer != m_frame->GetActiveLayer() )
m_stroke.SetWidth( getSegmentWidth( drawingLayer ) ); {
m_layer = m_frame->GetActiveLayer();
m_stroke.SetWidth( getSegmentWidth( m_layer ) );
m_stroke.SetPlotStyle( PLOT_DASH_TYPE::DEFAULT );
m_stroke.SetColor( COLOR4D::UNSPECIFIED );
}
if( graphic ) if( graphic )
{ {
if( !m_view->IsLayerVisible( drawingLayer ) ) if( !m_view->IsLayerVisible( m_layer ) )
{ {
m_frame->GetAppearancePanel()->SetLayerVisible( drawingLayer, true ); m_frame->GetAppearancePanel()->SetLayerVisible( m_layer, true );
m_frame->GetCanvas()->Refresh(); m_frame->GetCanvas()->Refresh();
} }
graphic->SetLayer( drawingLayer ); graphic->SetLayer( m_layer );
graphic->SetStroke( m_stroke ); graphic->SetStroke( m_stroke );
m_view->Update( &preview ); m_view->Update( &preview );
frame()->SetMsgPanel( graphic ); frame()->SetMsgPanel( graphic );

7
pcbnew/tools/drawing_tool.h
View File

@ -202,6 +202,12 @@ public:
///< Set up handlers for various events. ///< Set up handlers for various events.
void setTransitions() override; void setTransitions() override;
void SetStroke( const STROKE_PARAMS& aStroke, PCB_LAYER_ID aLayer )
{
m_layer = aLayer;
m_stroke = aStroke;
}
private: private:
/** /**
* Start drawing a selected shape (i.e. PCB_SHAPE). * Start drawing a selected shape (i.e. PCB_SHAPE).
@ -270,6 +276,7 @@ private:
MODE m_mode; MODE m_mode;
bool m_inDrawingTool; // Re-entrancy guard bool m_inDrawingTool; // Re-entrancy guard
PCB_LAYER_ID m_layer; // The layer we last drew on
STROKE_PARAMS m_stroke; // Current stroke for multi-segment drawing STROKE_PARAMS m_stroke; // Current stroke for multi-segment drawing
static const unsigned int WIDTH_STEP; // Amount of width change for one -/+ key press static const unsigned int WIDTH_STEP; // Amount of width change for one -/+ key press