-
Notifications
You must be signed in to change notification settings - Fork 115
CSSTUDIO-1355 Add Waterfall Plot widget to Phoebus. #3520
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
528ae3b
CSSTUDIO-1355 Add Waterfall Plot widget to Phoebus.
abrahamwolk 6899505
Update chartfx version.
abrahamwolk d7a1919
Change the default value of the widget property "Time axis" to be the…
abrahamwolk 7bc8075
Add ChartFX dependency to dependencies/phoebus-target/pom.xml.
abrahamwolk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <project default="app-waterfall-plot"> | ||
| <import file="../../dependencies/ant_settings.xml"/> | ||
|
|
||
| <target name="app-waterfall-plot" depends="compile-app"> | ||
| <jar destfile="${build}/app-waterfall-plot-${version}.jar"> | ||
| <fileset dir="${classes}"/> | ||
| <fileset dir="${resources}"/> | ||
| </jar> | ||
| </target> | ||
| </project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>app-waterfall-plot</artifactId> | ||
|
|
||
| <parent> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>core-framework</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>core-ui</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>core-types</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.fair-acc</groupId> | ||
| <artifactId>chartfx</artifactId> | ||
| <version>11.3.1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-simple</artifactId> | ||
| <version>2.0.9</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-databrowser</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>core-ui</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>core-framework</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-display-model</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-display-representation</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-display-representation</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-display-representation</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-display-representation</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-display-representation-javafx</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-display-runtime</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.phoebus</groupId> | ||
| <artifactId>app-display-runtime</artifactId> | ||
| <version>5.0.3-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> | ||
39 changes: 39 additions & 0 deletions
39
...ay/waterfallplot/src/main/java/org/phoebus/applications/waterfallplotwidget/Messages.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package org.phoebus.applications.waterfallplotwidget; | ||
|
|
||
| import org.phoebus.framework.nls.NLS; | ||
|
|
||
| public class Messages { | ||
| public static String AxisLabelFont; | ||
| public static String ColorGradient; | ||
| public static String FromPVLimits; | ||
| public static String MajorTickLength; | ||
| public static String MajorTickWidth; | ||
| public static String MinorTickLength; | ||
| public static String MinorTickWidth; | ||
| public static String PVAxisName; | ||
| public static String PVAxisUnit; | ||
| public static String PV; | ||
| public static String PVs; | ||
| public static String RetrieveHistoricValuesFromTheArchiver; | ||
| public static String SetAutomaticallyBasedOnReceivedValues; | ||
| public static String SetMinAndMaxManually; | ||
| public static String TickLabelFont; | ||
| public static String TimeAxis; | ||
| public static String Timespan; | ||
| public static String TitleFont; | ||
| public static String UsePVNumberAsLabelOnAxis; | ||
| public static String WaveformPV; | ||
| public static String XAxis; | ||
| public static String YAxis; | ||
| public static String ZAxisMinMax; | ||
| public static String ZAxisMax; | ||
| public static String ZAxisMin; | ||
| public static String ZAxisName; | ||
| public static String ZAxisUnit; | ||
|
|
||
| static | ||
| { | ||
| NLS.initializeMessages(org.phoebus.applications.waterfallplotwidget.Messages.class); | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add the new dependency to dependencies/phoebus-target/pom.xml?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's possible, but isn't it preferable that only the module
waterfallplotincludes it? If one builds Phoebus without the Waterfall plot, then there is no need to include the new dependency in the build.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See https://github.com/ControlSystemStudio/phoebus/tree/master/dependencies#readme
This is about establishing a target platform, a list of all the dependencies, for use with Eclipse, ant, make, .. whatever you want to use. If you limit the build tools to maven, then you're of course correct.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have added the dependency to
dependencies/phoebus-target/pom.xml: 7bc8075