Merge pull request #279 from scipion-em/fix

condition on adjust densities
scipion-em · Jun 17, 2024 · d7602bf · d7602bf
2 parents c66e9b4 + 2581225
commit d7602bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/imod/protocols/protocol_tomoPreprocess.py b/imod/protocols/protocol_tomoPreprocess.py
@@ -178,7 +178,7 @@ def _defineParams(self, form):
         form.addParam('scaleRangeToggle',
                       params.EnumParam,
                       choices=['Yes', 'No'],
-                      condition="floatDensities==0 or floatDensities==1 or floatDensities==3",
+                      condition="floatDensities==1 or floatDensities==3",
                       default=0,
                       label='Set scaling range values?',
                       display=params.EnumParam.DISPLAY_HLIST,
@@ -189,14 +189,14 @@ def _defineParams(self, form):
 
         form.addParam('scaleRangeMax',
                       params.FloatParam,
-                      condition="(floatDensities==0 or floatDensities==1 or floatDensities==3) and scaleRangeToggle==0",
+                      condition="(floatDensities==1 or floatDensities==3) and scaleRangeToggle==0",
                       default=255,
                       label='Max.',
                       help='Maximum value for the rescaling')
 
         form.addParam('scaleRangeMin',
                       params.FloatParam,
-                      condition="(floatDensities==0 or floatDensities==1 or floatDensities==3) and scaleRangeToggle==0",
+                      condition="(floatDensities==1 or floatDensities==3) and scaleRangeToggle==0",
                       default=0,
                       label='Min.',
                       help='Minimum value for the rescaling')
@@ -207,6 +207,7 @@ def _defineParams(self, form):
                                'Lanczos 2 lobes', 'Lanczos 3 lobes'],
                       default=5,
                       label='Antialias method:',
+                      expertLevel=params.LEVEL_ADVANCED,
                       display=params.EnumParam.DISPLAY_COMBO,
                       help='Type of antialiasing filter to use when reducing images.\n'
                            'The available types of filters are:\n\n'

diff --git a/imod/protocols/protocol_tsPreprocess.py b/imod/protocols/protocol_tsPreprocess.py
@@ -179,8 +179,9 @@ def _defineParams(self, form):
 
         form.addParam('scaleRangeToggle',
                       params.EnumParam,
+
                       choices=['Yes', 'No'],
-                      condition="floatDensities==0 or floatDensities==1 or floatDensities==3",
+                      condition="floatDensities==1 or floatDensities==3",
                       default=0,
                       label='Set scaling range values?',
                       display=params.EnumParam.DISPLAY_HLIST,
@@ -189,20 +190,20 @@ def _defineParams(self, form):
                            'minimum and maximum density will be mapped '
                            'to the Min and Max values that are entered')
 
-        form.addParam('scaleRangeMax',
-                      params.FloatParam,
-                      condition="(floatDensities==0 or floatDensities==1 or floatDensities==3) and scaleRangeToggle==0",
-                      default=255,
-                      label='Max.',
-                      help='Maximum value for the rescaling')
-
         form.addParam('scaleRangeMin',
                       params.FloatParam,
-                      condition="(floatDensities==0 or floatDensities==1 or floatDensities==3) and scaleRangeToggle==0",
+                      condition="(floatDensities==1 or floatDensities==3) and scaleRangeToggle==0",
                       default=0,
                       label='Min.',
                       help='Minimum value for the rescaling')
 
+        form.addParam('scaleRangeMax',
+                      params.FloatParam,
+                      condition="(floatDensities==1 or floatDensities==3) and scaleRangeToggle==0",
+                      default=255,
+                      label='Max.',
+                      help='Maximum value for the rescaling')
+
         form.addParam('antialias',
                       params.EnumParam,
                       expertLevel=params.LEVEL_ADVANCED,