Merge branch 'feature/vr-lab'

.gitignore

@@ -19,3 +19,4 @@ ipython_config.py
 # End of https://www.toptal.com/developers/gitignore/api/jupyternotebooks
 _build
 .DS_Store
+.vscode

_toc.yml

@@ -27,12 +27,7 @@ chapters:
   - file: content/04_cluster/2_jupyterhub
   - file: content/04_cluster/3_slurm
 - file: content/05_projects/0_intro
-# - file: content/06_vr/0_intro
-#   sections:
-#   - file: content/06_vr/1_paraview
-#   - file: content/06_vr/2_advanced
-#- file: content/07_hub/0_intro
- # sections:
- # - file: content/07_hub/1_programming_basics
- # - file: content/07_hub/2_ml_basics
- # - file: content/07_hub/3_datadrivenmodeling
\ No newline at end of file
+- file: content/06_vr/0_intro
+  sections:
+  - file: content/06_vr/1_paraview
+  - file: content/06_vr/2_advanced

content/06_vr/0_intro.md

@@ -6,26 +6,51 @@ Das VR-Lab is located in the [ZeBra - Zentrum für Brandforschung](https://www.t
 Address:
 Beethovenstraße 52, Gebäude 2439
 
- ```{figure} ../../figures/vr-lab/location-zebra.png
----
-align: center
----
-
-```
+<img src="../../figures/vr-lab/location-zebra.png" alt="Drawing" style="width: 250px;"/>
 
 ## Reservation
 Room reservation of the AR-Lab by mail to
 - Beate Jaworski [B.Jaworski@ibmb.tu-bs.de](mailto:B.Jaworski@ibmb.tu-bs.de)
+- or Artur Warchalowski [B.Jaworski@ibmb.tu-bs.de](mailto:A.Warchalowski@ibmb.tu-bs.de)
 
 ## Key for the VR-Lab
 The key for the VR-Lab can be picked up at the iRMB institute from the administration team Michael Kos or [Fritz Lewall](https://www.tu-braunschweig.de/irmb/institut/mitarbeiter/lewall).
 
 ##  General Usage
-At first the VR-Desk must be pulled out of the projector room and into the main room. The VR-Desk is equipped with a Monitor, Mouse, Keyboard, VR-Glasses and a iPad. The Power and the Lan Connector needs to be connected to the floor outlets next to the window.
+### Set up
+At first the VR-Desk must be pulled out of the projector room and into the main room. The VR-Desk is equipped with a Monitor, Mouse, Keyboard, VR-Glasses and a iPad. It might be necessary to make some space by moving the conference table.
+
+<img src="../../figures/vr-lab/table.jpeg" alt="Drawing" style="width: 500px;"/>
+
+The Power and the LAN Connector needs to be connected to the floor outlets next to the window.
+
+<table><tr>
+<td> <img src="../../figures/vr-lab/outlet1.jpeg" alt="Drawing" style="width: 250px;"/> </td>
+<td> <img src="../../figures/vr-lab/outlet2.jpeg" alt="Drawing" style="width: 250px;"/> </td>
+</tr></table>
+
+Currently, it is necessary to switch on the computer in the hardware-room manually. The computer is located in the rack at the bottom.
+
+<img src="../../figures/vr-lab/pc.jpeg" alt="Drawing" style="width: 500px;"/> 
+
 
-Afterwards using the iPad one can switch on the projector system and choose between the following options:
+Afterwards the projector can be switched on using the iPad by clicking on the "VR-Lab" App Icon.
 
+<img src="../../figures/vr-lab/ipad-home.jpeg" alt="Drawing" style="width: 500px;"/>
+
+This opens the VR-Lab Media Controller, which can be used to control the projector. Choose "Power" to switch on the projector and the devices in the hardware-room.
+
+<img src="../../figures/vr-lab/ipad-steuerung.jpeg" alt="Drawing" style="width: 500px;"/> 
+
+Afterwards, the VR-Lab App provides the following options:
+- VR: enables the 3D VR-Mode, which can be used with [Paraview](./1_paraview.md)
 - Presentation: extends the PC-Desktop to the projector
-- Click Share: allows to connect any device connected to usb-click share device to the projector
-- VR Modus: enables the 3D VR-Mode, which can be used with [Paraview](./1_paraview.md)
-- Laptop: enables the HDMI input located in the floor next to the window
\ No newline at end of file
+- Clickshare: allows to connect any device connected to usb-click share device to the projector
+- Laptop: enables the HDMI input located in the floor outlet next to the window
+
+### Tear Down
+The teardown is the reverse order of the setup. First the PC needs to be shut down and the mouse and keyboard can be switch off. Afterwards the projector can be switched off using the iPad by clicking on the "VR-Lab" App Icon and choosing "Power" and "Shutdown". Afterwards the VR-Desk must be pushed back into the projector room.
+
+The room should always be left as it was found. I.e., return tables and chairs to their original position. Close windows, open blinds and switch off lights. 
+
+Please make sure that you lock both, the hardware-room and the main door when you leave the room.
\ No newline at end of file

content/06_vr/1_paraview.md

 # Paraview in VR-Mode
-1. Start the PC and the overall environment using the Ipad.  Then choose VR-Modus on the Ipad.
-2. On the PC run the following programs in this order:
-    1. Start VRPN Server -> Connects you to the tracking [https://github.com/vrpn/vrpn](https://github.com/vrpn/vrpn)
-    2. pvserver.exe -> Starts the paraview server and allows the communication to the 3d window
-    3. Paraview.exe
+1. As described in the [introduction](./0_intro.md) start the PC manually and the overall environment using the iPad. Then choose VR on the iPad in order to start the VR-mode.
+2. Log In on the PC. Password: *icuser77*
 
-In Paraview:
-1. Menu -> File -> Connect -> "PowerWall TU Braunschweig" -> Connect
-2. "Restore VR State" (usually in the bottom left of the paraview window) -> Funktioniert_01.pvvr
-3. "Start"
+## On the Desktop
+On the PC run the following programs located on the Desktop in this order:
+1. "0. VRPN Server" → Connects you to the tracking. More information about this program can be found on [GitHub](https://github.com/vrpn/vrpn). This program needs  to be minimized and run in the background.
+2. "1. pvserver.exe" → Starts the Paraview server and allows the communication to the 3d window. This program needs to be minimized and run in the background.
+3. "2. Paraview.exe"
 
-Now you can use the targets Tracking-Glasses and Tracking-Controller to interact with the 3d-Model. Glasses needs to to be switchted on.
+## In Paraview:
+1. Connect Paraview to the powerwall:
+   - File → Connect → "PowerWall TU Braunschweig" → Connect
+   - the warning "Adjusting stereo mode on a window that does not support stereo type CrystalEyes is not possible" can be ignored
+2. "Restore VR State" (usually in the bottom left of the Paraview window) → choose "C:/Users/Powerwall/Desktop/Paraview/Powerwall_01.pvvr" and click "OK". Afterwards click "Start" next to the "Restore VR State" Button.
+3. Add the last step you can now add simple geometries to the scene. For example a cylinder (Sources → Geometric Shapes → Cylinder) or you load and start working with your 3d Model.
+
+<video width="800" controls src="../../_static/videos/vr-lab.mp4"></video>
+
+Now you can use the targets Tracking-Glasses and Tracking-Controller to interact with the 3d-Model. The glass needs to be switched on by clicking the small black button on the temple of the glass. A red LED flashes briefly.
+<img src="../../figures/vr-lab/tracker.jpeg" alt="Drawing" style="width: 500px;"/>
 
 Please pull out the charging cable very carefully, the plug can break off quickly!
 
-<video width="800" controls src="../../_static/videos/Paraview.mp4"></video>
+<!-- <video width="800" controls src="../../_static/videos/Paraview.mp4"></video> -->
 

content/06_vr/2_advanced.md

 # Advanced Settings
-Attention: Only do the following things if changes have been made to the default settings and in coordination with Jan Linxweiler, Konstantin Kutscher or Sören Peters.
+Attention: Only do the following things if changes have been made to the default settings and in coordination with Jan Linxweiler, Sören Peters or Konstantin Kutscher from the [iRMB](ttps://www.tu-braunschweig.de/irmb).
 
-<video width="800" controls src="../../_static/videos/Settings-Display.mp4"></video>
+## Graphic Card Settings
+
+If the projector does not display the correct picture, it may help to check the NVIDIA settings.
+
+Open up the NVIDIA Control Panel and check the following settings:
+- Stereo - Aktivieren: Ein
+- Stereo - Anzeigemodus: Clone-Modus
+- Stereo - Augen Umkehrung: Aus
+
+<img src="../../figures/vr-lab/NVIDIA_3D.png" alt="Drawing" style="width: 500px;"/>
+
+Verify that on "Anzeige - Mehrere Anzeigen einrichten" the displays show up like on the following picture:
+<img src="../../figures/vr-lab/NVIDIA_Anzeigen.png" alt="Drawing" style="width: 500px;"/>
 
 ## Calibration
+The Calibration sets the coordinate system of the cameras in the room and is used to calculate the position of the "rigid-bodies" (tracking objects). Usually one is doing a calibration once a year or when someone moved or touched the cameras.
+
+### Doing calibration
+1. adjust the calibration stick and the calibration angle. Both can be found in a black case, which ist stored in the hardware room.
+   - Arrange the angle
+     - long side to the right
+     - short side to the front (towards the middle of the wall)
+     - 140 cm from the wall
+     - <img src="../../figures/vr-lab/angle.jpeg" alt="Drawing" style="width: 400px;"/>
+   - compose the calibration stick
+     - <img src="../../figures/vr-lab/stick.jpeg" alt="Drawing" style="width: 400px;"/>
+2. Open DTrack3 Software located on the Desktop on the PC and click connect and then click "Stop" (button on the top left)
+   - <img src="../../figures/vr-lab/dtrack.png" alt="Drawing" style="width: 800px;"/>
+3. on Menubar → DTrack3 → Configurations
+   - Configuration backups can be created and restored
+   - Click on "New" to create a new configuration
+   - <img src="../../figures/vr-lab/dtrack-config.png" alt="Drawing" style="width: 800px;"/>
+4. on Menubar → Tracking → Room Calibration
+   - in order to use Paraview, "Powerwall" needs to be set as coordinate system
+   - choose Room Calibration Set 410 (flat)
+   - Click "calibrate"
+   - <img src="../../figures/vr-lab/dtrack-calibration.png" alt="Drawing" style="width: 800px;"/>
+5. Move the calibration stick during the calibration process
+   - Hold it by the long side
+   - rotate the stick slightly 
+   - move it back and forth in front of the cameras.
+6. After the calibration a hint will appear that an offset, which was added before, will be overwritten. Ee add this offset again by going
+   - to Menubar → Tracking → Room Adjustment → Fine
+   - add 1170 mm to the y-offset → "OK"
+   - <img src="../../figures/vr-lab/dtrack-offset.png" alt="Drawing" style="width: 800px;"/>
+
+DONE → Tracking can be continued by clicking "Start"
+
+### Add a new body
+- click on Menubar → Tracking → Body Administration
+  - add new body (containing markers)
+  - <img src="../../figures/vr-lab/dtrack-body.png" alt="Drawing" style="width: 800px;"/>
+  - Click on "Calibration"
+    - coordinate system need to be "due to room"
+    - click "calibrate"
+      - calibration starts → please move the calibration stick in front of the cameras.
+      - Make sure no other targets are visible to the cameras
+      - Afterwards the number of detected markers should be displayed, and the calibration can be finished by clicking "OK"
+      - <img src="../../figures/vr-lab/dtrack-body2.png" alt="Drawing" style="width: 800px;"/>
+
 
-<video width="800" controls src="../../_static/videos/Calibration.mp4"></video>
+<!-- <video width="800" controls src="../../_static/videos/Calibration.mp4"></video>
 
-<video width="800" controls src="../../_static/videos/Backup_Calibration.mp4"></video>
+<video width="800" controls src="../../_static/videos/Backup_Calibration.mp4"></video> -->
 
 ## Projector Image Shift
 Using the frontend of the projector: [http://192.168.0.111:9999](http://192.168.0.111:9999)
 
- ```{figure} ../../figures/vr-lab/projector-frontend.png
-:width: 800px
-:align: center
-```
+<img src="../../figures/vr-lab/projector-frontend.png" alt="Drawing" style="width: 800px;"/>
 
 To support shifting the image one can add a Test Pattern under Image/Test Pattern.
-Additionally, the image can be shifted using the projector remote control (located in the installation room). However, this is very rough and should not be used for fine-tuning. The projector is mounted on a fixed platform and the lens can only be moved in a very small range. Therefore the image shift should be done using the frontend.
+Additionally, the image can be shifted using the projector remote control (located in the installation room). However, this is very rough and should not be used for fine-tuning. The projector is mounted on a fixed platform and the lens can only be moved in a very small range. Therefore, usually the image shift should be done using the frontend.