diff --git a/.gitignore b/.gitignore index 6330d3c..3d81cc3 100755 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ resources/ext_libs/greedy-1.2.0/bin/greedy.exe resources/settings/trajectoryGuide_settings.json resources/ext_libs/space resources/ext_libs/space.zip +.DS_Store +resources/.DS_Store +resources/ext_libs/.DS_Store +resources/.DS_Store diff --git a/registration/registration.py b/registration/registration.py index f3834da..f5860ed 100755 --- a/registration/registration.py +++ b/registration/registration.py @@ -1240,7 +1240,7 @@ def __init__(self): self.niftyBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'niftyReg', 'linux', 'bin') self.niftyExe = 'reg_aladin' - self.greedyBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'greedy', 'linux') + self.greedyBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'greedy','linux') self.greedyExe = 'greedy' self.c3dBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'c3d') @@ -1269,10 +1269,10 @@ def __init__(self): self.niftyBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'niftyReg', 'osX', 'bin') self.niftyExe = 'reg_aladin' - self.greedyBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'greedy') - self.greedyExe = 'greedy.glnxa64' + self.greedyBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'greedy','macos') + self.greedyExe = 'greedy' - self.c3dBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'c3d') + self.c3dBinDir = os.path.join(self.scriptPath, 'resources', 'ext_libs', 'c3d','macos') self.c3dExe = 'c3d_affine_tool' def getParameterNode(self, replace=False): diff --git a/resources/ext_libs/ants/AverageImages.maci64 b/resources/ext_libs/ants/AverageImages.maci64 new file mode 100755 index 0000000..92973db Binary files /dev/null and b/resources/ext_libs/ants/AverageImages.maci64 differ diff --git a/resources/ext_libs/ants/ConvertTransformFile.maci64 b/resources/ext_libs/ants/ConvertTransformFile.maci64 index 03d7e0c..c4cde9b 100755 Binary files a/resources/ext_libs/ants/ConvertTransformFile.maci64 and b/resources/ext_libs/ants/ConvertTransformFile.maci64 differ diff --git a/resources/ext_libs/ants/N4BiasFieldCorrection.maci64 b/resources/ext_libs/ants/N4BiasFieldCorrection.maci64 index 2700a60..540f186 100755 Binary files a/resources/ext_libs/ants/N4BiasFieldCorrection.maci64 and b/resources/ext_libs/ants/N4BiasFieldCorrection.maci64 differ diff --git a/resources/ext_libs/ants/PrintHeader.maci64 b/resources/ext_libs/ants/PrintHeader.maci64 new file mode 100755 index 0000000..c9cbbdc Binary files /dev/null and b/resources/ext_libs/ants/PrintHeader.maci64 differ diff --git a/resources/ext_libs/ants/ResampleImageBySpacing.maci64 b/resources/ext_libs/ants/ResampleImageBySpacing.maci64 new file mode 100755 index 0000000..b8cc49c Binary files /dev/null and b/resources/ext_libs/ants/ResampleImageBySpacing.maci64 differ diff --git a/resources/ext_libs/ants/antsApplyTransforms.maci64 b/resources/ext_libs/ants/antsApplyTransforms.maci64 index 1b6fda2..80da4a9 100755 Binary files a/resources/ext_libs/ants/antsApplyTransforms.maci64 and b/resources/ext_libs/ants/antsApplyTransforms.maci64 differ diff --git a/resources/ext_libs/ants/antsApplyTransformsToPoints.maci64 b/resources/ext_libs/ants/antsApplyTransformsToPoints.maci64 index f7b5c1c..a67eb94 100755 Binary files a/resources/ext_libs/ants/antsApplyTransformsToPoints.maci64 and b/resources/ext_libs/ants/antsApplyTransformsToPoints.maci64 differ diff --git a/resources/ext_libs/ants/antsRegistration.maci64 b/resources/ext_libs/ants/antsRegistration.maci64 index 8341064..ad35120 100755 Binary files a/resources/ext_libs/ants/antsRegistration.maci64 and b/resources/ext_libs/ants/antsRegistration.maci64 differ diff --git a/resources/ext_libs/c3d/macos/c3d_affine_tool b/resources/ext_libs/c3d/macos/c3d_affine_tool new file mode 100755 index 0000000..8007836 Binary files /dev/null and b/resources/ext_libs/c3d/macos/c3d_affine_tool differ diff --git a/resources/ext_libs/greedy/macos/greedy b/resources/ext_libs/greedy/macos/greedy new file mode 100755 index 0000000..26ed69a Binary files /dev/null and b/resources/ext_libs/greedy/macos/greedy differ diff --git a/resources/ext_libs/niftyReg/.DS_Store b/resources/ext_libs/niftyReg/.DS_Store index 52e2b49..ebd1e23 100755 Binary files a/resources/ext_libs/niftyReg/.DS_Store and b/resources/ext_libs/niftyReg/.DS_Store differ diff --git a/resources/ext_libs/niftyReg/osX/.DS_Store b/resources/ext_libs/niftyReg/osX/.DS_Store index 5b8a86b..4744957 100755 Binary files a/resources/ext_libs/niftyReg/osX/.DS_Store and b/resources/ext_libs/niftyReg/osX/.DS_Store differ diff --git a/resources/ext_libs/niftyReg/osX/bin/reg_aladin b/resources/ext_libs/niftyReg/osX/bin/reg_aladin index 1e451fa..5dba51f 100755 Binary files a/resources/ext_libs/niftyReg/osX/bin/reg_aladin and b/resources/ext_libs/niftyReg/osX/bin/reg_aladin differ diff --git a/resources/ext_libs/niftyReg/osX/bin/reg_average b/resources/ext_libs/niftyReg/osX/bin/reg_average index f632bc3..a6d09f7 100755 Binary files a/resources/ext_libs/niftyReg/osX/bin/reg_average and b/resources/ext_libs/niftyReg/osX/bin/reg_average differ diff --git a/resources/ext_libs/niftyReg/osX/bin/reg_f3d b/resources/ext_libs/niftyReg/osX/bin/reg_f3d index 475ff6c..f25a7fb 100755 Binary files a/resources/ext_libs/niftyReg/osX/bin/reg_f3d and b/resources/ext_libs/niftyReg/osX/bin/reg_f3d differ diff --git a/resources/ext_libs/niftyReg/osX/bin/reg_jacobian b/resources/ext_libs/niftyReg/osX/bin/reg_jacobian index 73af774..94d280c 100755 Binary files a/resources/ext_libs/niftyReg/osX/bin/reg_jacobian and b/resources/ext_libs/niftyReg/osX/bin/reg_jacobian differ diff --git a/resources/ext_libs/niftyReg/osX/bin/reg_measure b/resources/ext_libs/niftyReg/osX/bin/reg_measure deleted file mode 100755 index e744af6..0000000 Binary files a/resources/ext_libs/niftyReg/osX/bin/reg_measure and /dev/null differ diff --git a/resources/ext_libs/niftyReg/osX/bin/reg_resample b/resources/ext_libs/niftyReg/osX/bin/reg_resample index 768e087..52d2a07 100755 Binary files a/resources/ext_libs/niftyReg/osX/bin/reg_resample and b/resources/ext_libs/niftyReg/osX/bin/reg_resample differ diff --git a/resources/ext_libs/niftyReg/osX/bin/reg_tools b/resources/ext_libs/niftyReg/osX/bin/reg_tools index ec104c1..1dcd3d7 100755 Binary files a/resources/ext_libs/niftyReg/osX/bin/reg_tools and b/resources/ext_libs/niftyReg/osX/bin/reg_tools differ diff --git a/resources/ext_libs/niftyReg/osX/bin/reg_transform b/resources/ext_libs/niftyReg/osX/bin/reg_transform index 184a313..ffe7943 100755 Binary files a/resources/ext_libs/niftyReg/osX/bin/reg_transform and b/resources/ext_libs/niftyReg/osX/bin/reg_transform differ diff --git a/resources/settings/trajectoryGuide_settings.json b/resources/settings/trajectoryGuide_settings.json index 9867711..50bc309 100755 --- a/resources/settings/trajectoryGuide_settings.json +++ b/resources/settings/trajectoryGuide_settings.json @@ -1,5 +1,5 @@ { - "default_dir": "/media/greydon/lhsc_data/SEEG_rerun/derivatives/trajGuide/bids", + "default_dir": "/Users/founding/Documents/traj_test", "surgical_targets": [ "STN", "GPi",