Add flanker battery options

thesimonho · Aug 27, 2017 · 1b79db9 · 1b79db9
1 parent d2c6eb4
commit 1b79db9
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 13 deletions.
diff --git a/designer/battery_window_qt.py b/designer/battery_window_qt.py
@@ -168,6 +168,9 @@ def setupUi(self, CognitiveBattery):
         item = QtWidgets.QListWidgetItem()
         item.setCheckState(QtCore.Qt.Unchecked)
         self.taskList.addItem(item)
+        item = QtWidgets.QListWidgetItem()
+        item.setCheckState(QtCore.Qt.Unchecked)
+        self.taskList.addItem(item)
         self.taskListLayout.addWidget(self.taskList)
         self.reorderButtonLayout = QtWidgets.QVBoxLayout()
         self.reorderButtonLayout.setContentsMargins(0, -1, -1, -1)
@@ -294,12 +297,14 @@ def retranslateUi(self, CognitiveBattery):
         item = self.taskList.item(1)
         item.setText(_translate("CognitiveBattery", "Digit Span (backwards)"))
         item = self.taskList.item(2)
-        item.setText(_translate("CognitiveBattery", "Mental Rotation Task"))
+        item.setText(_translate("CognitiveBattery", "Eriksen Flanker Task"))
         item = self.taskList.item(3)
-        item.setText(_translate("CognitiveBattery", "Raven\'s Progressive Matrices"))
+        item.setText(_translate("CognitiveBattery", "Mental Rotation Task"))
         item = self.taskList.item(4)
-        item.setText(_translate("CognitiveBattery", "Sternberg Task"))
+        item.setText(_translate("CognitiveBattery", "Raven\'s Progressive Matrices"))
         item = self.taskList.item(5)
+        item.setText(_translate("CognitiveBattery", "Sternberg Task"))
+        item = self.taskList.item(6)
         item.setText(_translate("CognitiveBattery", "Sustained Attention to Response Task (SART)"))
         self.taskList.setSortingEnabled(__sortingEnabled)
         self.upButton.setStatusTip(_translate("CognitiveBattery", "Move selected task up in order of administration"))

diff --git a/designer/settings_window_qt.py b/designer/settings_window_qt.py
@@ -12,7 +12,7 @@ class Ui_SettingsDialog(object):
     def setupUi(self, SettingsDialog):
         SettingsDialog.setObjectName("SettingsDialog")
         SettingsDialog.setWindowModality(QtCore.Qt.ApplicationModal)
-        SettingsDialog.resize(415, 296)
+        SettingsDialog.resize(415, 320)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -29,7 +29,7 @@ def setupUi(self, SettingsDialog):
         self.scrollArea.setWidgetResizable(True)
         self.scrollArea.setObjectName("scrollArea")
         self.scrollAreaWidgetContents = QtWidgets.QWidget()
-        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 391, 241))
+        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 391, 265))
         self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
         self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
         self.verticalLayout_5.setContentsMargins(0, 0, 0, 0)
@@ -42,7 +42,7 @@ def setupUi(self, SettingsDialog):
         self.settings_toolbox.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.settings_toolbox.setObjectName("settings_toolbox")
         self.general_page = QtWidgets.QWidget()
-        self.general_page.setGeometry(QtCore.QRect(0, 0, 373, 115))
+        self.general_page.setGeometry(QtCore.QRect(0, 0, 373, 112))
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -90,7 +90,7 @@ def setupUi(self, SettingsDialog):
         self.verticalLayout_7.addItem(spacerItem)
         self.settings_toolbox.addItem(self.general_page, "")
         self.ant_page = QtWidgets.QWidget()
-        self.ant_page.setGeometry(QtCore.QRect(0, 0, 373, 115))
+        self.ant_page.setGeometry(QtCore.QRect(0, 0, 373, 112))
         self.ant_page.setObjectName("ant_page")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.ant_page)
         self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
@@ -106,7 +106,18 @@ def setupUi(self, SettingsDialog):
         self.ant_form.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.settings_ant_blocks_value)
         self.horizontalLayout.addLayout(self.ant_form)
         self.settings_toolbox.addItem(self.ant_page, "")
+        self.flanker_page = QtWidgets.QWidget()
+        self.flanker_page.setObjectName("flanker_page")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.flanker_page)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.flanker_form = QtWidgets.QFormLayout()
+        self.flanker_form.setContentsMargins(10, -1, 10, -1)
+        self.flanker_form.setObjectName("flanker_form")
+        self.verticalLayout.addLayout(self.flanker_form)
+        self.settings_toolbox.addItem(self.flanker_page, "")
         self.ravens_page = QtWidgets.QWidget()
+        self.ravens_page.setGeometry(QtCore.QRect(0, 0, 373, 112))
         self.ravens_page.setObjectName("ravens_page")
         self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.ravens_page)
         self.verticalLayout_4.setContentsMargins(0, 0, 0, 0)
@@ -129,7 +140,7 @@ def setupUi(self, SettingsDialog):
         self.verticalLayout_4.addLayout(self.formLayout)
         self.settings_toolbox.addItem(self.ravens_page, "")
         self.sternberg_page = QtWidgets.QWidget()
-        self.sternberg_page.setGeometry(QtCore.QRect(0, 0, 373, 115))
+        self.sternberg_page.setGeometry(QtCore.QRect(0, 0, 373, 112))
         self.sternberg_page.setObjectName("sternberg_page")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.sternberg_page)
         self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
@@ -178,6 +189,7 @@ def retranslateUi(self, SettingsDialog):
         self.settings_toolbox.setItemText(self.settings_toolbox.indexOf(self.general_page), _translate("SettingsDialog", "General"))
         self.settings_ant_blocks_label.setText(_translate("SettingsDialog", "Number of blocks:"))
         self.settings_toolbox.setItemText(self.settings_toolbox.indexOf(self.ant_page), _translate("SettingsDialog", "Attention Network Test"))
+        self.settings_toolbox.setItemText(self.settings_toolbox.indexOf(self.flanker_page), _translate("SettingsDialog", "Eriksen Flanker Task"))
         self.settings_ravens_start_label.setText(_translate("SettingsDialog", "Starting image #:"))
         self.settings_ravens_trials_label.setText(_translate("SettingsDialog", "Number of trials:"))
         self.settings_toolbox.setItemText(self.settings_toolbox.indexOf(self.ravens_page), _translate("SettingsDialog", "Raven\'s Progressive Matrices"))

diff --git a/designer/ui/battery_window_qt.ui b/designer/ui/battery_window_qt.ui
@@ -310,6 +310,14 @@
               <enum>Unchecked</enum>
              </property>
             </item>
+            <item>
+             <property name="text">
+              <string>Eriksen Flanker Task</string>
+             </property>
+             <property name="checkState">
+              <enum>Unchecked</enum>
+             </property>
+            </item>
             <item>
              <property name="text">
               <string>Mental Rotation Task</string>

diff --git a/designer/ui/settings_window_qt.ui b/designer/ui/settings_window_qt.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>415</width>
-    <height>296</height>
+    <height>320</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -45,7 +45,7 @@
           <x>0</x>
           <y>0</y>
           <width>391</width>
-          <height>241</height>
+          <height>265</height>
          </rect>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -69,7 +69,7 @@
               <x>0</x>
               <y>0</y>
               <width>373</width>
-              <height>115</height>
+              <height>112</height>
              </rect>
             </property>
             <property name="sizePolicy">
@@ -190,7 +190,7 @@
               <x>0</x>
               <y>0</y>
               <width>373</width>
-              <height>115</height>
+              <height>112</height>
              </rect>
             </property>
             <attribute name="label">
@@ -231,7 +231,44 @@
              </item>
             </layout>
            </widget>
+           <widget class="QWidget" name="flanker_page">
+            <attribute name="label">
+             <string>Eriksen Flanker Task</string>
+            </attribute>
+            <layout class="QVBoxLayout" name="verticalLayout">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <layout class="QFormLayout" name="flanker_form">
+               <property name="leftMargin">
+                <number>10</number>
+               </property>
+               <property name="rightMargin">
+                <number>10</number>
+               </property>
+              </layout>
+             </item>
+            </layout>
+           </widget>
            <widget class="QWidget" name="ravens_page">
+            <property name="geometry">
+             <rect>
+              <x>0</x>
+              <y>0</y>
+              <width>373</width>
+              <height>112</height>
+             </rect>
+            </property>
             <attribute name="label">
              <string>Raven's Progressive Matrices</string>
             </attribute>
@@ -286,7 +323,7 @@
               <x>0</x>
               <y>0</y>
               <width>373</width>
-              <height>115</height>
+              <height>112</height>
              </rect>
             </property>
             <attribute name="label">