Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show inidcators axis affiliation and allow changing label name and removing #253

Merged
merged 2 commits into from
Sep 9, 2020

Conversation

wirew0rm
Copy link
Member

@wirew0rm wirew0rm commented Sep 9, 2020

Small improvements to the indicator plugin in light of #204 :

  • move the triangle above the corresponding axis, to show which axis it belongs to
    • had to move it from chartPluginChildren to plotForeground and delete it if the plugin is removed, because chartPluginChildren are restricted to the area inside the axes. Also this makes the triangle indicators mouse transparent
    • make the triangles slightly transparent to still see the tick marks
  • make the indicators editable and removable:
    • right click on the label replaces the label with a text edit
    • press ENTER to confirm the new label, ESC to discard or CTRL+ DEL to remove the indicator from the chart.

Moves the triangles from the edge of the chart on top of the
corresponding axis, so the user can see which axis an indicator belongs
to.
Right clicking on the indicator label allows editing the indicator title
by showing a TextEdit. Pressing ENTER will commit the change, pressing
ESC will reset the change and pressing CTRL + DEL will remove the
indicator from the chart.
Copy link
Member

Codacy Here is an overview of what got changed by this pull request:

Issues
======
+ Solved 2
- Added 1
           

Complexity increasing per file
==============================
- chartfx-chart/src/main/java/de/gsi/chart/plugins/YValueIndicator.java  1
- chartfx-chart/src/main/java/de/gsi/chart/plugins/XValueIndicator.java  1
         

Clones removed
==============
+ chartfx-samples/src/main/java/de/gsi/chart/samples/ChartIndicatorSample.java  -3
         

See the complete overview on Codacy

@codecov
Copy link

codecov bot commented Sep 9, 2020

Codecov Report

Merging #253 into dev-x.2.0 will decrease coverage by 0.00%.
The diff coverage is 38.70%.

Impacted file tree graph

@@               Coverage Diff               @@
##             dev-x.2.0     #253      +/-   ##
===============================================
- Coverage        47.20%   47.20%   -0.01%     
- Complexity        5519     5522       +3     
===============================================
  Files              341      341              
  Lines            34848    34888      +40     
  Branches          5705     5708       +3     
===============================================
+ Hits             16451    16468      +17     
- Misses           17375    17398      +23     
  Partials          1022     1022              
Impacted Files Coverage Δ Complexity Δ
...fx-chart/src/main/java/de/gsi/chart/axes/Axis.java 100.00% <ø> (ø) 1.00 <0.00> (ø)
.../main/java/de/gsi/chart/axes/spi/AbstractAxis.java 56.98% <ø> (+0.13%) 130.00 <0.00> (+1.00)
...gsi/chart/plugins/AbstractRangeValueIndicator.java 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...a/de/gsi/chart/plugins/AbstractValueIndicator.java 64.96% <13.33%> (-11.36%) 30.00 <0.00> (ø)
...ain/java/de/gsi/chart/plugins/YValueIndicator.java 71.79% <57.14%> (-4.68%) 5.00 <0.00> (ø)
...ain/java/de/gsi/chart/plugins/XValueIndicator.java 70.00% <62.50%> (-4.29%) 5.00 <0.00> (ø)
...si/chart/plugins/AbstractSingleValueIndicator.java 75.45% <66.66%> (+0.94%) 23.00 <2.00> (+3.00)
...ins/measurements/utils/ValueIndicatorSelector.java 94.66% <100.00%> (-0.08%) 29.00 <0.00> (-3.00)
...plugins/measurements/AbstractChartMeasurement.java 80.97% <0.00%> (+0.97%) 55.00% <0.00%> (+1.00%)
...src/main/java/de/gsi/chart/ui/ProfilerInfoBox.java 99.02% <0.00%> (+1.94%) 24.00% <0.00%> (+1.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9187dc7...19879f9. Read the comment docs.

Copy link
Member

@RalphSteinhagen RalphSteinhagen left a comment

Choose a reason for hiding this comment

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

LGTM

@RalphSteinhagen RalphSteinhagen merged commit 4e920b4 into dev-x.2.0 Sep 9, 2020
@RalphSteinhagen RalphSteinhagen deleted the indicators branch September 9, 2020 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants