diff --git a/out/artifacts/Virtueller_Gesundheitsassistent_jar/Virtueller_Gesundheitsassistent.jar b/out/artifacts/Virtueller_Gesundheitsassistent_jar/Virtueller_Gesundheitsassistent.jar index 18b2bce..41e4680 100644 Binary files a/out/artifacts/Virtueller_Gesundheitsassistent_jar/Virtueller_Gesundheitsassistent.jar and b/out/artifacts/Virtueller_Gesundheitsassistent_jar/Virtueller_Gesundheitsassistent.jar differ diff --git a/src/main/java/vassistent/controller/AppWindowController.java b/src/main/java/vassistent/controller/AppWindowController.java index d49d2a2..647c00e 100644 --- a/src/main/java/vassistent/controller/AppWindowController.java +++ b/src/main/java/vassistent/controller/AppWindowController.java @@ -42,15 +42,6 @@ public class AppWindowController { StreamingController previewController = new StreamingController(pixelStreamingView); - dashboardView.getReloadPixelStreamingViewButton() - .addActionListener(e -> - previewController.reloadStream("http://141.75.215.233") - ); - - dashboardView.getOpenFullscreenButton() - .addActionListener(e -> - window.getStreamingView().requestFocus()); - window.addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { diff --git a/src/main/java/vassistent/controller/DashboardController.java b/src/main/java/vassistent/controller/DashboardController.java index 04da970..afd4195 100644 --- a/src/main/java/vassistent/controller/DashboardController.java +++ b/src/main/java/vassistent/controller/DashboardController.java @@ -13,7 +13,6 @@ public class DashboardController { private final StatisticsService statisticsService; private final DashboardView dashboardView; - private long lastDataVersion = -1; public DashboardController( StatisticsService statisticsService, @@ -44,11 +43,4 @@ public class DashboardController { } }); } - - public void loadChartData() { - - List points = statisticsService.getLastNAverages(20); - - dashboardView.updateChart(points); - } } diff --git a/src/main/java/vassistent/ui/DashboardView.java b/src/main/java/vassistent/ui/DashboardView.java index 2b07919..c764c99 100644 --- a/src/main/java/vassistent/ui/DashboardView.java +++ b/src/main/java/vassistent/ui/DashboardView.java @@ -115,33 +115,9 @@ public class DashboardView extends JPanel { card.add(chartPanel, BorderLayout.CENTER); - // ---------- SOUTH: Preview + Buttons ---------- - card.add(createBottomPanel(), BorderLayout.SOUTH); - add(card, BorderLayout.CENTER); } - private JPanel createBottomPanel() { - - JPanel panel = new JPanel(new BorderLayout()); - panel.setBorder(BorderFactory.createEmptyBorder(10,0,0,0)); - - JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT,10,5)); - - reloadPixelStreamingViewButton = new JButton("Reload Preview"); - openFullscreenButton = new JButton("Open Fullscreen"); - - reloadPixelStreamingViewButton.putClientProperty("JButton.buttonType", "roundRect"); - openFullscreenButton.putClientProperty("JButton.buttonType", "roundRect"); - - buttonPanel.add(reloadPixelStreamingViewButton); - buttonPanel.add(openFullscreenButton); - - panel.add(buttonPanel, BorderLayout.SOUTH); - - return panel; - } - public void updateChart(List points) { if (points == null || points.isEmpty()) return; diff --git a/src/main/resources/scripts/start_avatar.ps1 b/src/main/resources/scripts/start_avatar.ps1 index 92d94cf..383b71b 100644 --- a/src/main/resources/scripts/start_avatar.ps1 +++ b/src/main/resources/scripts/start_avatar.ps1 @@ -7,7 +7,7 @@ $signallingBat = "C:\Users\Student\Documents\Dannick\avatar\Windows\Prototyp1\Sa $ueWorkingDir = "C:\Users\Student\Documents\Dannick\avatar\Windows" -$signalling = Start-Process -FilePath $signallingBat -PassThru +$signalling = Start-Process -FilePath $signallingBat -PassThru -WindowStyle Hidden Start-Sleep -Seconds 5