Merge pull request #230 from AllenNeuralDynamics/production_testing

[production merge] 02/06/2024
AllenNeuralDynamics · Feb 6, 2024 · 87d1fc8 · 87d1fc8
2 parents 73d619a + b3e7813
commit 87d1fc8
Show file tree

Hide file tree

Showing 16 changed files with 6,403 additions and 1,041 deletions.
diff --git a/src/desktop_shortcuts/BoxA with console.bat b/src/desktop_shortcuts/BoxA with console.bat
@@ -1,4 +1,4 @@
-cd /d C:\Users\svc_aind_behavior\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
+cd /d C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
 call conda activate Foraging
 :: This version starts with a console window
 python Foraging.py 1

diff --git a/src/desktop_shortcuts/BoxA.bat b/src/desktop_shortcuts/BoxA.bat
@@ -1,10 +1,7 @@
-cd /d C:\Users\svc_aind_behavior\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
+cd /d C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
 call conda activate Foraging
-:: This version starts without a console window
-start "" pythonw Foraging.py 1
-echo Starting the GUI and Bonsai, please wait. This window will close in 20 seconds
-timeout 20 >nul
-:: This version starts with a console window
-:: start python Foraging.py 1
-
+start "" C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\desktop_shortcuts\start_popup.bat
+powershell -window minimized -command ""
+python Foraging.py 1 --no-bonsai-ide
+timeout 3600 > NUL
 
diff --git a/src/desktop_shortcuts/BoxB with console.bat b/src/desktop_shortcuts/BoxB with console.bat
@@ -1,4 +1,4 @@
-cd /d C:\Users\svc_aind_behavior\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
+cd /d C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
 call conda activate Foraging
 python Foraging.py 2
 timeout 3600 > NUL

diff --git a/src/desktop_shortcuts/BoxB.bat b/src/desktop_shortcuts/BoxB.bat
@@ -1,10 +1,7 @@
-cd /d C:\Users\svc_aind_behavior\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
+cd /d C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
 call conda activate Foraging
-:: This version starts without a console window
-start "" pythonw Foraging.py 2
-echo Starting the GUI and Bonsai, please wait. This window will close in 20 seconds
-timeout 20 >nul
-:: This version starts with a console window
-:: start python Foraging.py 2
-
+start "" C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\desktop_shortcuts\start_popup.bat
+powershell -window minimized -command ""
+python Foraging.py 2 --no-bonsai-ide
+timeout 3600 > NUL
 
diff --git a/src/desktop_shortcuts/BoxC with console.bat b/src/desktop_shortcuts/BoxC with console.bat
@@ -1,4 +1,4 @@
-cd /d C:\Users\svc_aind_behavior\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
+cd /d C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
 call conda activate Foraging
 :: This version starts with a console window
 python Foraging.py 3

diff --git a/src/desktop_shortcuts/BoxC.bat b/src/desktop_shortcuts/BoxC.bat
@@ -1,10 +1,7 @@
-cd /d C:\Users\svc_aind_behavior\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
+cd /d C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
 call conda activate Foraging
-:: This version starts without a console window
-start "" pythonw Foraging.py 3
-echo Starting the GUI and Bonsai, please wait. This window will close in 20 seconds
-timeout 20 >nul
-:: This version starts with a console window
-:: start python Foraging.py 3
-
+start "" C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\desktop_shortcuts\start_popup.bat
+powershell -window minimized -command ""
+python Foraging.py 3 --no-bonsai-ide
+timeout 3600 > NUL
 
diff --git a/src/desktop_shortcuts/BoxD with console.bat b/src/desktop_shortcuts/BoxD with console.bat
@@ -1,4 +1,4 @@
-cd /d C:\Users\svc_aind_behavior\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
+cd /d C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
 call conda activate Foraging
 :: This version starts with a console window
 python Foraging.py 4

diff --git a/src/desktop_shortcuts/BoxD.bat b/src/desktop_shortcuts/BoxD.bat
@@ -1,10 +1,7 @@
-cd /d C:\Users\svc_aind_behavior\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
+cd /d C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\foraging_gui
 call conda activate Foraging
-:: This version starts without a console window
-start "" pythonw Foraging.py 4
-echo Starting the GUI and Bonsai, please wait. This window will close in 20 seconds
-timeout 20 >nul
-:: This version starts with a console window
-:: start python Foraging.py 4
-
+start "" C:\Users\%USERNAME%\Documents\GitHub\dynamic-foraging-task\src\desktop_shortcuts\start_popup.bat
+powershell -window minimized -command ""
+python Foraging.py 4 --no-bonsai-ide
+timeout 3600 > NUL
 
diff --git a/src/desktop_shortcuts/start_popup.bat b/src/desktop_shortcuts/start_popup.bat
@@ -0,0 +1,24 @@
+echo off
+mode 70,19
+title Hello!
+cls
+echo.
+echo.
+echo                   .--,       .--,
+echo                  ( (  \.---./  ) )
+echo                   '.__/o   o\__.'
+echo                      {=  ^^  =}
+echo                       ^>  -  ^<
+echo        ___________.""`-------`"".____________
+echo       /  Hi, the GUI is starting!     O      \
+echo       \                      o               /
+echo       /  .    O       Please wait!       o   \
+echo       \                                      /         __
+echo       /        You can close this window!    \     _.-'  `.
+echo       \______________o__________o____________/ .-~^^        `~--'
+echo                     ___)( )(___        `-.___.'
+echo                    (((__) (__)))
+
+timeout 30 >nul
+exit
+
diff --git a/src/foraging_gui/AutoTrain.ui b/src/foraging_gui/AutoTrain.ui
@@ -433,7 +433,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="pushButton_show_all_training_history">
+           <widget class="QPushButton" name="pushButton_show_auto_training_history_in_streamlit">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -442,12 +442,12 @@
             </property>
             <property name="maximumSize">
              <size>
-              <width>300</width>
+              <width>250</width>
               <height>30</height>
              </size>
             </property>
             <property name="text">
-             <string>Show training history in browser</string>
+             <string>Show auto-training history in Streamlit</string>
             </property>
            </widget>
           </item>
@@ -589,7 +589,7 @@
                  </widget>
                 </item>
                 <item>
-                 <widget class="QPushButton" name="pushButton_show_paras_in_browser">
+                 <widget class="QPushButton" name="pushButton_show_curriculum_in_streamlit">
                   <property name="sizePolicy">
                    <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                     <horstretch>0</horstretch>
@@ -598,31 +598,12 @@
                   </property>
                   <property name="maximumSize">
                    <size>
-                    <width>200</width>
+                    <width>250</width>
                     <height>30</height>
                    </size>
                   </property>
                   <property name="text">
-                   <string>Show parameters in browser</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="pushButton_show_rules_in_browser">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>200</width>
-                    <height>30</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string>Show rules in browser</string>
+                   <string>Show curriculum in Streamlit</string>
                   </property>
                  </widget>
                 </item>