Update 3 Python recipes that calling Aivia subprocess

- Change the hardcoded executable calls

Author: seismonastic

PythonVenvForAivia/PythonVenvForAivia.zip

@@ -30,26 +30,6 @@
     Opens Aivia (again) to display the 2D projection as a new image.
 
 """
-#Get path to the Aivia executable
-def getParentDir(currDir, level=1):
-
-    for i in range(level):
-        parentDir = up(currDir)
-        currDir=parentDir
-
-    return currDir
-
-exeDir=sys.executable
-parentDir=getParentDir(exeDir, level=2)
-if ('Aivia Community' in parentDir):
-    aivia_path = parentDir + '\\Aivia-Community.exe'
-else:
-    aivia_path = parentDir + '\\Aivia.exe'
-
-if (not isfile(aivia_path)):
-    raise FileNotFoundError(f"{aivia_path} does not exist")
-
-print(f'Aivia path: {aivia_path}')
 
 
 # [INPUT Name:inputImagePath Type:string DisplayName:'Input Image']
@@ -58,6 +38,7 @@ def run(params):
     image_location = params['inputImagePath']
     result_location = params['resultPath']
     tCount = int(params['TCount'])
+    aivia_path = params['CallingExecutable']
     if not os.path.exists(image_location):
         print(f"Error: {image_location} does not exist")
         return

Recipes/MaxIntensityProjection.py

@@ -32,27 +32,6 @@
 
 """
 
-#Get path to the Aivia executable
-def getParentDir(currDir, level=1):
-
-    for i in range(level):
-        parentDir = up(currDir)
-        currDir=parentDir
-
-    return currDir
-
-exeDir=sys.executable
-parentDir=getParentDir(exeDir, level=2)
-if ('Aivia Community' in parentDir):
-    aivia_path = parentDir + '\\Aivia-Community.exe'
-else:
-    aivia_path = parentDir + '\\Aivia.exe'
-
-if (not isfile(aivia_path)):
-    raise FileNotFoundError(f"{aivia_path} does not exist")
-
-print(f'Aivia path: {aivia_path}')
-
 
 # [INPUT Name:inputRedPath Type:string DisplayName:'Red channel']
 # [INPUT Name:inputGreenPath Type:string DisplayName:'Green channel']
@@ -65,7 +44,8 @@ def run(params):
     image_location.append(params['inputBluePath'])
     result_location = params['resultPath']
     tCount = int(params['TCount'])
-    
+    aivia_path = params['CallingExecutable']
+
     for c in range(0, 3):
         if not os.path.exists(image_location[c]):
             print(f"Error: {image_location[c]} does not exist")

Recipes/MaxIntensityProjectionRGB.py

@@ -41,27 +41,6 @@
 """
 interpolation_mode = 1  # 0: Nearest-neighbor, 1: Bi-linear , 2: Bi-quadratic, 3: Bi-cubic, 4: Bi-quartic, 5: Bi-quintic
 
-# Get path to the Aivia executable
-def getParentDir(currDir, level=1):
-
-    for i in range(level):
-        parentDir = up(currDir)
-        currDir=parentDir
-
-    return currDir
-
-exeDir = sys.executable
-parentDir = getParentDir(exeDir, level=2)
-if ('Aivia Community' in parentDir):
-    aivia_path = parentDir + '\\Aivia-Community.exe'
-else:
-    aivia_path = parentDir + '\\Aivia.exe'
-
-if (not isfile(aivia_path)):
-    raise FileNotFoundError(f"{aivia_path} does not exist")
-
-print(f'Aivia path: {aivia_path}')
-
 
 # automatic parameters
 
@@ -82,6 +61,7 @@ def run(params):
     tCount = int(params['TCount'])
     pixel_cal_tmp = params['Calibration']
     pixel_cal = pixel_cal_tmp[6:].split(', ')           # Expects calibration with 'XYZT: ' in front
+    aivia_path = params['CallingExecutable']
 
     # Getting XY and Z values                # Expecting only 'Micrometers' in this code
     XY_cal = float(pixel_cal[0].split(' ')[0])
@@ -180,4 +160,5 @@ def run(params):
 # v1_11: - tkinter not installed by default so removing all code and adding parameters in Aivia UI
 # v1_13: - Fallback values if factors equal 0 / automated detection of latest Aivia version on PC
 # v1_14: - Adding pixel/voxel calibration
-# v1_15: - Update Aivia path for Aivia community
+# v1_15: - Update Aivia path for Aivia community
+# v1_16: - Update aivia_path using new API