Skip to content

[PLANPRO-5832] Signal ausleger with foundation - #2047

Open
JanErikVoigt wants to merge 43 commits into
eclipse-set:mainfrom
JanErikVoigt:signal-ausleger-with-foundation
Open

[PLANPRO-5832] Signal ausleger with foundation#2047
JanErikVoigt wants to merge 43 commits into
eclipse-set:mainfrom
JanErikVoigt:signal-ausleger-with-foundation

Conversation

@JanErikVoigt

@JanErikVoigtJanErikVoigt commented Dec 1, 2025

Copy link
Copy Markdown
Contributor

No description provided.

@JanErikVoigt

JanErikVoigt commented Dec 1, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Signals are now shown as Ausleger. It still looks wrong, but I think thats for a different ticket.

7707 and 7705
grafik

A95E3164-CDA3-47A5-963E-77A8B6BE1AAF:
grafik

@JanErikVoigt
JanErikVoigt marked this pull request as ready for review December 1, 2025 15:22
TruongQuangSB
TruongQuangSB requested changes Dec 8, 2025
View reviewed changes
Comment thread...et.feature.siteplan/src/org/eclipse/set/feature/siteplan/transform/SignalTransformator.xtend Outdated
Comment threadweb/siteplan/src/feature/FeatureInfo.ts Outdated
Comment threadweb/siteplan/src/feature/FeatureInfo.ts Outdated
Comment threadweb/siteplan/public/SvgKatalog/HV-System.svg
<circle r="10" cx="35" cy="20"/>
<circle r="10" cx="5" cy="40"/>
<toolbox:anchor id="mastAnkerTop" x="20" y="40" />
<toolbox:anchor id="mastAnkerBottom" x="20" y="20"/>

@TruongQuangSBTruongQuangSBDec 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually the ``Vr1` haven't no anchor punkt, because the signal mast should be through between two circle

@JanErikVoigtJanErikVoigtJan 26, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think they do, sometimes.

TruongQuangSB
TruongQuangSB requested changes Jan 26, 2026
View reviewed changes

@TruongQuangSBTruongQuangSB left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls resolve conflict with merge

Comment thread...ndles/org.eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/SignalMountType.java
Comment thread....eclipse.set.model.siteplan/src/org/eclipse/set/model/siteplan/impl/SiteplanPackageImpl.java
Comment threadweb/siteplan/src/util/SVG/Draw/AbstractDrawSVG.ts
* @param label {@link Label}
*/
public abstract drawSVG<T extends object>(data: T, label?: Label): ISvgElement
public abstract drawSVG<T extends object>(data: T, label?: Label): ISvgElement | null

@TruongQuangSBTruongQuangSBJan 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of null should it give SvgError back, when something wrong

@JanErikVoigtJanErikVoigtJan 26, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made SvgDrawBridge an AbstractDrawSVG. Now, there are two for Signals... (SvgDrawSignal and SvgDrawBridge). Don't you think it is sensible to model it like this? Now flow is:

  • SvgDrawBridge attempts to draw, if it is not a bridge, returns null
  • SvgService continues searching for a result != null
  • Then SvgDrawSignal returns a value != null.
  • if it, too, returns null, draw error

Comment threadweb/siteplan/src/util/SVG/Draw/SvgDrawBridge.ts Outdated
Jan-Erik Voigt added 25 commits January 26, 2026 15:48
Jan-Erik Voigt
original meaning of getMountType
d68dac0
Jan-Erik Voigt
add new, more refined condition for getMountType(SignalInfo)
048ac5b
Jan-Erik Voigt
add Flash to getFeatureName
8aba073
Jan-Erik Voigt
add anchors to HV Vr1
26f709b
Jan-Erik Voigt
remove debugging text
3e6c25f
Jan-Erik Voigt
use exists instead of !filter.isEmpty
37ada06
Jan-Erik Voigt
Ne2 is alleinstehend
7247318
Jan-Erik Voigt
reorder imports
8b76ea5
Jan-Erik Voigt
formatting
146ceba
Jan-Erik Voigt
rename SvgDrawBridge.draw
302508c
Jan-Erik Voigt
make drawSVG return null, if can't draw that. make SvgDrawBridge an D…
c102435
…rawSVG
Jan-Erik Voigt
getSignalScreen only returns screens which should actually be drawn
8a4fb50
Jan-Erik Voigt
edit DrawBridge
001cc34
Jan-Erik Voigt
cleanup
f2263ee
Jan-Erik Voigt
inline draw attached signals
1aae3b0
Jan-Erik Voigt
continue previous
aa4db18
Jan-Erik Voigt
remove console logs
fb3c896
Jan-Erik Voigt
fix signal bruecke in catalog
233c979
Jan-Erik Voigt
Only SignalAusleger (no Links or Mitte)
00c69c3
Jan-Erik Voigt
add signed signal offset
6d975cb
Jan-Erik Voigt
remove SvgBridgeSignal mountoffset and -direction
27799a1
Jan-Erik Voigt
simplify
92a8fb7
Jan-Erik Voigt
draw arm properly
b317be5
Jan-Erik Voigt
fix mountDirection
78ef269
Jan-Erik Voigt
inline mountDirection()
44833e5
@JanErikVoigt
JanErikVoigtforce-pushed the signal-ausleger-with-foundation branch from 5d06764 to faf9daaCompareJanuary 26, 2026 15:22
@mariusheinemariusheine mentioned this pull request Jan 26, 2026
Draft
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TruongQuangSBTruongQuangSBTruongQuangSB requested changes

Requested changes must be addressed to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@JanErikVoigt@TruongQuangSB