ECDC-3518-only-partial-depends-on-support

nexus_constructor/json/load_from_json.py

@@ -114,8 +114,19 @@ def _set_components_depends_on(self):
             except KeyError:
                 self.warnings.append(
                     TransformDependencyMissing(
-                        f"Component {component_name} depends on {depends_on_id.transform_name} in component "
-                        f"{depends_on_id.component_name}, but that transform was not successfully loaded from the JSON"
+                        f"Component {component_name} depends on "
+                        + (
+                            depends_on_id.transform_name
+                            if depends_on_id is not None
+                            else "Unknown"
+                        )
+                        + " in component "
+                        + (
+                            depends_on_id.component_name
+                            if depends_on_id is not None
+                            else "Unknown"
+                        )
+                        + ", but that transform was not successfully loaded from the JSON"
                     )
                 )
 
@@ -139,9 +150,19 @@ def _set_transforms_depends_on(self):
             except KeyError:
                 self.warnings.append(
                     TransformDependencyMissing(
-                        f"Transformation {transform_id.transform_name} in component {transform_id.component_name} "
-                        f"depends on {depends_on_id.transform_name} in component {depends_on_id.component_name}, "
-                        f"but that transform was not successfully loaded from the JSON"
+                        f"Transformation {transform_id.transform_name} in component {transform_id.component_name} depends on "
+                        + (
+                            depends_on_id.transform_name
+                            if depends_on_id is not None
+                            else "Unknown"
+                        )
+                        + " in component "
+                        + (
+                            depends_on_id.component_name
+                            if depends_on_id is not None
+                            else "Unknown"
+                        )
+                        + ", but that transform was not successfully loaded from the JSON"
                     )
                 )
 
@@ -376,11 +397,16 @@ def _add_transform_and_shape_to_component(self, component, children_dict):
         )
         transformation_reader.add_transformations_to_component()
         self.warnings += transformation_reader.warnings
-        depends_on_path = _find_depends_on_path(children_dict, component.name)
-        if depends_on_path not in DEPENDS_ON_IGNORE:
-            depends_on_id = TransformId(
-                *get_component_and_transform_name(depends_on_path)
-            )
+        depends_on = _find_depends_on_path(children_dict, component.name)
+        if depends_on not in [".", "", None]:
+            if depends_on[0] != "/":
+                #   we are always in the NXtransformations group but the path could be anything
+                if len(depends_on.split("/")) == 2:
+                    depends_on = depends_on.split("/")[1]
+                depends_on = component.absolute_path + "/transformations/" + depends_on
+
+        if depends_on not in DEPENDS_ON_IGNORE:
+            depends_on_id = TransformId(*get_component_and_transform_name(depends_on))
             self._components_depends_on[component.name] = (component, depends_on_id)
         else:
             self._components_depends_on[component.name] = (component, None)

nexus_constructor/json/transformation_reader.py

@@ -306,6 +306,14 @@ def _create_transformations(self, json_transformations: list):
             depends_on = _find_attribute_from_list_or_dict(
                 CommonAttrs.DEPENDS_ON, attributes
             )
+            if depends_on not in [".", "", None]:
+                if depends_on[0] != "/":
+                    depends_on = (
+                        self.parent_component.absolute_path
+                        + "/transformations/"
+                        + depends_on
+                    )
+
             if module == DATASET:
                 values = self._get_transformation_attribute(
                     CommonKeys.VALUES, config, name
@@ -319,15 +327,14 @@ def _create_transformations(self, json_transformations: list):
                 angle_or_magnitude = 0.0
             else:
                 continue
-            temp_depends_on = None
 
             transform = self.parent_component._create_and_add_transform(
                 name=name,
                 transformation_type=transformation_type,
                 angle_or_magnitude=angle_or_magnitude,
                 units=units,
                 vector=QVector3D(*vector),
-                depends_on=temp_depends_on,
+                depends_on=None,
                 values=values,
             )
             offset = self._find_attribute_in_list(CommonAttrs.OFFSET, name, attributes)

nx-class-documentation/html/_static/pygments.css

@@ -17,6 +17,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .highlight .cs { color: #60a0b0; background-color: #fff0f0 } /* Comment.Special */
 .highlight .gd { color: #A00000 } /* Generic.Deleted */
 .highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
 .highlight .gr { color: #FF0000 } /* Generic.Error */
 .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
 .highlight .gi { color: #00A000 } /* Generic.Inserted */

nx-class-documentation/html/applying-nexus.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>1.3. Constructing NeXus Files and Application Definitions &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="_static/blockquote.css" type="text/css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/authorgroup.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>9.1. Authors &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="_static/blockquote.css" type="text/css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXarchive.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.1. NXarchive &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXarpes.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.2. NXarpes &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXcanSAS.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.3. NXcanSAS &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXdirecttof.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.4. NXdirecttof &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXfluo.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.5. NXfluo &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXindirecttof.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.6. NXindirecttof &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXiqproc.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.7. NXiqproc &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXlauetof.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.8. NXlauetof &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXmonopd.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.9. NXmonopd &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXmx.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.10. NXmx &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXrefscan.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.11. NXrefscan &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXreftof.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.12. NXreftof &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXsas.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.13. NXsas &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXsastof.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.14. NXsastof &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXscan.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.15. NXscan &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXspe.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.16. NXspe &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXsqom.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.17. NXsqom &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>

nx-class-documentation/html/classes/applications/NXstxm.html

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>3.3.2.18. NXstxm &#8212; nexus v2020.10 documentation</title>
-    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b849a4e9" />
+    <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=649a27d8" />
     <link rel="stylesheet" type="text/css" href="../../_static/sphinxdoc.css?v=0a676766" />
     <link rel="stylesheet" href="../../_static/blockquote.css" type="text/css" />
     <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js?v=a16566f4"></script>