v2.6.2 Add ParamInfo for mid_points on Parser

JamesParrott · Nov 4, 2023 · 04363a2 · 04363a2
1 parent e8a3cbd
commit 04363a2
Show file tree

Hide file tree

Showing 47 changed files with 34 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ sDNA_GH:
  - Displays the results from sDNA by colouring a new layer of new polylines or the original ones.
 
 ## User manual.  
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 ## Table of contents
 

diff --git a/README.pdf b/README.pdf
diff --git a/dev/tests/create_random_grid_network.py b/dev/tests/create_random_grid_network.py
@@ -28,7 +28,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 from random import random as random_num
 from math import trunc as floor  # for an int, not a float.  math.floor(2.33) == 2.0;  math.trunc(2.33) == 2

diff --git a/sDNA_GH/components/automatically_built/Config.ghuser b/sDNA_GH/components/automatically_built/Config.ghuser
diff --git a/sDNA_GH/components/automatically_built/Parse_Data.ghuser b/sDNA_GH/components/automatically_built/Parse_Data.ghuser
diff --git a/sDNA_GH/components/automatically_built/Read_Geom.ghuser b/sDNA_GH/components/automatically_built/Read_Geom.ghuser
diff --git a/sDNA_GH/components/automatically_built/Read_Shp.ghuser b/sDNA_GH/components/automatically_built/Read_Shp.ghuser
diff --git a/sDNA_GH/components/automatically_built/Read_Usertext.ghuser b/sDNA_GH/components/automatically_built/Read_Usertext.ghuser
diff --git a/sDNA_GH/components/automatically_built/Recolour_Objects.ghuser b/sDNA_GH/components/automatically_built/Recolour_Objects.ghuser
diff --git a/sDNA_GH/components/automatically_built/Self_test.ghuser b/sDNA_GH/components/automatically_built/Self_test.ghuser
diff --git a/sDNA_GH/components/automatically_built/Write_Shp.ghuser b/sDNA_GH/components/automatically_built/Write_Shp.ghuser
diff --git a/sDNA_GH/components/automatically_built/Write_Usertext.ghuser b/sDNA_GH/components/automatically_built/Write_Usertext.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Access_Map.ghuser b/sDNA_GH/components/automatically_built/sDNA_Access_Map.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Geodesics.ghuser b/sDNA_GH/components/automatically_built/sDNA_Geodesics.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Hulls.ghuser b/sDNA_GH/components/automatically_built/sDNA_Hulls.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Int_From_OD.ghuser b/sDNA_GH/components/automatically_built/sDNA_Int_From_OD.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Integral.ghuser b/sDNA_GH/components/automatically_built/sDNA_Integral.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Learn.ghuser b/sDNA_GH/components/automatically_built/sDNA_Learn.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Line_Measures.ghuser b/sDNA_GH/components/automatically_built/sDNA_Line_Measures.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Net_Radii.ghuser b/sDNA_GH/components/automatically_built/sDNA_Net_Radii.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Predict.ghuser b/sDNA_GH/components/automatically_built/sDNA_Predict.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Prepare.ghuser b/sDNA_GH/components/automatically_built/sDNA_Prepare.ghuser
diff --git a/sDNA_GH/components/automatically_built/sDNA_Skim.ghuser b/sDNA_GH/components/automatically_built/sDNA_Skim.ghuser
diff --git a/sDNA_GH/custom/data_cruncher.py b/sDNA_GH/custom/data_cruncher.py
@@ -37,7 +37,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import logging
 import warnings

diff --git a/sDNA_GH/custom/gdm_from_GH_Datatree.py b/sDNA_GH/custom/gdm_from_GH_Datatree.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 import logging

diff --git a/sDNA_GH/custom/logging_wrapper.py b/sDNA_GH/custom/logging_wrapper.py
@@ -27,7 +27,7 @@
 # SOFTWARE.
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import sys
 import os

diff --git a/sDNA_GH/custom/options_manager.py b/sDNA_GH/custom/options_manager.py
@@ -28,7 +28,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 """
 Functions to override namedtuples, from dicts, toml files 
 and other named tuples e.g. for options data structures.

diff --git a/sDNA_GH/custom/pyshp_wrapper.py b/sDNA_GH/custom/pyshp_wrapper.py
@@ -28,7 +28,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 """ Reads .shp files, and parses data and writes .shp files from any iterable.   
 """
 

diff --git a/sDNA_GH/custom/skel/add_params.py b/sDNA_GH/custom/skel/add_params.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 from collections import OrderedDict
 import logging

diff --git a/sDNA_GH/custom/skel/basic/ghdoc.py b/sDNA_GH/custom/skel/basic/ghdoc.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 import Rhino

diff --git a/sDNA_GH/custom/skel/basic/quacks_like.py b/sDNA_GH/custom/skel/basic/quacks_like.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 import abc

diff --git a/sDNA_GH/custom/skel/basic/smart_comp.py b/sDNA_GH/custom/skel/basic/smart_comp.py
@@ -50,7 +50,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import logging
 import inspect

diff --git a/sDNA_GH/custom/skel/builder.py b/sDNA_GH/custom/skel/builder.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import os
 import shutil

diff --git a/sDNA_GH/custom/skel/tools/helpers/checkers.py b/sDNA_GH/custom/skel/tools/helpers/checkers.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 import os

diff --git a/sDNA_GH/custom/skel/tools/helpers/funcs.py b/sDNA_GH/custom/skel/tools/helpers/funcs.py
@@ -27,7 +27,7 @@
 # SOFTWARE.
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import os
 import logging

diff --git a/sDNA_GH/custom/skel/tools/helpers/rhino_gh_geom.py b/sDNA_GH/custom/skel/tools/helpers/rhino_gh_geom.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 import os

diff --git a/sDNA_GH/custom/skel/tools/inserter.py b/sDNA_GH/custom/skel/tools/inserter.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import logging
 import collections

diff --git a/sDNA_GH/custom/skel/tools/name_mapper.py b/sDNA_GH/custom/skel/tools/name_mapper.py
@@ -1,7 +1,7 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import logging
 import collections

diff --git a/sDNA_GH/custom/skel/tools/runner.py b/sDNA_GH/custom/skel/tools/runner.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 import logging

diff --git a/sDNA_GH/custom/tools.py b/sDNA_GH/custom/tools.py
@@ -34,7 +34,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import os
 import sys
@@ -2415,6 +2415,12 @@ class Options(data_cruncher.SpikeIsolatingQuantileOptions):
                                            +'the method in class_spacing if '
                                            +'unset.'
                                            )
+                            ))
+                  ,('mid_points', add_params.ParamInfo(
+                             param_Class = Param_ScriptVariable
+                            ,Description = ('Mid-points of the classes in the '
+                                           +'legend. '
+                                           )
                             ))
                                                )
 
@@ -2738,16 +2744,15 @@ def format_number(x, format_str):
         gdm = gdm_from_GH_Datatree.GeomDataMapping(gen_exp)
 
         #rename for retvals
-        plot_min, plot_max, class_bounds = x_min, x_max, inter_class_bounds
+        plot_min, plot_max = x_min, x_max
 
         locs = locals().copy()
         return tuple(locs[retval] for retval in self.retvals)
 
-    retvals = 'plot_min', 'plot_max', 'gdm', 'mid_points', 'class_bounds'
+    retvals = 'plot_min', 'plot_max', 'gdm', 'mid_points', 'inter_class_bounds'
     component_outputs = retvals[:2] + ('Data', 'Geom') + retvals[-2:]
 
 
-
 class ObjectsRecolourer(sDNA_GH_Tool):
 
     class Options(object):

diff --git a/sDNA_GH/dev_tools/dev_tools.py b/sDNA_GH/dev_tools/dev_tools.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import os
 import logging

diff --git a/sDNA_GH/dev_tools/unload_sDNA_GH.py b/sDNA_GH/dev_tools/unload_sDNA_GH.py
@@ -33,7 +33,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 from ghpythonlib.componentbase import executingcomponent as component

diff --git a/sDNA_GH/launcher.py b/sDNA_GH/launcher.py
@@ -63,7 +63,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 

diff --git a/sDNA_GH/main.py b/sDNA_GH/main.py
@@ -43,7 +43,7 @@
 """
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import sys
 import os

diff --git a/sDNA_GH/tests/test_cases.py b/sDNA_GH/tests/test_cases.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 
 import sys

diff --git a/sDNA_GH/tests/unit_tests/sDNA_GH_unit_tests.py b/sDNA_GH/tests/unit_tests/sDNA_GH_unit_tests.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import sys
 import os

diff --git a/sDNA_GH/tests/unit_tests/skel_unit_tests.py b/sDNA_GH/tests/unit_tests/skel_unit_tests.py
@@ -29,7 +29,7 @@
 
 
 __author__ = 'James Parrott'
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 import sys
 import os
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ @@
     """
     __author__ = 'James Parrott'
-    __version__ = '2.6.1'
+    __version__ = '2.6.2'
@@ Expand Down @@