fixed startup for slicer 5.2.1

PerkLab · Jan 18, 2023 · 9e7d36c · 9e7d36c
1 parent c12c628
commit 9e7d36c
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 33 deletions.
diff --git a/BroadbandSpecModule/BroadbandSpecModule.py b/BroadbandSpecModule/BroadbandSpecModule.py
@@ -4,20 +4,23 @@
 from __main__ import vtk, qt, ctk, slicer
 from slicer.ScriptedLoadableModule import *
 from slicer.util import VTKObservationMixin
-import sklearn
 import numpy as np
 import os
 import time
 try: 
   from joblib import load
 except:
   slicer.util.pip_install('joblib')
+  from joblib import load
   pass
 try:
   import sklearn
 except:
-  slicer.util.pip_install('sklearn')
+  slicer.util.pip_install('scikit-learn')
+  import sklearn
+  print('here')
   pass
+  # pass
 # This is a custom library which slicer doesnt recognize on startup
 try:
   import Processfunctions as process

diff --git a/BroadbandSpecModule/Resources/UI/BroadbandSpecModule.ui b/BroadbandSpecModule/Resources/UI/BroadbandSpecModule.ui
@@ -13,11 +13,14 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="ctkCollapsibleButton" name="setupSection">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
      <property name="text">
       <string>Setup</string>
      </property>
      <property name="checked">
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
      <layout class="QFormLayout" name="formLayout_2">
       <item row="0" column="0">
@@ -278,13 +281,19 @@
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_22">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="text">
          <string>Sampling rate (fps)</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="qMRMLSliderWidget" name="samplingRateSlider">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="decimals">
          <number>0</number>
         </property>

diff --git a/Config/ThorLabsAscension.xml b/Config/ThorLabsAscension.xml
@@ -8,7 +8,7 @@
       Id="VideoDevice" 
       Type="ThorLabsVideo"
 	  AcquisitionRate="100"
-	  IntegrationTimeSec="0.1"
+	  IntegrationTimeSec="0.01"
 	  AveragedItemsForFiltering="1"
 	  Zebra = "1"
 	  > <!-- IntegrationTimeSec default="0.05" --> <!-- AcquisitionRate Default="30" --> <!--  AveragedItemsForFiltering Default="20"-->