Merge pull request #1039 from ess-dmsc/Change-of-camera-type

Change to orbit camera as Constructor does not need to run Doom
ess-dmsc · Sep 26, 2023 · a7b100e · a7b100e
2 parents dd9be10 + f10255e
commit a7b100e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/nexus_constructor/instrument_view/instrument_view.py b/nexus_constructor/instrument_view/instrument_view.py
@@ -116,7 +116,7 @@ def __init__(self, parent, main_window):
         }
         self.current_camera_settings = deepcopy(self.default_camera_settings)
         self.camera_entity = self.view.camera()
-        self.cam_controller = Qt3DExtras.QFirstPersonCameraController(self.root_entity)
+        self.cam_controller = Qt3DExtras.QOrbitCameraController(self.root_entity)
         self.switch_to_perspective()
 
         # Make sure that the size of the gnomon stays the same when the 3D view is resized

diff --git a/nexus_constructor/json/load_from_json_utils.py b/nexus_constructor/json/load_from_json_utils.py
@@ -9,7 +9,7 @@
     NodeType,
 )
 
-DEPENDS_ON_IGNORE = [None, 'None', ".", ""]
+DEPENDS_ON_IGNORE = [None, "None", ".", ""]
 
 
 def _find_shape_information(children: List[Dict]) -> Union[Dict, None]:

diff --git a/nx-class-documentation/html/index.html b/nx-class-documentation/html/index.html
@@ -109,7 +109,7 @@ <h1>User Manual and Reference Documentation<a class="headerlink" href="#user-man
 </div>
 <hr class="docutils" />
 <p class="rubric">Publishing Information</p>
-<p>This manual built Sep 18, 2023.</p>
+<p>This manual built Sep 21, 2023.</p>
 <div class="admonition seealso">
 <p class="admonition-title">See also</p>
 <p>This document is available in these formats online:</p>

diff --git a/nx-class-documentation/html/searchindex.js b/nx-class-documentation/html/searchindex.js
diff --git a/tests/json/test_load_from_json.py b/tests/json/test_load_from_json.py
@@ -351,12 +351,7 @@ def test_GIVEN_json_with_component_depending_on_non_existent_transform_WHEN_load
 
 @pytest.mark.parametrize(
     "depends_on_path",
-    [
-        ".",
-        "",
-        'None',
-        None
-    ],
+    [".", "", "None", None],
 )
 def test_GIVEN_json_with_component_with_null_depends_on_WHEN_loaded_THEN_no_effect(
     json_dict_with_component, json_reader, depends_on_path