Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
kicad
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
6
Snippets
Groups
Projects
Show more breadcrumbs
KiCad
KiCad Source Code
kicad
Commits
c981c366
Commit
c981c366
authored
1 year ago
by
Jeff Young
Browse files
Options
Downloads
Patches
Plain Diff
Better handling of dangling markers during bus unfold.
parent
77c19261
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#957090338
passed
1 year ago
Stage: build
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
eeschema/sch_bus_entry.h
+2
-0
2 additions, 0 deletions
eeschema/sch_bus_entry.h
eeschema/tools/sch_line_wire_bus_tool.cpp
+11
-1
11 additions, 1 deletion
eeschema/tools/sch_line_wire_bus_tool.cpp
with
13 additions
and
1 deletion
eeschema/sch_bus_entry.h
+
2
−
0
View file @
c981c366
...
...
@@ -43,6 +43,8 @@ public:
bool
IsDanglingStart
()
const
{
return
m_isDanglingStart
;
}
bool
IsDanglingEnd
()
const
{
return
m_isDanglingEnd
;
}
void
SetEndDangling
(
bool
aDanglingState
)
{
m_isDanglingEnd
=
aDanglingState
;
}
// Do not create a copy constructor. The one generated by the compiler is adequate.
~
SCH_BUS_ENTRY_BASE
()
{
}
...
...
This diff is collapsed.
Click to expand it.
eeschema/tools/sch_line_wire_bus_tool.cpp
+
11
−
1
View file @
c981c366
...
...
@@ -375,6 +375,7 @@ int SCH_LINE_WIRE_BUS_TOOL::UnfoldBus( const TOOL_EVENT& aEvent )
SCH_LINE
*
SCH_LINE_WIRE_BUS_TOOL
::
doUnfoldBus
(
const
wxString
&
aNet
,
const
VECTOR2I
&
aPos
)
{
SCHEMATIC_SETTINGS
&
cfg
=
getModel
<
SCHEMATIC
>
()
->
Settings
();
SCH_SCREEN
*
screen
=
m_frame
->
GetScreen
();
VECTOR2I
pos
=
aPos
;
...
...
@@ -384,7 +385,7 @@ SCH_LINE* SCH_LINE_WIRE_BUS_TOOL::doUnfoldBus( const wxString& aNet, const VECTO
m_toolMgr
->
RunAction
(
EE_ACTIONS
::
clearSelection
);
m_busUnfold
.
entry
=
new
SCH_BUS_WIRE_ENTRY
(
pos
);
m_busUnfold
.
entry
->
SetParent
(
m_frame
->
GetS
creen
()
);
m_busUnfold
.
entry
->
SetParent
(
s
creen
);
m_frame
->
AddToScreen
(
m_busUnfold
.
entry
,
m_frame
->
GetScreen
()
);
m_busUnfold
.
label
=
new
SCH_LABEL
(
m_busUnfold
.
entry
->
GetEnd
(),
aNet
);
...
...
@@ -399,6 +400,15 @@ SCH_LINE* SCH_LINE_WIRE_BUS_TOOL::doUnfoldBus( const wxString& aNet, const VECTO
getViewControls
()
->
SetCrossHairCursorPosition
(
m_busUnfold
.
entry
->
GetEnd
(),
false
);
std
::
vector
<
DANGLING_END_ITEM
>
endPoints
;
for
(
SCH_ITEM
*
item
:
screen
->
Items
().
Overlapping
(
m_busUnfold
.
entry
->
GetBoundingBox
()
)
)
item
->
GetEndPoints
(
endPoints
);
m_busUnfold
.
entry
->
UpdateDanglingState
(
endPoints
);
m_busUnfold
.
entry
->
SetEndDangling
(
false
);
m_busUnfold
.
label
->
SetIsDangling
(
false
);
return
startSegments
(
LAYER_WIRE
,
m_busUnfold
.
entry
->
GetEnd
()
);
}
...
...
This diff is collapsed.
Click to expand it.
Jeff Young
@jeffyoung
mentioned in issue
#15313 (closed)
·
1 year ago
mentioned in issue
#15313 (closed)
mentioned in issue #15313
Toggle commit list
Jeff Young
@jeffyoung
mentioned in commit
c468b68c
·
1 year ago
mentioned in commit
c468b68c
mentioned in commit c468b68c5ad0ca0e9151d9a464d76616148539d8
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment