diff --git a/out/artifacts/Virtueller_Gesundheitsassistent_jar/Virtueller_Gesundheitsassistent.jar b/out/artifacts/Virtueller_Gesundheitsassistent_jar/Virtueller_Gesundheitsassistent.jar index b3582a3..7b58b66 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/service/ProcessManagerService.java b/src/main/java/vassistent/service/ProcessManagerService.java index cdfeaeb..289c69c 100644 --- a/src/main/java/vassistent/service/ProcessManagerService.java +++ b/src/main/java/vassistent/service/ProcessManagerService.java @@ -88,11 +88,12 @@ public class ProcessManagerService { private void startUnrealEngine() throws IOException { + String unrealPsScript = config.getProperty("unreal.executable"); ProcessBuilder pb = new ProcessBuilder( "powershell.exe", "-ExecutionPolicy", "Bypass", "-File", - "C:\\Users\\Student\\Documents\\Dannick\\avatar\\start_avatar.ps1" + unrealPsScript ); unrealProcess = pb.start(); diff --git a/src/main/java/vassistent/ui/AppWindow.java b/src/main/java/vassistent/ui/AppWindow.java index 3d597b4..2ff14f5 100644 --- a/src/main/java/vassistent/ui/AppWindow.java +++ b/src/main/java/vassistent/ui/AppWindow.java @@ -4,6 +4,7 @@ import vassistent.bootstrap.ApplicationContext; import vassistent.controller.DashboardController; import javax.swing.*; +import javax.swing.border.Border; import java.awt.*; public class AppWindow extends JFrame { @@ -22,7 +23,7 @@ public class AppWindow extends JFrame { setSize(1400, 850); setLocationRelativeTo(null); - setLayout(new BorderLayout()); + setLayout(new BorderLayout(10,10)); streamingView = new PixelStreamingView( "http://localhost", @@ -35,6 +36,10 @@ public class AppWindow extends JFrame { tabs = createTabPane(); add(tabs, BorderLayout.CENTER); add(createStatusBar(), BorderLayout.SOUTH); + + Font uiFont = new Font("Segoe UI", Font.PLAIN, 14); + UIManager.put("Label.font", uiFont); + UIManager.put("TabbedPane.font", uiFont); } // ---------------- Tabs ---------------- @@ -42,8 +47,9 @@ public class AppWindow extends JFrame { private JTabbedPane createTabPane() { JTabbedPane tabs = new JTabbedPane(); + tabs.setBorder(BorderFactory.createEmptyBorder(10,10,10,10)); - JPanel streamingPanel = new JPanel(new BorderLayout()); + JPanel streamingPanel = new JPanel(new BorderLayout(10,10)); streamingPanel.add(streamingView, BorderLayout.CENTER); tabs.addTab("Avatar Streaming", streamingView); @@ -56,7 +62,12 @@ public class AppWindow extends JFrame { private JPanel createStatusBar() { - JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT,15,5)); + + statusBar.setBorder(BorderFactory.createCompoundBorder( + BorderFactory.createMatteBorder(1,0,0,0, Color.LIGHT_GRAY), + BorderFactory.createEmptyBorder(5,10,5,10) + )); mqttStatusLabel = new JLabel("MQTT: Disconnected"); problemLevelLabel = new JLabel("Problem: NONE"); diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties index fbf4b74..c8ae2e4 100644 --- a/src/main/resources/config/application.properties +++ b/src/main/resources/config/application.properties @@ -13,5 +13,5 @@ mqtt_sim.script=src/main/resources/scripts/mqtt_simulator.py # ===== UNREAL ENGINE ===== unreal.enabled=true -unreal.executable="C:\\Users\\Student\\Documents\\Dannick\\avatar\\Windows\\Prototyp1.exe -PixelStreamingURL=ws://127.0.0.1:8888 -RenderOffscreen -noaudio" +unreal.executable="C:\\Users\\Student\\Documents\\Dannick\\avatar\\start_avatar.ps1" unreal.signalling_server.script=C:\\Users\\Student\\Documents\\Dannick\\avatar\\Windows\\Prototyp1\\Samples\\PixelStreaming\\WebServers\\SignallingWebServer\\platform_scripts\\cmd\\start_with_stun.bat \ No newline at end of file diff --git a/src/main/resources/scripts/start_avatar.ps1 b/src/main/resources/scripts/start_avatar.ps1 new file mode 100644 index 0000000..92d94cf --- /dev/null +++ b/src/main/resources/scripts/start_avatar.ps1 @@ -0,0 +1,22 @@ +$pidDir = "C:\Users\Student\Documents\Dannick\avatar" + +$ueExe = "C:\Users\Student\Documents\Dannick\avatar\Windows\Prototyp1.exe" +$ueArgs = "-PixelStreamingURL=ws://127.0.0.1 -RenderOffscreen -PixelStreamingWebRTCDisableTransmitAudio" + +$signallingBat = "C:\Users\Student\Documents\Dannick\avatar\Windows\Prototyp1\Samples\PixelStreaming\WebServers\SignallingWebServer\platform_scripts\cmd\start_with_stun.bat" + +$ueWorkingDir = "C:\Users\Student\Documents\Dannick\avatar\Windows" + +$signalling = Start-Process -FilePath $signallingBat -PassThru + +Start-Sleep -Seconds 5 + +$ue = Start-Process ` + -FilePath $ueExe ` + -ArgumentList $ueArgs ` + -WorkingDirectory $ueWorkingDir ` + -PassThru + +$ue.Id | Out-File "$pidDir\unreal.pid" -Encoding ascii +$signalling.Id | Out-File "$pidDir\signalling.pid" -Encoding ascii +