Merge pull request #1536 from AllenNeuralDynamics/develop

[production merge] 2025-05-09

Author: XX-Yin

src/foraging_gui/Foraging.py

@@ -1556,12 +1556,30 @@ def _check_line_terminator(self, file_path):
     def _LoadSchedule(self):
         if os.path.exists(self.Settings["schedule_path"]):
             schedule = pd.read_csv(self.Settings["schedule_path"])
+        
+            # Find the correct week on the schedule
+            dividers = schedule[[isinstance(x,str)and('/' in x) for x in schedule['Mouse ID'].values]]
+            today = datetime.now().strftime('%m/%d/%Y')
+   
+            # Multiple weeks on the schedule 
+            if len(dividers) > 1:
+                first = dividers.iloc[0]['Mouse ID']
+                if datetime.strptime(today, "%m/%d/%Y") < datetime.strptime(first,"%m/%d/%Y"):
+                    # Use last weeks schedule
+                    schedule = schedule.loc[dividers.index.values[1]:]
+                else:
+                    # Use this weeks schedule
+                    schedule = schedule.loc[0:dividers.index.values[1]]
+
+            # Determine what mice are on the schedule
             self.schedule_mice = [
                 x
                 for x in schedule["Mouse ID"].unique()
                 if isinstance(x, str) and (len(x) > 3) and ("/" not in x)
             ]
-            self.schedule = schedule.dropna(subset=["Mouse ID", "Box"]).copy()
+            
+            # Clear rows without a mouse
+            self.schedule = schedule.dropna(subset=["Mouse ID"]).copy()
             logging.info("Loaded behavior schedule")
         else:
             self.schedule_mice = None

src/foraging_gui/ForagingGUI.ui

@@ -262,6 +262,28 @@
           </property>
          </widget>
         </item>
+        <item row="2" column="3">
+         <widget class="QSpinBox" name="hab_time_box">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimum">
+            <number>0</number>
+           </property>
+           <property name="maximum">
+            <number>90</number>
+           </property>
+           <property name="suffix">
+           <string> min</string>
+          </property>
+          <property name="prefix">
+           <string> Habituation: </string>
+          </property>
+         </widget>
+        </item>
         <item row="2" column="1">
          <widget class="QPushButton" name="Save">
           <property name="sizePolicy">

src/foraging_gui/ForagingGUI_Ephys.ui

@@ -69,7 +69,7 @@
    <widget class="QComboBox" name="Task">
     <property name="geometry">
      <rect>
-      <x>620</x>
+      <x>650</x>
       <y>20</y>
       <width>152</width>
       <height>20</height>
@@ -2763,6 +2763,40 @@
      <bool>false</bool>
     </property>
    </widget>
+   <widget class="QSpinBox" name="hab_time_box">
+    <property name="enabled">
+     <bool>true</bool>
+    </property>
+    <property name="geometry">
+     <rect>
+      <x>240</x>
+      <y>20</y>
+      <width>110</width>
+      <height>23</height>
+     </rect>
+    </property>
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+    <property name="styleSheet">
+     <string notr="true"/>
+    </property>
+    <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>90</number>
+     </property>
+     <property name="suffix">
+     <string> min</string>
+      </property>
+     <property name="prefix">
+     <string> Habituation: </string>
+    </property>
+   </widget>
    <widget class="QPushButton" name="NewSession">
     <property name="enabled">
      <bool>true</bool>
@@ -3263,7 +3297,7 @@
    <widget class="QLineEdit" name="ID">
     <property name="geometry">
      <rect>
-      <x>324</x>
+      <x>380</x>
       <y>20</y>
       <width>71</width>
       <height>20</height>
@@ -3282,7 +3316,7 @@
    <widget class="QLabel" name="label_72">
     <property name="geometry">
      <rect>
-      <x>300</x>
+      <x>350</x>
       <y>20</y>
       <width>21</width>
       <height>20</height>
@@ -3658,7 +3692,7 @@
    <widget class="QLabel" name="label_74">
     <property name="geometry">
      <rect>
-      <x>400</x>
+      <x>450</x>
       <y>20</y>
       <width>71</width>
       <height>20</height>
@@ -3683,7 +3717,7 @@
    <widget class="QLineEdit" name="Experimenter">
     <property name="geometry">
      <rect>
-      <x>474</x>
+      <x>524</x>
       <y>20</y>
       <width>121</width>
       <height>20</height>
@@ -5016,4 +5050,4 @@
  </tabstops>
  <resources/>
  <connections/>
-</ui>
+</ui>

src/foraging_gui/__init__.py

@@ -1 +1 @@
-__version__ = "1.6.39"
+__version__ = "1.6.42"