From 54761ce82c20af0aeb1e2fff1aeb9c36f98cc281 Mon Sep 17 00:00:00 2001
From: 16djm10 <16djm10@queensu.ca>
Date: Thu, 26 Jan 2023 13:36:39 -0500
Subject: [PATCH] pushing some minor revisions
---
BroadbandSpecModule/BroadbandSpecModule.py | 9 ++++++---
BroadbandSpecModule/Resources/UI/BroadbandSpecModule.ui | 6 +++---
Config/PlusDeviceSet_Server_ThorLabsVideoCapture.xml | 6 +++++-
Config/ThorLabsAscension.xml | 1 -
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/BroadbandSpecModule/BroadbandSpecModule.py b/BroadbandSpecModule/BroadbandSpecModule.py
index 81bbe5c..0b57acf 100644
--- a/BroadbandSpecModule/BroadbandSpecModule.py
+++ b/BroadbandSpecModule/BroadbandSpecModule.py
@@ -754,8 +754,6 @@ def recordSample(self):
browserNode = parameterNode.GetNodeReference(self.SAMPLE_SEQ_BROWSER)
# Print Collecting sample and the data collection parameters
print('Collecting sample')
- # print('Sample duration: ' + sampleDuration)
- # print('Sample frequency: ' + sampleFrequency)
if browserNode == None:
browserNode = slicer.vtkMRMLSequenceBrowserNode()
slicer.mrmlScene.AddNode(browserNode)
@@ -820,10 +818,15 @@ def saveSample(self):
spectrumArray2D[i+1,1:] = spectrumArray[1,:]
# Create the file path to save to. Date->PatientID->Class
- savePath = parameterNode.GetParameter(self.SAVE_LOCATION)
+ # Get the save path from settings
+ settings = qt.QSettings()
+ savePath = settings.value(self.SAVE_LOCATION)
+ print(savePath)
dateStamp = time.strftime("%b%d")
patientNum = parameterNode.GetParameter(self.PATIENT_NUM)
savePath = os.path.join(savePath, dateStamp,patientNum,dataLabel)
+ # print save path
+ print("Saving to: " + savePath)
# If the save path does not exist, create it
if not os.path.exists(savePath):
os.makedirs(savePath)
diff --git a/BroadbandSpecModule/Resources/UI/BroadbandSpecModule.ui b/BroadbandSpecModule/Resources/UI/BroadbandSpecModule.ui
index 10bf9ff..1a400a1 100644
--- a/BroadbandSpecModule/Resources/UI/BroadbandSpecModule.ui
+++ b/BroadbandSpecModule/Resources/UI/BroadbandSpecModule.ui
@@ -7,7 +7,7 @@
0
0
606
- 702
+ 673
@@ -307,10 +307,10 @@
1.000000000000000
- 30.000000000000000
+ 100.000000000000000
- 30.000000000000000
+ 100.000000000000000
diff --git a/Config/PlusDeviceSet_Server_ThorLabsVideoCapture.xml b/Config/PlusDeviceSet_Server_ThorLabsVideoCapture.xml
index 1ac6fb2..b85aa11 100644
--- a/Config/PlusDeviceSet_Server_ThorLabsVideoCapture.xml
+++ b/Config/PlusDeviceSet_Server_ThorLabsVideoCapture.xml
@@ -6,7 +6,11 @@
Description="Broadcasting acquired spectrum through OpenIGTLink. First image row contains wavelength value, second image row contains intensities." />
+ Type="ThorLabsVideo"
+ AcquisitionRate="30"
+ IntegrationTimeSec="0.025"
+ AveragedItemsForFiltering="1"
+ >
diff --git a/Config/ThorLabsAscension.xml b/Config/ThorLabsAscension.xml
index bf0fb83..f175d77 100644
--- a/Config/ThorLabsAscension.xml
+++ b/Config/ThorLabsAscension.xml
@@ -10,7 +10,6 @@
AcquisitionRate="100"
IntegrationTimeSec="0.01"
AveragedItemsForFiltering="1"
- Zebra = "1"
>