sarsoo/fmframework
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

changed scrobble line chart to bar, moved current track to lookup

Browse Source
This commit is contained in:
aj 2019-05-01 14:04:18 +01:00
parent fe0d8d2dbf
commit e4ebf5a20b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java
View File

@ -11,7 +11,7 @@ import javafx.fxml.FXML;
import sarsoo.fmframework.fm.FmUserNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Album;
import sarsoo.fmframework.net.Key; import sarsoo.fmframework.net.Key;
import javafx.scene.chart.LineChart; import javafx.scene.chart.BarChart;
import javafx.scene.chart.XYChart; import javafx.scene.chart.XYChart;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.BorderPane; import javafx.scene.layout.BorderPane;
@ -28,7 +28,7 @@ public class ScrobbleChartPaneController {
private ChoiceBox<String> dropDownTimeRange; private ChoiceBox<String> dropDownTimeRange;
@FXML @FXML
private LineChart lineChartScrobbles; private BarChart barChartScrobbles;
@FXML @FXML
private BorderPane chartBorderPane; private BorderPane chartBorderPane;
@ -95,8 +95,8 @@ public class ScrobbleChartPaneController {
@Override @Override
public void run() { public void run() {
try { try {
lineChartScrobbles.getData().clear(); barChartScrobbles.getData().clear();
lineChartScrobbles.getData().add(series); barChartScrobbles.getData().add(series);
} finally { } finally {
latch.countDown(); latch.countDown();

4
src/main/resources/sarsoo/fmframework/fx/ui/ScrobbleChartPane.fxml
View File

@ -20,14 +20,14 @@
</ToolBar> </ToolBar>
</bottom> </bottom>
<center> <center>
<LineChart fx:id="lineChartScrobbles" legendVisible="false" BorderPane.alignment="CENTER"> <BarChart fx:id="barChartScrobbles" legendVisible="false" BorderPane.alignment="CENTER">
<xAxis> <xAxis>
<CategoryAxis side="BOTTOM" /> <CategoryAxis side="BOTTOM" />
</xAxis> </xAxis>
<yAxis> <yAxis>
<NumberAxis side="LEFT" /> <NumberAxis side="LEFT" />
</yAxis> </yAxis>
</LineChart> </BarChart>
</center> </center>
</BorderPane> </BorderPane>
</children> </children>

2
src/main/resources/sarsoo/fmframework/fx/ui/main.fxml
View File

@ -18,6 +18,7 @@
</Menu> </Menu>
<Menu fx:id="menuLookup" mnemonicParsing="false" text="lookup"> <Menu fx:id="menuLookup" mnemonicParsing="false" text="lookup">
<items> <items>
<MenuItem fx:id="menuItemCurrentTrack" mnemonicParsing="false" onAction="#handleCurrentTrack" text="current track" />
<MenuItem fx:id="menuItemTrack" mnemonicParsing="false" onAction="#handleLookupTrack" text="track" /> <MenuItem fx:id="menuItemTrack" mnemonicParsing="false" onAction="#handleLookupTrack" text="track" />
<MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleLookupAlbum" text="album" /> <MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleLookupAlbum" text="album" />
<MenuItem fx:id="menuItemArtist" mnemonicParsing="false" onAction="#handleLookupArtist" text="artist" /> <MenuItem fx:id="menuItemArtist" mnemonicParsing="false" onAction="#handleLookupArtist" text="artist" />
@ -33,7 +34,6 @@
<Menu fx:id="menuUtil" mnemonicParsing="false" text="util"> <Menu fx:id="menuUtil" mnemonicParsing="false" text="util">
<items> <items>
<MenuItem fx:id="menuItemScrobble" mnemonicParsing="false" onAction="#handleScrobble" text="scrobble" /> <MenuItem fx:id="menuItemScrobble" mnemonicParsing="false" onAction="#handleScrobble" text="scrobble" />
<MenuItem fx:id="menuItemCurrentTrack" mnemonicParsing="false" onAction="#handleCurrentTrack" text="current track" />
<MenuItem fx:id="menuItemOpenConsole" mnemonicParsing="false" onAction="#handleOpenConsole" text="open console" /> <MenuItem fx:id="menuItemOpenConsole" mnemonicParsing="false" onAction="#handleOpenConsole" text="open console" />
<MenuItem mnemonicParsing="false" onAction="#handleChangeUsername" text="set username" /> <MenuItem mnemonicParsing="false" onAction="#handleChangeUsername" text="set username" />
</items> </items>