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

Save and load min/max slider values to/from project file

pull/53/head
James Ball 2022-03-12 22:35:08 +00:00 zatwierdzone przez James H Ball
rodzic 55ddfeae64
commit 5350b133a7
3 zmienionych plików z 43 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
src/main/java/sh/ball/gui/controller/EffectsController.java
Wyświetl plik

@ -359,6 +359,11 @@ public class EffectsController implements Initializable, SubController {
List<String> labels = labels();
for (int i = 0; i < checkBoxes.size(); i++) {
Element checkBox = (Element) element.getElementsByTagName(labels.get(i)).item(0);
// backwards compatibility
if (checkBox == null) {
checkBoxes.get(i).setSelected(false);
continue;
}
String selected;
// backwards compatibility
if (checkBox.getElementsByTagName("selected").getLength() > 0) {

37
src/main/java/sh/ball/gui/controller/MainController.java
Wyświetl plik

@ -557,9 +557,21 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
private void appendSliders(List<Slider> sliders, List<String> labels, Element root, Document document) {
for (int i = 0; i < sliders.size(); i++) {
Element sliderElement = document.createElement(labels.get(i));
sliderElement.appendChild(
Element value = document.createElement("value");
Element min = document.createElement("min");
Element max = document.createElement("max");
value.appendChild(
document.createTextNode(sliders.get(i).valueProperty().getValue().toString())
);
min.appendChild(
document.createTextNode(sliders.get(i).minProperty().getValue().toString())
);
max.appendChild(
document.createTextNode(sliders.get(i).maxProperty().getValue().toString())
);
sliderElement.appendChild(value);
sliderElement.appendChild(min);
sliderElement.appendChild(max);
root.appendChild(sliderElement);
}
}
@ -569,11 +581,28 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
NodeList nodes = root.getElementsByTagName(labels.get(i));
// backwards compatibility
if (nodes.getLength() > 0) {
String value = nodes.item(0).getTextContent();
sliders.get(i).setValue(Float.parseFloat(value));
targetSliderValue[i] = Float.parseFloat(value);
Element sliderElement = (Element) nodes.item(0);
Slider slider = sliders.get(i);
String value;
// backwards compatibility
if (sliderElement.getChildNodes().getLength() == 1) {
value = sliderElement.getTextContent();
} else {
value = sliderElement.getElementsByTagName("value").item(0).getTextContent();
String min = sliderElement.getElementsByTagName("min").item(0).getTextContent();
String max = sliderElement.getElementsByTagName("max").item(0).getTextContent();
slider.setMin(Double.parseDouble(min));
slider.setMax(Double.parseDouble(max));
updateSliderUnits(slider);
}
slider.setValue(Double.parseDouble(value));
targetSliderValue[i] = Double.parseDouble(value);
}
}
sliderMinTextField.setText(String.valueOf(sliderComboBox.getValue().slider.getMin()));
sliderMaxTextField.setText(String.valueOf(sliderComboBox.getValue().slider.getMax()));
}
private void appendMicCheckBoxes(List<CheckBox> checkBoxes, List<String> labels, Element root, Document document) {

10
src/main/resources/fxml/effects.fxml
Wyświetl plik

@ -26,11 +26,11 @@
<CheckBox fx:id="smoothingCheckBox" layoutX="14.0" layoutY="220.0" mnemonicParsing="false" text="Smoothing" />
<Slider fx:id="smoothingSlider" blockIncrement="0.005" disable="true" layoutX="154.0" layoutY="222.0" majorTickUnit="0.1" max="1.0" minorTickCount="1" prefHeight="38.0" prefWidth="219.0" showTickLabels="true" showTickMarks="true" value="0.125" />
<SVGPath fx:id="smoothingMidi" content="M20.15 8.26H22V15.74H20.15M13 8.26H18.43C19 8.26 19.3 8.74 19.3 9.3V14.81C19.3 15.5 19 15.74 18.38 15.74H13V11H14.87V13.91H17.5V9.95H13M10.32 8.26H12.14V15.74H10.32M2 8.26H8.55C9.1 8.26 9.41 8.74 9.41 9.3V15.74H7.59V10.15H6.5V15.74H4.87V10.15H3.83V15.74H2Z" fill="WHITE" layoutX="373.0" layoutY="218.0" pickOnBounds="true" />
<CheckBox fx:id="traceMaxCheckBox" layoutX="15.0" layoutY="302.0" mnemonicParsing="false" text="Trace Max" />
<Slider fx:id="traceMaxSlider" blockIncrement="0.005" disable="true" layoutX="155.0" layoutY="304.0" majorTickUnit="0.1" max="1.0" prefHeight="38.0" prefWidth="219.0" showTickLabels="true" showTickMarks="true" value="0.5" />
<SVGPath fx:id="traceMaxMidi" content="M20.15 8.26H22V15.74H20.15M13 8.26H18.43C19 8.26 19.3 8.74 19.3 9.3V14.81C19.3 15.5 19 15.74 18.38 15.74H13V11H14.87V13.91H17.5V9.95H13M10.32 8.26H12.14V15.74H10.32M2 8.26H8.55C9.1 8.26 9.41 8.74 9.41 9.3V15.74H7.59V10.15H6.5V15.74H4.87V10.15H3.83V15.74H2Z" fill="WHITE" layoutX="374.0" layoutY="300.0" pickOnBounds="true" />
<CheckBox fx:id="traceMaxCheckBox" layoutX="15.0" layoutY="300.0" mnemonicParsing="false" text="Trace Max" />
<Slider fx:id="traceMaxSlider" blockIncrement="0.005" disable="true" layoutX="155.0" layoutY="302.0" majorTickUnit="0.1" max="1.0" prefHeight="38.0" prefWidth="219.0" showTickLabels="true" showTickMarks="true" value="0.5" />
<SVGPath fx:id="traceMaxMidi" content="M20.15 8.26H22V15.74H20.15M13 8.26H18.43C19 8.26 19.3 8.74 19.3 9.3V14.81C19.3 15.5 19 15.74 18.38 15.74H13V11H14.87V13.91H17.5V9.95H13M10.32 8.26H12.14V15.74H10.32M2 8.26H8.55C9.1 8.26 9.41 8.74 9.41 9.3V15.74H7.59V10.15H6.5V15.74H4.87V10.15H3.83V15.74H2Z" fill="WHITE" layoutX="374.0" layoutY="298.0" pickOnBounds="true" />
<ComboBox fx:id="wobbleComboBox" layoutX="404.0" layoutY="175.0" prefHeight="26.0" prefWidth="102.0" />
<ComboBox fx:id="traceMaxComboBox" layoutX="405.0" layoutY="297.0" prefHeight="26.0" prefWidth="102.0" />
<ComboBox fx:id="traceMaxComboBox" layoutX="405.0" layoutY="295.0" prefHeight="26.0" prefWidth="102.0" />
<ComboBox fx:id="smoothingComboBox" layoutX="404.0" layoutY="215.0" prefHeight="26.0" prefWidth="102.0" />
<ComboBox fx:id="horizontalDistortComboBox" layoutX="404.0" layoutY="133.0" prefHeight="26.0" prefWidth="102.0" />
<ComboBox fx:id="verticalDistortComboBox" layoutX="404.0" layoutY="91.0" prefHeight="26.0" prefWidth="102.0" />
@ -42,7 +42,7 @@
<CheckBox fx:id="horizontalDistortMic" layoutX="517.0" layoutY="137.0" mnemonicParsing="false" text="Mic" />
<CheckBox fx:id="wobbleMic" layoutX="517.0" layoutY="179.0" mnemonicParsing="false" text="Mic" />
<CheckBox fx:id="smoothingMic" layoutX="517.0" layoutY="219.0" mnemonicParsing="false" text="Mic" />
<CheckBox fx:id="traceMaxMic" layoutX="518.0" layoutY="301.0" mnemonicParsing="false" text="Mic" />
<CheckBox fx:id="traceMaxMic" layoutX="518.0" layoutY="299.0" mnemonicParsing="false" text="Mic" />
<CheckBox fx:id="traceMinCheckBox" layoutX="15.0" layoutY="260.0" mnemonicParsing="false" text="Trace Min" />
<Slider fx:id="traceMinSlider" blockIncrement="0.005" disable="true" layoutX="155.0" layoutY="262.0" majorTickUnit="0.1" max="1.0" prefHeight="38.0" prefWidth="219.0" showTickLabels="true" showTickMarks="true" value="0.5" />
<SVGPath fx:id="traceMinMidi" content="M20.15 8.26H22V15.74H20.15M13 8.26H18.43C19 8.26 19.3 8.74 19.3 9.3V14.81C19.3 15.5 19 15.74 18.38 15.74H13V11H14.87V13.91H17.5V9.95H13M10.32 8.26H12.14V15.74H10.32M2 8.26H8.55C9.1 8.26 9.41 8.74 9.41 9.3V15.74H7.59V10.15H6.5V15.74H4.87V10.15H3.83V15.74H2Z" fill="WHITE" layoutX="374.0" layoutY="258.0" pickOnBounds="true" />