deploy: 1fbf901

Author: jmsmkn

_modules/grandchallenge/components/models.html

@@ -1377,13 +1377,20 @@ <h1>Source code for grandchallenge.components.models</h1><div class="highlight">
 
     <span class="nd">@property</span>
     <span class="k">def</span><span class="w"> </span><span class="nf">title</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">value</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">super_kind</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">SuperKind</span><span class="o">.</span><span class="n">VALUE</span><span class="p">:</span>
             <span class="k">return</span> <span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">value</span><span class="p">)</span>
-        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">file</span><span class="p">:</span>
+        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">super_kind</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">SuperKind</span><span class="o">.</span><span class="n">IMAGE</span><span class="p">:</span>
+            <span class="k">try</span><span class="p">:</span>
+                <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">image</span><span class="o">.</span><span class="n">name</span>
+            <span class="k">except</span> <span class="ne">AttributeError</span><span class="p">:</span>
+                <span class="k">return</span> <span class="s2">&quot;&quot;</span>
+        <span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">super_kind</span> <span class="o">==</span> <span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">SuperKind</span><span class="o">.</span><span class="n">FILE</span><span class="p">:</span>
             <span class="k">return</span> <span class="n">Path</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">file</span><span class="o">.</span><span class="n">name</span><span class="p">)</span><span class="o">.</span><span class="n">name</span>
-        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">image</span><span class="p">:</span>
-            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">image</span><span class="o">.</span><span class="n">name</span>
-        <span class="k">return</span> <span class="s2">&quot;&quot;</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span>
+                <span class="sa">f</span><span class="s2">&quot;Title not implemented for interface super kind: </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">super_kind</span><span class="si">}</span><span class="s2">&quot;</span>
+            <span class="p">)</span>
+            <span class="k">return</span> <span class="s2">&quot;&quot;</span>
 
     <span class="nd">@property</span>
     <span class="k">def</span><span class="w"> </span><span class="nf">has_value</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
@@ -1415,10 +1422,10 @@ <h1>Source code for grandchallenge.components.models</h1><div class="highlight">
         <span class="p">)</span>
 
     <span class="k">def</span><span class="w"> </span><span class="fm">__str__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">value</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
-            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">title</span>
-        <span class="k">else</span><span class="p">:</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="o">.</span><span class="n">is_json_kind</span><span class="p">:</span>
             <span class="k">return</span> <span class="sa">f</span><span class="s2">&quot;Component Interface Value </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">pk</span><span class="si">}</span><span class="s2"> for </span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">interface</span><span class="si">}</span><span class="s2">&quot;</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">title</span>
 
 <div class="viewcode-block" id="ComponentInterfaceValue.save">
 <a class="viewcode-back" href="../../../components.html#grandchallenge.components.models.ComponentInterfaceValue.save">[docs]</a>

components.html

@@ -428,54 +428,54 @@ <h3>Navigation</h3>
 <dd><p>Interface kind sets.</p>
 <div class="highlight-none notranslate"><div class="highlight"><pre><span></span>Interface kinds that are images:
 
+  - Heat Map
   - Segmentation
   - DICOM Image Set
   - Displacement field
-  - Heat Map
   - Image
 
 
 Interface kinds that are files:
 
-  - BIOM format
-  - Thumbnail jpg
-  - SQREG file
-  - CSV file
   - MP4 file
   - OBJ file
-  - Newick tree-format file
+  - BIOM format
+  - CSV file
+  - Thumbnail jpg
   - Thumbnail png
   - ZIP file
+  - Newick tree-format file
   - PDF file
+  - SQREG file
 
 
 Interface kinds that are json serializable:
 
-  - Integer
-  - Multiple choice
-  - 2D bounding box
-  - Ellipse
-  - Multiple angles
-  - Multiple points
-  - String
-  - Chart
-  - Choice
   - Angle
-  - Point
-  - Multiple distance measurements
-  - Multiple polygons
-  - Three-point angle
   - Line
-  - Affine transform registration
-  - Polygon
+  - Integer
   - Anything
+  - Multiple angles
+  - Ellipse
   - Float
-  - Bool
-  - Distance measurement
-  - Multiple ellipses
   - Multiple three-point angles
+  - Multiple ellipses
+  - Multiple choice
+  - Point
   - Multiple 2D bounding boxes
+  - Affine transform registration
+  - Polygon
+  - Bool
+  - Chart
+  - 2D bounding box
+  - String
+  - Multiple polygons
   - Multiple lines
+  - Multiple distance measurements
+  - Multiple points
+  - Three-point angle
+  - Distance measurement
+  - Choice
 
 
 Example JSON file contents for String: