kopia lustrzana https://github.com/jameshball/osci-render
Add option to open software oscilloscope online
rodzic
ade45fa9e6
commit
d454970c28
|
@ -51,6 +51,10 @@ public class Gui extends Application {
|
||||||
Scene scene = new Scene(root);
|
Scene scene = new Scene(root);
|
||||||
scene.getStylesheets().add(getClass().getResource("/css/main.css").toExternalForm());
|
scene.getStylesheets().add(getClass().getResource("/css/main.css").toExternalForm());
|
||||||
|
|
||||||
|
controller.setSoftwareOscilloscopeAction(() -> {
|
||||||
|
getHostServices().showDocument("https://james.ball.sh/oscilloscope");
|
||||||
|
});
|
||||||
|
|
||||||
scene.addEventHandler(KeyEvent.KEY_PRESSED, (event -> {
|
scene.addEventHandler(KeyEvent.KEY_PRESSED, (event -> {
|
||||||
switch (event.getCode()) {
|
switch (event.getCode()) {
|
||||||
// frame selection controls
|
// frame selection controls
|
||||||
|
|
|
@ -163,6 +163,8 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
|
||||||
private MenuItem recordMenuItem;
|
private MenuItem recordMenuItem;
|
||||||
@FXML
|
@FXML
|
||||||
private Spinner<Double> recordLengthSpinner;
|
private Spinner<Double> recordLengthSpinner;
|
||||||
|
@FXML
|
||||||
|
private MenuItem softwareOscilloscopeMenuItem;
|
||||||
|
|
||||||
public MainController() throws Exception {
|
public MainController() throws Exception {
|
||||||
// Clone DEFAULT_OBJ InputStream using a ByteArrayOutputStream
|
// Clone DEFAULT_OBJ InputStream using a ByteArrayOutputStream
|
||||||
|
@ -477,6 +479,10 @@ public class MainController implements Initializable, FrequencyListener, MidiLis
|
||||||
new Thread(() -> sendAudioDataToWebSocket(webSocketServer)).start();
|
new Thread(() -> sendAudioDataToWebSocket(webSocketServer)).start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setSoftwareOscilloscopeAction(Runnable openBrowser) {
|
||||||
|
softwareOscilloscopeMenuItem.setOnAction((e) -> openBrowser.run());
|
||||||
|
}
|
||||||
|
|
||||||
private void sendAudioDataToWebSocket(ByteWebSocketServer server) {
|
private void sendAudioDataToWebSocket(ByteWebSocketServer server) {
|
||||||
while (true) {
|
while (true) {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -154,6 +154,11 @@
|
||||||
</CustomMenuItem>
|
</CustomMenuItem>
|
||||||
</items>
|
</items>
|
||||||
</Menu>
|
</Menu>
|
||||||
|
<Menu mnemonicParsing="false" text="Window">
|
||||||
|
<items>
|
||||||
|
<MenuItem fx:id="softwareOscilloscopeMenuItem" mnemonicParsing="false" text="Open Software Oscilloscope" />
|
||||||
|
</items>
|
||||||
|
</Menu>
|
||||||
</menus>
|
</menus>
|
||||||
</MenuBar>
|
</MenuBar>
|
||||||
<TitledPane animated="false" collapsible="false" layoutX="7.0" layoutY="33.0" prefHeight="371.0" prefWidth="378.0" text="Main settings">
|
<TitledPane animated="false" collapsible="false" layoutX="7.0" layoutY="33.0" prefHeight="371.0" prefWidth="378.0" text="Main settings">
|
||||||
|
|
Ładowanie…
Reference in New Issue