pushing some minor revisions

PerkLab · Jan 26, 2023 · 54761ce · 54761ce
1 parent 4c1fa15
commit 54761ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>606</width>
-    <height>702</height>
+    <height>673</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -307,10 +307,10 @@
          <double>1.000000000000000</double>
         </property>
         <property name="maximum">
-         <double>30.000000000000000</double>
+         <double>100.000000000000000</double>
         </property>
         <property name="value">
-         <double>30.000000000000000</double>
+         <double>100.000000000000000</double>
         </property>
         <property name="quantity">
          <string notr="true"/>

diff --git 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." />
     <Device
       Id="VideoDevice" 
-      Type="ThorLabsVideo" >
+      Type="ThorLabsVideo"
+          AcquisitionRate="30"
+	  IntegrationTimeSec="0.025"
+	  AveragedItemsForFiltering="1"
+	  > <!-- IntegrationTimeSec default="0.05" --> <!-- AcquisitionRate Default="30" --> <!--  AveragedItemsForFiltering Default="20"-->
       <DataSources>
         <DataSource Type="Video" Id="Video" />
       </DataSources>      

diff --git a/Config/ThorLabsAscension.xml b/Config/ThorLabsAscension.xml
@@ -10,7 +10,6 @@
 	  AcquisitionRate="100"
 	  IntegrationTimeSec="0.01"
 	  AveragedItemsForFiltering="1"
-	  Zebra = "1"
 	  > <!-- IntegrationTimeSec default="0.05" --> <!-- AcquisitionRate Default="30" --> <!--  AveragedItemsForFiltering Default="20"-->
       <DataSources>
         <DataSource