Fixed experiment manager ui

dev-jam · Nov 27, 2017 · 1a1ed38 · 1a1ed38
1 parent 5d0d7fa
commit 1a1ed38
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Copyright Bob Rosbag (2015)
 
 ABOUT
 -----
-Current version: 2.6
+Current version: 2.7
 
 OpenSesame Toolbox offers two applications to supplement OpenSesame.  
 
@@ -29,7 +29,7 @@ It is also possible to use OpenSesame Questionnaire Processor from CLI:
 
     python opensesame-questionnaire-processor <source_folder> [<target_folder>]
 
-In linux with Python 2 set to default, "python3" has to be used as cmd instead of "python".
+In linux where Python 2 is default, <python3> has to be used as cmd instead of <python>
 To use the CLI method it is required the questionnaires originate from the OpenSesame Experiment Manager or contain the same column names in the log files.
 
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+opensesame-toolbox (2.7-1) stretch; urgency=medium
+
+  * Fixed experiment manager ui.
+
+ -- Bob Rosbag <[email protected]>  Mon, 27 Nov 2017 10:14:15 +0200
+
 opensesame-toolbox (2.6-1) stretch; urgency=medium
 
   * Replaced resource function in io_tools.

diff --git a/libopensesametoolbox/experimentmanager_ui.py b/libopensesametoolbox/experimentmanager_ui.py
@@ -36,7 +36,7 @@
 from libopensesametoolbox.clean_data import stringToBool
 
 
-version = "2.6"
+version = "2.7"
 author = "Bob Rosbag"
 email = "[email protected]"
 

diff --git a/libopensesametoolbox/questionnaireprocessor_ui.py b/libopensesametoolbox/questionnaireprocessor_ui.py
@@ -30,7 +30,7 @@
 from libopensesametoolbox.io_tools import OutLog, getResourceLoc
 from libopensesametoolbox.clean_data import cleanUpString, cleanUpStringList, removeJunk, stringToBool
 
-version = "2.6"
+version = "2.7"
 author = "Bob Rosbag"
 email = "[email protected]"
 

diff --git a/opensesametoolbox_resources/experimentmanager.ui b/opensesametoolbox_resources/experimentmanager.ui
@@ -63,7 +63,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>30</y>
-       <width>110</width>
+       <width>151</width>
        <height>16</height>
       </rect>
      </property>
@@ -85,7 +85,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>60</y>
-       <width>62</width>
+       <width>91</width>
        <height>16</height>
       </rect>
      </property>
@@ -222,7 +222,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>90</y>
-       <width>158</width>
+       <width>141</width>
        <height>16</height>
       </rect>
      </property>
@@ -236,7 +236,7 @@ p, li { white-space: pre-wrap; }
       <string>Insert the subject number</string>
      </property>
      <property name="text">
-      <string>Subject number (integer)</string>
+      <string>Subject number</string>
      </property>
     </widget>
     <widget class="QLineEdit" name="subjectLineEdit">
@@ -255,6 +255,19 @@ p, li { white-space: pre-wrap; }
       </sizepolicy>
      </property>
     </widget>
+    <widget class="QLabel" name="label">
+     <property name="geometry">
+      <rect>
+       <x>400</x>
+       <y>90</y>
+       <width>121</width>
+       <height>18</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>* integer</string>
+     </property>
+    </widget>
    </widget>
    <widget class="QGroupBox" name="groupBox_2">
     <property name="geometry">
@@ -273,7 +286,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>30</y>
-       <width>113</width>
+       <width>161</width>
        <height>20</height>
       </rect>
      </property>
@@ -292,7 +305,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>60</y>
-       <width>138</width>
+       <width>181</width>
        <height>20</height>
       </rect>
      </property>
@@ -309,9 +322,9 @@ p, li { white-space: pre-wrap; }
     <widget class="QLabel" name="resolutionHorizontalLabel">
      <property name="geometry">
       <rect>
-       <x>210</x>
+       <x>200</x>
        <y>34</y>
-       <width>129</width>
+       <width>151</width>
        <height>16</height>
       </rect>
      </property>
@@ -328,9 +341,9 @@ p, li { white-space: pre-wrap; }
     <widget class="QLabel" name="resolutionVerticalLabel">
      <property name="geometry">
       <rect>
-       <x>210</x>
+       <x>200</x>
        <y>63</y>
-       <width>114</width>
+       <width>151</width>
        <height>16</height>
       </rect>
      </property>
@@ -394,7 +407,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>30</y>
-       <width>219</width>
+       <width>271</width>
        <height>20</height>
       </rect>
      </property>
@@ -419,7 +432,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>60</y>
-       <width>125</width>
+       <width>151</width>
        <height>16</height>
       </rect>
      </property>
@@ -441,7 +454,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>90</y>
-       <width>65</width>
+       <width>101</width>
        <height>16</height>
       </rect>
      </property>
@@ -569,7 +582,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>120</y>
-       <width>407</width>
+       <width>501</width>
        <height>16</height>
       </rect>
      </property>
@@ -601,7 +614,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>10</x>
        <y>30</y>
-       <width>123</width>
+       <width>171</width>
        <height>16</height>
       </rect>
      </property>
@@ -745,7 +758,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>180</x>
        <y>90</y>
-       <width>85</width>
+       <width>111</width>
        <height>16</height>
       </rect>
      </property>
@@ -795,7 +808,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>180</x>
        <y>120</y>
-       <width>85</width>
+       <width>111</width>
        <height>16</height>
       </rect>
      </property>
@@ -814,7 +827,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>180</x>
        <y>60</y>
-       <width>171</width>
+       <width>211</width>
        <height>16</height>
       </rect>
      </property>
@@ -932,7 +945,7 @@ p, li { white-space: pre-wrap; }
       <rect>
        <x>180</x>
        <y>30</y>
-       <width>156</width>
+       <width>201</width>
        <height>16</height>
       </rect>
      </property>