work to fix bug in 'stop ongoing behavior between successive media'

olivierfriard · Jun 26, 2018 · ca59f50 · ca59f50
1 parent 623314f
commit ca59f50
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 deletions.
diff --git a/boris.py b/boris.py
@@ -4216,9 +4216,14 @@ def new_observation(self, mode=NEW, obsId=""):
 
 
             # cbCloseCurrentBehaviorsBetweenVideo
+
+            # DISABLED 
+            # FIXME
+            '''
             observationWindow.cbCloseCurrentBehaviorsBetweenVideo.setEnabled(True)
             if CLOSE_BEHAVIORS_BETWEEN_VIDEOS in self.pj[OBSERVATIONS][obsId]:
                 observationWindow.cbCloseCurrentBehaviorsBetweenVideo.setChecked(self.pj[OBSERVATIONS][obsId][CLOSE_BEHAVIORS_BETWEEN_VIDEOS])
+            '''
 
         # spectrogram
         #observationWindow.cbVisualizeSpectrogram.setEnabled(FLAG_MATPLOTLIB_INSTALLED)
@@ -4304,7 +4309,10 @@ def new_observation(self, mode=NEW, obsId=""):
 
 
             # cbCloseCurrentBehaviorsBetweenVideo
+            # FIXME
+            '''
             self.pj[OBSERVATIONS][new_obs_id][CLOSE_BEHAVIORS_BETWEEN_VIDEOS] = observationWindow.cbCloseCurrentBehaviorsBetweenVideo.isChecked()
+            '''
 
             if self.pj[OBSERVATIONS][new_obs_id][TYPE] in [LIVE]:
                 self.pj[OBSERVATIONS][new_obs_id]["scan_sampling_time"] = observationWindow.sbScanSampling.value()
@@ -8670,7 +8678,8 @@ def timer_out(self, scrollSlider=True):
             else:
                 self.statusbar.showMessage("Media length not available now", 0)
 
-            # stop 
+            # stop ongoing behaviors between successive media files
+            '''
             if (self.memMedia and mediaName != self.memMedia) or (self.mediaListPlayer.get_state() == vlc.State.Ended and self.timer.isActive()):
 
                 if (CLOSE_BEHAVIORS_BETWEEN_VIDEOS in self.pj[OBSERVATIONS][self.observationId] 
@@ -8693,11 +8702,8 @@ def timer_out(self, scrollSlider=True):
                                     if ev[EVENT_BEHAVIOR_FIELD_IDX] == behav:   # code
                                         cm = ev[EVENT_MODIFIER_FIELD_IDX]
 
-                            '''event = {"subject": subjName, "code": behav, "modifiers": cm, "comment": "", "excluded": ""}'''
-
                             end_time = currentTime / 1000 - Decimal("0.001")
 
-
                             new_event = {"type": "State event", "code": behav, "subject": subjName, "modifiers": cm}
                             print("new_event", new_event)
                             self.writeEvent(new_event, end_time)
@@ -8707,6 +8713,7 @@ def timer_out(self, scrollSlider=True):
                             #item = self.twEvents.item([i for i, t in enumerate(self.pj[OBSERVATIONS][self.observationId][EVENTS]) if t[0] == end_time][0], 0)
                             #self.twEvents.scrollToItem(item)
                             self.projectChanged = True
+            '''
 
             self.memMedia = mediaName
 

diff --git a/observation.ui b/observation.ui
@@ -218,7 +218,7 @@
            <item>
             <widget class="QTabWidget" name="tabWidget">
              <property name="currentIndex">
-              <number>2</number>
+              <number>0</number>
              </property>
              <widget class="QWidget" name="tab_player_1">
               <attribute name="title">
@@ -342,6 +342,9 @@
                    </item>
                    <item>
                     <widget class="QCheckBox" name="cbCloseCurrentBehaviorsBetweenVideo">
+                     <property name="enabled">
+                      <bool>false</bool>
+                     </property>
                      <property name="text">
                       <string>Stop ongoing state events between successive media files</string>
                      </property>

diff --git a/observation_ui.py b/observation_ui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'observation.ui'
 #
-# Created by: PyQt4 UI code generator 4.11.4
+# Created by: PyQt4 UI code generator 4.12.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -53,6 +53,7 @@ def setupUi(self, Form):
         self.layoutWidget = QtGui.QWidget(self.splitter)
         self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
         self.verticalLayout_2 = QtGui.QVBoxLayout(self.layoutWidget)
+        self.verticalLayout_2.setMargin(0)
         self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
         self.label_9 = QtGui.QLabel(self.layoutWidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
@@ -97,6 +98,7 @@ def setupUi(self, Form):
         self.layoutWidget1 = QtGui.QWidget(self.splitter)
         self.layoutWidget1.setObjectName(_fromUtf8("layoutWidget1"))
         self.verticalLayout_11 = QtGui.QVBoxLayout(self.layoutWidget1)
+        self.verticalLayout_11.setMargin(0)
         self.verticalLayout_11.setObjectName(_fromUtf8("verticalLayout_11"))
         self.label_3 = QtGui.QLabel(self.layoutWidget1)
         self.label_3.setObjectName(_fromUtf8("label_3"))
@@ -115,6 +117,7 @@ def setupUi(self, Form):
         self.layoutWidget2 = QtGui.QWidget(self.splitter_2)
         self.layoutWidget2.setObjectName(_fromUtf8("layoutWidget2"))
         self.verticalLayout_9 = QtGui.QVBoxLayout(self.layoutWidget2)
+        self.verticalLayout_9.setMargin(0)
         self.verticalLayout_9.setObjectName(_fromUtf8("verticalLayout_9"))
         self.tabProjectType = QtGui.QTabWidget(self.layoutWidget2)
         self.tabProjectType.setEnabled(True)
@@ -128,19 +131,22 @@ def setupUi(self, Form):
         self.tabVideo = QtGui.QWidget()
         self.tabVideo.setObjectName(_fromUtf8("tabVideo"))
         self.verticalLayout_14 = QtGui.QVBoxLayout(self.tabVideo)
+        self.verticalLayout_14.setMargin(0)
         self.verticalLayout_14.setObjectName(_fromUtf8("verticalLayout_14"))
         self.tabWidget = QtGui.QTabWidget(self.tabVideo)
         self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
         self.tab_player_1 = QtGui.QWidget()
         self.tab_player_1.setObjectName(_fromUtf8("tab_player_1"))
         self.verticalLayout_5 = QtGui.QVBoxLayout(self.tab_player_1)
+        self.verticalLayout_5.setMargin(0)
         self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5"))
         self.splitter_3 = QtGui.QSplitter(self.tab_player_1)
         self.splitter_3.setOrientation(QtCore.Qt.Vertical)
         self.splitter_3.setObjectName(_fromUtf8("splitter_3"))
         self.layoutWidget3 = QtGui.QWidget(self.splitter_3)
         self.layoutWidget3.setObjectName(_fromUtf8("layoutWidget3"))
         self.verticalLayout_3 = QtGui.QVBoxLayout(self.layoutWidget3)
+        self.verticalLayout_3.setMargin(0)
         self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
         self.label_5 = QtGui.QLabel(self.layoutWidget3)
         self.label_5.setObjectName(_fromUtf8("label_5"))
@@ -166,6 +172,7 @@ def setupUi(self, Form):
         self.layoutWidget4 = QtGui.QWidget(self.splitter_3)
         self.layoutWidget4.setObjectName(_fromUtf8("layoutWidget4"))
         self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget4)
+        self.verticalLayout.setMargin(0)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
         self.horizontalLayout_3 = QtGui.QHBoxLayout()
         self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3"))
@@ -191,6 +198,7 @@ def setupUi(self, Form):
         self.cbVisualizeSpectrogram.setObjectName(_fromUtf8("cbVisualizeSpectrogram"))
         self.verticalLayout.addWidget(self.cbVisualizeSpectrogram)
         self.cbCloseCurrentBehaviorsBetweenVideo = QtGui.QCheckBox(self.layoutWidget4)
+        self.cbCloseCurrentBehaviorsBetweenVideo.setEnabled(False)
         self.cbCloseCurrentBehaviorsBetweenVideo.setObjectName(_fromUtf8("cbCloseCurrentBehaviorsBetweenVideo"))
         self.verticalLayout.addWidget(self.cbCloseCurrentBehaviorsBetweenVideo)
         spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.MinimumExpanding)
@@ -200,13 +208,15 @@ def setupUi(self, Form):
         self.tab_player_2 = QtGui.QWidget()
         self.tab_player_2.setObjectName(_fromUtf8("tab_player_2"))
         self.verticalLayout_7 = QtGui.QVBoxLayout(self.tab_player_2)
+        self.verticalLayout_7.setMargin(0)
         self.verticalLayout_7.setObjectName(_fromUtf8("verticalLayout_7"))
         self.splitter_4 = QtGui.QSplitter(self.tab_player_2)
         self.splitter_4.setOrientation(QtCore.Qt.Vertical)
         self.splitter_4.setObjectName(_fromUtf8("splitter_4"))
         self.layoutWidget5 = QtGui.QWidget(self.splitter_4)
         self.layoutWidget5.setObjectName(_fromUtf8("layoutWidget5"))
         self.verticalLayout_4 = QtGui.QVBoxLayout(self.layoutWidget5)
+        self.verticalLayout_4.setMargin(0)
         self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4"))
         self.label_2 = QtGui.QLabel(self.layoutWidget5)
         self.label_2.setObjectName(_fromUtf8("label_2"))
@@ -229,6 +239,7 @@ def setupUi(self, Form):
         self.layoutWidget6 = QtGui.QWidget(self.splitter_4)
         self.layoutWidget6.setObjectName(_fromUtf8("layoutWidget6"))
         self.verticalLayout_6 = QtGui.QVBoxLayout(self.layoutWidget6)
+        self.verticalLayout_6.setMargin(0)
         self.verticalLayout_6.setObjectName(_fromUtf8("verticalLayout_6"))
         self.horizontalLayout_4 = QtGui.QHBoxLayout()
         self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4"))
@@ -272,13 +283,15 @@ def setupUi(self, Form):
         self.tab_data_files = QtGui.QWidget()
         self.tab_data_files.setObjectName(_fromUtf8("tab_data_files"))
         self.verticalLayout_17 = QtGui.QVBoxLayout(self.tab_data_files)
+        self.verticalLayout_17.setMargin(0)
         self.verticalLayout_17.setObjectName(_fromUtf8("verticalLayout_17"))
         self.splitter_5 = QtGui.QSplitter(self.tab_data_files)
         self.splitter_5.setOrientation(QtCore.Qt.Vertical)
         self.splitter_5.setObjectName(_fromUtf8("splitter_5"))
         self.layoutWidget7 = QtGui.QWidget(self.splitter_5)
         self.layoutWidget7.setObjectName(_fromUtf8("layoutWidget7"))
         self.verticalLayout_15 = QtGui.QVBoxLayout(self.layoutWidget7)
+        self.verticalLayout_15.setMargin(0)
         self.verticalLayout_15.setObjectName(_fromUtf8("verticalLayout_15"))
         self.label_7 = QtGui.QLabel(self.layoutWidget7)
         self.label_7.setObjectName(_fromUtf8("label_7"))
@@ -309,6 +322,7 @@ def setupUi(self, Form):
         self.layoutWidget8 = QtGui.QWidget(self.splitter_5)
         self.layoutWidget8.setObjectName(_fromUtf8("layoutWidget8"))
         self.verticalLayout_16 = QtGui.QVBoxLayout(self.layoutWidget8)
+        self.verticalLayout_16.setMargin(0)
         self.verticalLayout_16.setObjectName(_fromUtf8("verticalLayout_16"))
         self.horizontalLayout_5 = QtGui.QHBoxLayout()
         self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5"))
@@ -339,6 +353,7 @@ def setupUi(self, Form):
         self.tabLive = QtGui.QWidget()
         self.tabLive.setObjectName(_fromUtf8("tabLive"))
         self.verticalLayout_10 = QtGui.QVBoxLayout(self.tabLive)
+        self.verticalLayout_10.setMargin(0)
         self.verticalLayout_10.setObjectName(_fromUtf8("verticalLayout_10"))
         self.verticalLayout_8 = QtGui.QVBoxLayout()
         self.verticalLayout_8.setObjectName(_fromUtf8("verticalLayout_8"))
@@ -380,7 +395,7 @@ def setupUi(self, Form):
 
         self.retranslateUi(Form)
         self.tabProjectType.setCurrentIndex(0)
-        self.tabWidget.setCurrentIndex(2)
+        self.tabWidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):

diff --git a/observation_ui5.py b/observation_ui5.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'observation.ui'
 #
-# Created by: PyQt5 UI code generator 5.5.1
+# Created by: PyQt5 UI code generator 5.9.2
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -39,6 +39,7 @@ def setupUi(self, Form):
         self.layoutWidget = QtWidgets.QWidget(self.splitter)
         self.layoutWidget.setObjectName("layoutWidget")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.layoutWidget)
+        self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
         self.label_9 = QtWidgets.QLabel(self.layoutWidget)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
@@ -83,6 +84,7 @@ def setupUi(self, Form):
         self.layoutWidget1 = QtWidgets.QWidget(self.splitter)
         self.layoutWidget1.setObjectName("layoutWidget1")
         self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.layoutWidget1)
+        self.verticalLayout_11.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_11.setObjectName("verticalLayout_11")
         self.label_3 = QtWidgets.QLabel(self.layoutWidget1)
         self.label_3.setObjectName("label_3")
@@ -101,6 +103,7 @@ def setupUi(self, Form):
         self.layoutWidget2 = QtWidgets.QWidget(self.splitter_2)
         self.layoutWidget2.setObjectName("layoutWidget2")
         self.verticalLayout_9 = QtWidgets.QVBoxLayout(self.layoutWidget2)
+        self.verticalLayout_9.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_9.setObjectName("verticalLayout_9")
         self.tabProjectType = QtWidgets.QTabWidget(self.layoutWidget2)
         self.tabProjectType.setEnabled(True)
@@ -127,6 +130,7 @@ def setupUi(self, Form):
         self.layoutWidget3 = QtWidgets.QWidget(self.splitter_3)
         self.layoutWidget3.setObjectName("layoutWidget3")
         self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.layoutWidget3)
+        self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_3.setObjectName("verticalLayout_3")
         self.label_5 = QtWidgets.QLabel(self.layoutWidget3)
         self.label_5.setObjectName("label_5")
@@ -152,6 +156,7 @@ def setupUi(self, Form):
         self.layoutWidget4 = QtWidgets.QWidget(self.splitter_3)
         self.layoutWidget4.setObjectName("layoutWidget4")
         self.verticalLayout = QtWidgets.QVBoxLayout(self.layoutWidget4)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setObjectName("verticalLayout")
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
@@ -177,6 +182,7 @@ def setupUi(self, Form):
         self.cbVisualizeSpectrogram.setObjectName("cbVisualizeSpectrogram")
         self.verticalLayout.addWidget(self.cbVisualizeSpectrogram)
         self.cbCloseCurrentBehaviorsBetweenVideo = QtWidgets.QCheckBox(self.layoutWidget4)
+        self.cbCloseCurrentBehaviorsBetweenVideo.setEnabled(False)
         self.cbCloseCurrentBehaviorsBetweenVideo.setObjectName("cbCloseCurrentBehaviorsBetweenVideo")
         self.verticalLayout.addWidget(self.cbCloseCurrentBehaviorsBetweenVideo)
         spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.MinimumExpanding)
@@ -193,6 +199,7 @@ def setupUi(self, Form):
         self.layoutWidget5 = QtWidgets.QWidget(self.splitter_4)
         self.layoutWidget5.setObjectName("layoutWidget5")
         self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.layoutWidget5)
+        self.verticalLayout_4.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_4.setObjectName("verticalLayout_4")
         self.label_2 = QtWidgets.QLabel(self.layoutWidget5)
         self.label_2.setObjectName("label_2")
@@ -215,6 +222,7 @@ def setupUi(self, Form):
         self.layoutWidget6 = QtWidgets.QWidget(self.splitter_4)
         self.layoutWidget6.setObjectName("layoutWidget6")
         self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.layoutWidget6)
+        self.verticalLayout_6.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_6.setObjectName("verticalLayout_6")
         self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_4.setObjectName("horizontalLayout_4")
@@ -265,6 +273,7 @@ def setupUi(self, Form):
         self.layoutWidget7 = QtWidgets.QWidget(self.splitter_5)
         self.layoutWidget7.setObjectName("layoutWidget7")
         self.verticalLayout_15 = QtWidgets.QVBoxLayout(self.layoutWidget7)
+        self.verticalLayout_15.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_15.setObjectName("verticalLayout_15")
         self.label_7 = QtWidgets.QLabel(self.layoutWidget7)
         self.label_7.setObjectName("label_7")
@@ -295,6 +304,7 @@ def setupUi(self, Form):
         self.layoutWidget8 = QtWidgets.QWidget(self.splitter_5)
         self.layoutWidget8.setObjectName("layoutWidget8")
         self.verticalLayout_16 = QtWidgets.QVBoxLayout(self.layoutWidget8)
+        self.verticalLayout_16.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout_16.setObjectName("verticalLayout_16")
         self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_5.setObjectName("horizontalLayout_5")
@@ -366,7 +376,7 @@ def setupUi(self, Form):
 
         self.retranslateUi(Form)
         self.tabProjectType.setCurrentIndex(0)
-        self.tabWidget.setCurrentIndex(2)
+        self.tabWidget.setCurrentIndex(0)
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):