Skip to content

Commit

Permalink
Prepare for 3.1.4 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
MStarmans91 committed May 22, 2020
1 parent 445e324 commit d50b258
Show file tree
Hide file tree
Showing 39 changed files with 729 additions and 204 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog <http://keepachangelog.com/>`_
and this project adheres to `Semantic Versioning <http://semver.org/>`_

3.1.4 - Unreleased
3.1.4 - 2020-05-22
------------------

Added
Expand Down
Binary file modified WORC/doc/_build/doctrees/autogen/WORC.doctree
Binary file not shown.
Binary file modified WORC/doc/_build/doctrees/autogen/WORC.featureprocessing.doctree
Binary file not shown.
Binary file modified WORC/doc/_build/doctrees/autogen/WORC.tools.doctree
Binary file not shown.
Binary file modified WORC/doc/_build/doctrees/environment.pickle
Binary file not shown.
Binary file modified WORC/doc/_build/doctrees/static/changelog.doctree
Binary file not shown.
Binary file modified WORC/doc/_build/doctrees/static/configuration.doctree
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,9 @@ <h1>Source code for WORC.IOparser.config_segmentix</h1><div class="highlight"><p
<span class="n">settings_dict</span><span class="p">[</span><span class="s1">&#39;Segmentix&#39;</span><span class="p">][</span><span class="s1">&#39;min_object_size&#39;</span><span class="p">]</span> <span class="o">=</span>\
<span class="nb">int</span><span class="p">(</span><span class="n">settings</span><span class="p">[</span><span class="s1">&#39;Segmentix&#39;</span><span class="p">][</span><span class="s1">&#39;min_object_size&#39;</span><span class="p">])</span>

<span class="n">settings_dict</span><span class="p">[</span><span class="s1">&#39;Segmentix&#39;</span><span class="p">][</span><span class="s1">&#39;AssumeSameImageAndMaskMetadata&#39;</span><span class="p">]</span> <span class="o">=</span>\
<span class="n">settings</span><span class="p">[</span><span class="s1">&#39;General&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">getboolean</span><span class="p">(</span><span class="s1">&#39;AssumeSameImageAndMaskMetadata&#39;</span><span class="p">)</span>

<span class="k">return</span> <span class="n">settings_dict</span></div>
</pre></div>

Expand Down
22 changes: 17 additions & 5 deletions WORC/doc/_build/html/_modules/WORC/IOparser/file_io.html
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,9 @@ <h1>Source code for WORC.IOparser.file_io</h1><div class="highlight"><pre>


<div class="viewcode-block" id="convert_config_pyradiomics"><a class="viewcode-back" href="../../../autogen/WORC.IOparser.html#WORC.IOparser.file_io.convert_config_pyradiomics">[docs]</a><span class="k">def</span> <span class="nf">convert_config_pyradiomics</span><span class="p">(</span><span class="n">config</span><span class="p">):</span>
<span class="sd">&#39;&#39;&#39;</span>
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Convert fields from WORC confiparser object to a PyRadiomics compatible dictionary</span>
<span class="sd"> &#39;&#39;&#39;</span>
<span class="sd"> &quot;&quot;&quot;</span>
<span class="c1"># Creatae main config structure</span>
<span class="n">outputconfig</span> <span class="o">=</span> <span class="nb">dict</span><span class="p">()</span>
<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;imageType&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">dict</span><span class="p">()</span>
Expand All @@ -343,15 +343,27 @@ <h1>Source code for WORC.IOparser.file_io</h1><div class="highlight"><pre>
<span class="c1"># Take out the specific PyRadiomics values</span>
<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;geometryTolerance&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">float</span><span class="p">(</span><span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;geometryTolerance&#39;</span><span class="p">])</span>

<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;normalize&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">bool</span><span class="p">(</span><span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;normalize&#39;</span><span class="p">])</span>
<span class="k">if</span> <span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;normalize&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="s1">&#39;True&#39;</span><span class="p">:</span>
<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;normalize&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;normalize&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">False</span>

<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;normalizeScale&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;normalizeScale&#39;</span><span class="p">])</span>

<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;interpolator&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;interpolator&#39;</span><span class="p">]</span>

<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;preCrop&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">bool</span><span class="p">(</span><span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;preCrop&#39;</span><span class="p">])</span>
<span class="k">if</span> <span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;preCrop&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="s1">&#39;True&#39;</span><span class="p">:</span>
<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;preCrop&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;preCrop&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">False</span>

<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;label&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;label&#39;</span><span class="p">])</span>

<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;force2D&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">bool</span><span class="p">(</span><span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;force2D&#39;</span><span class="p">])</span>
<span class="k">if</span> <span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;force2D&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="s1">&#39;True&#39;</span><span class="p">:</span>
<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;force2D&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;force2D&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">False</span>

<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;force2Ddimension&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;force2Ddimension&#39;</span><span class="p">])</span>

<span class="n">outputconfig</span><span class="p">[</span><span class="s1">&#39;setting&#39;</span><span class="p">][</span><span class="s1">&#39;voxelArrayShift&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">config</span><span class="p">[</span><span class="s1">&#39;PyRadiomics&#39;</span><span class="p">][</span><span class="s1">&#39;voxelArrayShift&#39;</span><span class="p">])</span>
Expand Down
Loading

0 comments on commit d50b258

Please sign in to comment.