mirror
/
osci-render
kopia lustrzana https://github.com/jameshball/osci-render
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add text instructions for cycling between opened files

pull/35/head
James Ball 2021-07-10 19:02:21 +01:00
rodzic 940921dd27
commit bc2b942e99
2 zmienionych plików z 9 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
src/main/java/sh/ball/gui/Controller.java
Wyświetl plik

@ -79,6 +79,8 @@ public class Controller implements Initializable, FrequencyListener, Listener {
@FXML
private Label fileLabel;
@FXML
private Label jkLabel;
@FXML
private Button recordButton;
@FXML
private Label recordLabel;
@ -412,20 +414,21 @@ public class Controller implements Initializable, FrequencyListener, Listener {
private void chooseFile(File chosenFile) {
try {
if (chosenFile.exists()) {
String path = chosenFile.getAbsolutePath();
frameSets.clear();
frameSetPaths.clear();
if (chosenFile.isDirectory()) {
jkLabel.setVisible(true);
for (File file : chosenFile.listFiles()) {
try {
frameSets.add(ParserFactory.getParser(file.getAbsolutePath()).parse());
frameSetPaths.add(file.getAbsolutePath());
frameSetPaths.add(file.getName());
} catch (IOException ignored) {}
}
} else {
frameSets.add(ParserFactory.getParser(path).parse());
frameSetPaths.add(path);
jkLabel.setVisible(false);
frameSets.add(ParserFactory.getParser(chosenFile.getAbsolutePath()).parse());
frameSetPaths.add(chosenFile.getName());
}
currentFrameSet = 0;

3
src/main/resources/fxml/osci-render.fxml
Wyświetl plik

@ -16,10 +16,11 @@
<Button fx:id="chooseFileButton" layoutX="14.0" layoutY="53.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="114.0" text="Choose File" />
<Label fx:id="fileLabel" layoutX="144.0" layoutY="57.0" maxWidth="270.0" prefHeight="18.0" prefWidth="246.0" text="cube.obj" />
<Button fx:id="recordButton" layoutX="14.0" layoutY="129.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="114.0" text="Record" />
<Label fx:id="recordLabel" layoutX="145.0" layoutY="140.0" maxWidth="270.0" prefHeight="18.0" prefWidth="245.0" />
<Label fx:id="recordLabel" layoutX="144.0" layoutY="133.0" maxWidth="270.0" prefHeight="18.0" prefWidth="245.0" />
<Label id="frequency" fx:id="frequencyLabel" layoutX="13.0" layoutY="166.0" prefHeight="58.0" prefWidth="376.0" text="L/R Frequency:&#10; &#10;" />
<ComboBox fx:id="deviceComboBox" layoutX="14.0" layoutY="11.0" prefHeight="26.0" prefWidth="376.0" />
<Button fx:id="chooseFolderButton" layoutX="14.0" layoutY="91.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="114.0" text="Choose Folder" />
<Label fx:id="jkLabel" layoutX="143.0" layoutY="95.0" maxWidth="270.0" prefHeight="18.0" prefWidth="246.0" text="Use j and k to cycle between files" visible="false" />
</children>
</AnchorPane>
<TitledPane animated="false" collapsible="false" layoutX="423.0" layoutY="252.0" prefHeight="272.0" prefWidth="402.0" text="Effects">