boris-behav-obs 9.2.3__py2.py3-none-any.whl → 9.3.1__py2.py3-none-any.whl

boris/1.py

@@ -0,0 +1,45 @@
+import time
+from PIL import Image, ImageDraw, ImageFont
+import mpv
+
+player = mpv.MPV()
+
+player.loop = True
+player.play('/home/olivier/gdrive_sync/src/python/generate_video_test/video1.mp4')
+player.wait_until_playing()
+
+font = ImageFont.truetype('DejaVuSans.ttf', 40)
+
+overlay = player.create_image_overlay()
+
+img = Image.new('RGBA', (400, 150),  (255, 255, 255, 0))
+d = ImageDraw.Draw(img)
+d.text((10, 10), 'Hello World', font=font, fill=(0, 255, 255, 128))
+#d.text((10, 60), f't={ts:.3f}', font=font, fill=(255, 0, 255, 255))
+
+pos = 100
+
+overlay.update(img, pos=(2*pos, pos))
+
+
+while not player.core_idle:
+    pass
+
+
+    '''
+    for pos in range(0, 500, 5):
+        ts = player.time_pos
+        if ts is None:
+            break
+
+        img = Image.new('RGBA', (400, 150),  (255, 255, 255, 0))
+        d = ImageDraw.Draw(img)
+        d.text((10, 10), 'Hello World', font=font, fill=(0, 255, 255, 128))
+        d.text((10, 60), f't={ts:.3f}', font=font, fill=(255, 0, 255, 255))
+
+        overlay.update(img, pos=(2*pos, pos))
+        time.sleep(0.05)
+
+
+    overlay.remove()
+    '''

boris/behav_coding_map_creator.py

@@ -114,14 +114,14 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         self.openMapAction.setStatusTip("Open a behaviors coding map")
         self.openMapAction.triggered.connect(self.openMap)
 
-        self.saveMapAction = QAction(QIcon(), "&Save the current behaviors coding map", self)
+        self.saveMapAction = QAction(QIcon(), "&Save the behavior coding map", self)
         self.saveMapAction.setShortcut("Ctrl+S")
-        self.saveMapAction.setStatusTip("Save the current behaviors coding map")
+        self.saveMapAction.setStatusTip("Save the behavior coding map")
         self.saveMapAction.setEnabled(False)
         self.saveMapAction.triggered.connect(self.saveMap_clicked)
 
-        self.saveAsMapAction = QAction(QIcon(), "Save the current behaviors coding map as ...", self)
-        self.saveAsMapAction.setStatusTip("Save the current behaviors coding map as ...")
+        self.saveAsMapAction = QAction(QIcon(), "Save the behavior coding map as ...", self)
+        self.saveAsMapAction.setStatusTip("Save the behavior coding map as ...")
         self.saveAsMapAction.setEnabled(False)
         self.saveAsMapAction.triggered.connect(self.saveAsMap_clicked)
 
@@ -131,6 +131,11 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         self.mapNameAction.setEnabled(False)
         self.mapNameAction.triggered.connect(self.mapName_clicked)
 
+        self.resizeAction = QAction(QIcon(), "Resize the image", self)
+        self.resizeAction.setStatusTip("Resize the image")
+        self.resizeAction.setEnabled(False)
+        self.resizeAction.triggered.connect(self.resize_clicked)
+
         self.addToProject = QAction(QIcon(), "Add coding map to project", self)
         self.addToProject.setStatusTip("Add coding map to project")
         self.addToProject.setEnabled(False)
@@ -149,16 +154,13 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         fileMenu.addSeparator()
         fileMenu.addAction(self.mapNameAction)
         fileMenu.addSeparator()
+        fileMenu.addAction(self.resizeAction)
+        fileMenu.addSeparator()
         fileMenu.addAction(self.addToProject)
         fileMenu.addSeparator()
         fileMenu.addAction(self.exitAction)
 
         splitter1 = QSplitter(Qt.Vertical)
-        """
-        splitter1.addWidget(splitter1)
-        splitter1.addWidget(bottom)
-        """
-        """vlayout_list = QVBoxLayout()"""
 
         self.view = self.View(self)
         self.view.mousePress.connect(self.viewMousePressEvent)
@@ -168,7 +170,6 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         vlayout_list.addWidget(QLabel("Defined area"))
 
         self.area_list = QListWidget(self)
-        # self.area_list.setMaximumHeight(120)
         self.area_list.itemClicked.connect(self.area_list_item_click)
         vlayout_list.addWidget(self.area_list)
         w = QWidget()
@@ -177,10 +178,6 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         splitter1.setSizes([300, 100])
         splitter1.setStretchFactor(2, 8)
 
-        self.btLoad = QPushButton("Load bitmap", self)
-        self.btLoad.clicked.connect(self.loadBitmap)
-        self.btLoad.setVisible(False)
-
         hlayout_cmd = QHBoxLayout()
 
         self.btNewArea = QPushButton("New behavior area", self)
@@ -249,16 +246,9 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         frame.setLayout(vlayout_frame)
 
         vlayout = QVBoxLayout()
-        """
-        vlayout.addWidget(self.view)
-        vlayout.addWidget(QLabel("Defined area"))
-        vlayout.addWidget(self.area_list)
-        """
-        vlayout.addWidget(splitter1)
-        """vlayout.addLayout(vlayout_view_list)"""
 
+        vlayout.addWidget(splitter1)
         vlayout.addWidget(frame)
-        vlayout.addWidget(self.btLoad)
 
         main_widget = QWidget(self)
         main_widget.setLayout(vlayout)
@@ -305,19 +295,21 @@ class BehaviorsMapCreatorWindow(QMainWindow):
 
         self.selectedPolygon.setPen(QPen(QColor(255, 0, 0, 255), 2, Qt.SolidLine, Qt.RoundCap, Qt.RoundJoin))
 
-        self.lb.setVisible(True)
         self.leAreaCode.setText(ac)
-        self.leAreaCode.setVisible(True)
-        self.btEditAreaCode.setVisible(True)
 
-        self.btDeleteArea.setVisible(True)
+        for widget in (
+            self.lb,
+            self.leAreaCode,
+            self.btEditAreaCode,
+            self.btDeleteArea,
+            self.btColor,
+            self.slAlpha,
+        ):
+            widget.setVisible(True)
 
         self.areaColor = self.selectedPolygon.brush().color()
         self.btColor.setStyleSheet(f"QWidget {{background-color:{self.selectedPolygon.brush().color().name()}}}")
-        self.btColor.setVisible(True)
-
-        self.slAlpha.setValue(int(self.selectedPolygon.brush().color().alpha() / 255 * 100))
-        self.slAlpha.setVisible(True)
+        self.slAlpha.setValue(int(self.areaColor.alpha() / 255 * 100))
 
     def edit_area_code(self):
         """
@@ -369,9 +361,7 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         cd.setWindowFlags(Qt.WindowStaysOnTopHint)
         cd.setOptions(QColorDialog.DontUseNativeDialog)
 
-        # col = cd.getColor()
-        # if col.isValid():
-        if cd.exec_():
+        if cd.exec():
             self.areaColor = cd.currentColor()
             self.btColor.setStyleSheet(f"QWidget {{background-color:{self.areaColor.name()}}}")
             self.areaColor.setAlpha(int(self.slAlpha.value() / 100 * 255))
@@ -440,30 +430,29 @@ class BehaviorsMapCreatorWindow(QMainWindow):
                 self.selectedPolygon = None
                 self.selectedPolygonMemBrush = None
 
+            print(self.polygonsList2)
+            idx = 0
             for areaCode, pg in self.polygonsList2:
                 if pg.contains(test):
                     self.selectedPolygon = pg
-
                     self.selectedPolygonMemBrush = self.selectedPolygon.brush()
-
                     self.selectedPolygon.setPen(QPen(QColor(255, 0, 0, 255), 2, Qt.SolidLine, Qt.RoundCap, Qt.RoundJoin))
-
-                    self.lb.setVisible(True)
                     self.leAreaCode.setText(areaCode)
-                    self.leAreaCode.setVisible(True)
-                    # self.leAreaCode.setEnabled(False)
-                    self.btEditAreaCode.setVisible(True)
 
-                    self.btDeleteArea.setVisible(True)
+                    for widget in (self.lb, self.leAreaCode, self.btEditAreaCode, self.btColor, self.slAlpha, self.btDeleteArea):
+                        widget.setVisible(True)
 
                     self.areaColor = self.selectedPolygon.brush().color()
                     self.btColor.setStyleSheet(f"QWidget {{background-color:{self.selectedPolygon.brush().color().name()}}}")
-                    self.btColor.setVisible(True)
 
-                    self.slAlpha.setValue(int(self.selectedPolygon.brush().color().alpha() / 255 * 100))
-                    self.slAlpha.setVisible(True)
+                    self.slAlpha.setValue(int(self.areaColor.alpha() / 255 * 100))
+
+                    # select area in list widget
+                    item = self.area_list.item(idx)
+                    self.area_list.setCurrentItem(item)
 
                     break
+                idx += 1
 
             if not self.selectedPolygon:
                 self.leAreaCode.setVisible(False)
@@ -489,6 +478,20 @@ class BehaviorsMapCreatorWindow(QMainWindow):
                 self.view.scene().removeItem(self.view.elList[-1])
                 self.view.elList = self.view.elList[0:-1]
 
+        # middle button automatically close the polygon
+        if (event.buttons() & Qt.MiddleButton) and not self.closedPolygon:
+            line = QGraphicsLineItem(QLineF(self.view._start, QPoint(self.view.points[0][0], self.view.points[0][1])))
+            line.setPen(QPen(designColor, penWidth, Qt.SolidLine, Qt.RoundCap, Qt.RoundJoin))
+
+            self.view.scene().addItem(line)
+            self.view.elList.append(line)
+
+            self.statusBar().showMessage("Area completed")
+
+            # create polygon
+            add_polygon()
+            return
+
         # add line item
         if event.buttons() == Qt.LeftButton and not self.closedPolygon:
             if self.view._start:
@@ -642,9 +645,6 @@ class BehaviorsMapCreatorWindow(QMainWindow):
 
         self.loadBitmap()
 
-        # self.btLoad.setVisible(True)
-        # self.statusBar().showMessage('Click "Load bitmap" button to select and load a bitmap into the viewer')
-
     def openMap(self):
         """
         open a coding map from file
@@ -667,7 +667,7 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         )
 
         if not fileName:
-            self.statusBar().showMessage("No file", 5000)
+            return
         try:
             self.codingMap = json.loads(open(fileName, "r").read())
         except Exception:
@@ -676,6 +676,7 @@ class BehaviorsMapCreatorWindow(QMainWindow):
 
         if "coding_map_type" not in self.codingMap or self.codingMap["coding_map_type"] != "BORIS behaviors coding map":
             QMessageBox.critical(self, cfg.programName, f"The file {fileName} is not a BORIS behaviors coding map.")
+            return
 
         self.cancelMap()
 
@@ -707,7 +708,6 @@ class BehaviorsMapCreatorWindow(QMainWindow):
                 newPolygon.append(QPoint(p[0], p[1]))
 
             # draw polygon
-            """polygon = QGraphicsPolygonItem(None, None) if QT_VERSION_STR[0] == "4" else QGraphicsPolygonItem()"""
             polygon = QGraphicsPolygonItem()
             polygon.setPolygon(newPolygon)
             clr = QColor()
@@ -720,12 +720,15 @@ class BehaviorsMapCreatorWindow(QMainWindow):
             self.polygonsList2.append([areaCode, polygon])
 
         self.btNewArea.setVisible(True)
-        self.btLoad.setVisible(False)
 
-        self.saveMapAction.setEnabled(True)
-        self.saveAsMapAction.setEnabled(True)
-        self.addToProject.setEnabled(True)
-        self.mapNameAction.setEnabled(True)
+        for action in (
+            self.saveMapAction,
+            self.saveAsMapAction,
+            self.addToProject,
+            self.mapNameAction,
+            self.resizeAction,
+        ):
+            action.setEnabled(True)
 
         self.update_area_list()
 
@@ -811,7 +814,7 @@ class BehaviorsMapCreatorWindow(QMainWindow):
 
     def newArea(self):
         if not self.bitmapFileName:
-            QMessageBox.critical(self, cfg.programName, "A bitmap must be loaded before to define areas")
+            QMessageBox.critical(self, cfg.programName, "An image must be loaded before to define areas")
             return
 
         if self.selectedPolygon:
@@ -832,7 +835,7 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         self.btDeleteArea.setVisible(False)
 
         self.statusBar().showMessage(
-            ("Click on bitmap to set the vertices of the area with the mouse " "(right click will cancel the last point)")
+            ("Click on bitmap to set the vertices of the area with the mouse (right click will cancel the last point)")
         )
 
     def saveArea(self):
@@ -840,7 +843,7 @@ class BehaviorsMapCreatorWindow(QMainWindow):
             QMessageBox.critical(
                 self,
                 cfg.programName,
-                ("You must close your area before saving it.\n" "The last vertex must correspond to the first one."),
+                ("You must close your area before saving it.\nThe last vertex must correspond to the first one."),
             )
 
         if len(self.view.points) < 3:
@@ -858,14 +861,15 @@ class BehaviorsMapCreatorWindow(QMainWindow):
 
         # draw polygon
         self.closedPolygon.setBrush(QBrush(self.areaColor, Qt.SolidPattern))
-        # self.polygonsList2[self.leAreaCode.text()] = self.closedPolygon
         self.polygonsList2.append([self.leAreaCode.text(), self.closedPolygon])
 
-        self.closedPolygon, self.flagNewArea = None, None
+        self.flagNewArea = None
+        self.closedPolygon = None
         self.view._start = 0
-        self.view.points, self.view.elList = [], []
+        self.view.points = []
+        self.view.elList = []
 
-        for widget in [
+        for widget in (
             self.btSaveArea,
             self.btCancelAreaCreation,
             self.lb,
@@ -875,18 +879,18 @@ class BehaviorsMapCreatorWindow(QMainWindow):
             self.slAlpha,
             self.btDeleteArea,
             self.btNewArea,
-        ]:
+        ):
             widget.setVisible(False)
 
         self.btNewArea.setVisible(True)
 
         self.leAreaCode.setText("")
 
+        self.update_area_list()
+
         self.flag_map_changed = True
         self.statusBar().showMessage("New area saved", 5000)
 
-        self.update_area_list()
-
     def cancelAreaCreation(self):
         if self.closedPolygon:
             self.view.scene().removeItem(self.closedPolygon)
@@ -945,18 +949,15 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         self.view._start = 0
         self.view.points = []
         self.flagNewArea = False
-        self.btSaveArea.setVisible(False)
-        self.lb.setVisible(False)
 
-        self.btColor.setVisible(False)
-        self.slAlpha.setVisible(False)
+        for widget in (self.btSaveArea, self.lb, self.btColor, self.slAlpha, self.leAreaCode, self.btDeleteArea):
+            widget.setVisible(False)
+
         self.btNewArea.setVisible(True)
 
-        self.leAreaCode.setVisible(False)
         self.leAreaCode.setText("")
         self.btEditAreaCode.setVisible(False)
 
-        self.btDeleteArea.setVisible(False)
         self.statusBar().showMessage("")
 
         self.update_area_list()
@@ -967,16 +968,22 @@ class BehaviorsMapCreatorWindow(QMainWindow):
         """
         self.flagNewArea = False
         self.polygonsList2 = []
+        self.closedPolygon = None
+        self.selectedPolygon = None
+        self.area_list.clear()
         self.view.scene().clear()
-        self.btLoad.setVisible(False)
         self.btDeleteArea.setVisible(False)
         self.btNewArea.setVisible(False)
         self.saveMapAction.setEnabled(False)
         self.saveAsMapAction.setEnabled(False)
         self.addToProject.setEnabled(False)
         self.mapNameAction.setEnabled(False)
+        self.resizeAction.setEnabled(False)
         self.statusBar().showMessage("")
 
+        self.btNewArea.setVisible(True)
+        self.btNewArea.setEnabled(True)
+
         self.flag_map_changed = False
 
     def loadBitmap(self):
@@ -1017,16 +1024,59 @@ class BehaviorsMapCreatorWindow(QMainWindow):
 
         self.btNewArea.setVisible(True)
 
-        self.btLoad.setVisible(False)
         self.saveMapAction.setEnabled(True)
         self.saveAsMapAction.setEnabled(True)
         self.addToProject.setEnabled(True)
         self.mapNameAction.setEnabled(True)
+        self.resizeAction.setEnabled(True)
 
         self.statusBar().showMessage("""Click "New behavior area" to create a new behavior area""")
 
         self.flag_map_changed = True
 
+    def resize_clicked(self):
+        """
+        resize the bitmap
+        """
+
+        if self.polygonsList2:
+            if (
+                dialog.MessageDialog(
+                    "BORIS - Behaviors map creator",
+                    "The map contains modifiers. Erase all modifiers",
+                    (cfg.NO, cfg.YES),
+                )
+                == cfg.NO
+            ):
+                return
+
+        integer, ok = QInputDialog.getInt(
+            self, "Resize image", "New horizontal size (in pixels)", value=self.pixmap.size().width(), minValue=100, maxValue=3048, step=10
+        )
+        if not ok:
+            return
+
+        self.cancelMap()
+
+        h = int(self.pixmap.size().width() / (self.pixmap.size().width() / integer))
+
+        self.pixmap = self.pixmap.scaled(integer, h, Qt.KeepAspectRatio)
+
+        self.view.scene().clear()
+        self.view.setSceneRect(0, 0, self.pixmap.size().width(), self.pixmap.size().height())
+        pixitem = QGraphicsPixmapItem(self.pixmap)
+        pixitem.setPos(0, 0)
+        self.view.scene().addItem(pixitem)
+
+        QMessageBox.information(
+            self,
+            cfg.programName,
+            (
+                f"The bitmap was resized to {self.pixmap.size().width()}x{self.pixmap.size().height()} pixels\n"
+                "The original file was not modified"
+            ),
+        )
+
 
 def behaviors_coding_map_creator(self):
     """
@@ -1034,7 +1084,9 @@ def behaviors_coding_map_creator(self):
     """
 
     if not self.project:
-        QMessageBox.warning(self, cfg.programName, "No project found", QMessageBox.Ok | QMessageBox.Default, QMessageBox.NoButton)
+        QMessageBox.warning(
+            self, cfg.programName, "Create or open a project first", QMessageBox.Ok | QMessageBox.Default, QMessageBox.NoButton
+        )
         return
 
     codes_list = [self.pj[cfg.ETHOGRAM][key][cfg.BEHAVIOR_CODE] for key in self.pj[cfg.ETHOGRAM]]
@@ -1053,6 +1105,11 @@ if __name__ == "__main__":
 
     app = QApplication(sys.argv)
     window = BehaviorsMapCreatorWindow(["North zone", "East zone", "South zone", "West zone"])
+    window.bcm_list = []
     window.resize(cfg.CODING_MAP_RESIZE_W, cfg.CODING_MAP_RESIZE_H)
+    screen_geometry = app.primaryScreen().geometry()
+    center_x = (screen_geometry.width() - window.width()) // 2
+    center_y = (screen_geometry.height() - window.height()) // 2
+    window.move(center_x, center_y)
     window.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec())

boris/behaviors_coding_map.py

@@ -20,6 +20,9 @@ This file is part of BORIS.
 
 """
 
+import json
+import binascii
+
 from PySide6.QtGui import QMouseEvent, QPixmap, QPolygonF, QColor, QBrush, QPen
 from PySide6.QtCore import Qt, Signal, QEvent, QPoint
 from PySide6.QtWidgets import (
@@ -38,12 +41,10 @@ from PySide6.QtWidgets import (
     QApplication,
 )
 
-import json
-import binascii
 from . import config as cfg
 
-codeSeparator = ","
-penWidth = 0
+codeSeparator: str = ","
+penWidth: int = 0
 penStyle = Qt.NoPen
 
 

boris/connections.py

@@ -49,7 +49,6 @@ from . import (
     video_operations,
     project_functions,
     external_processes,
-    plugins,
 )
 
 from . import state_events as state_events

boris/core.py

@@ -93,7 +93,7 @@ from PIL.ImageQt import Image
 from . import dialog
 from . import gui_utilities
 from . import events_cursor
-from . import map_creator
+from . import modifier_coding_map_creator
 from . import geometric_measurement
 from . import modifiers_coding_map
 from . import advanced_event_filtering
@@ -1336,7 +1336,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         """
         show modifiers coding map creator window and hide program main window
         """
-        self.mapCreatorWindow = map_creator.ModifiersMapCreatorWindow()
+        self.mapCreatorWindow = modifier_coding_map_creator.ModifiersMapCreatorWindow()
         self.mapCreatorWindow.move(self.pos())
         self.mapCreatorWindow.resize(cfg.CODING_MAP_RESIZE_W, cfg.CODING_MAP_RESIZE_H)
         self.mapCreatorWindow.show()
@@ -4047,11 +4047,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             try:
                 behavior_idx = [key for key in self.pj[cfg.ETHOGRAM] if self.pj[cfg.ETHOGRAM][key][cfg.BEHAVIOR_CODE] == code][0]
             except Exception:
-                QMessageBox.critical(
-                    self,
-                    cfg.programName,
-                    f"The code <b>{code}</b> of behavior coding map does not exist in ethogram.",
+                msg_box = QMessageBox(
+                    QMessageBox.Critical, cfg.programName, f"The code <b>{code}</b> of behavior coding map does not exist in ethogram."
                 )
+                msg_box.setWindowFlags(msg_box.windowFlags() | Qt.WindowStaysOnTopHint)
+                msg_box.exec()
                 return
 
             event = self.full_event(behavior_idx)
@@ -4072,8 +4072,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             else:
                 write_event.write_event(self, event, cumulative_time)
 
-            # write_event.write_event(self.event, self.getLaps())
-
     def keypress_signal_from_behaviors_coding_map(self, event):
         """
         receive signal from behaviors coding map
@@ -4786,12 +4784,13 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             return dec("0")
 
         if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.LIVE:
-            if "Live observation finished" in self.pb_live_obs.text():
-                return dec("NaN"), None
+            if "finished" in self.pb_live_obs.text():
+                return dec("NaN"), dec("NaN")
             if self.liveObservationStarted:
-                return dec(str(round(self.liveStartTime.elapsed() / 1000, 3))), None
+                t = dec(str(round(self.liveStartTime.elapsed() / 1000, 3)))
+                return t, t
             else:
-                return dec("0"), None
+                return dec("0"), dec("0")
 
         if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.IMAGES:
             if self.playerType == cfg.VIEWER_IMAGES:

boris/event_operations.py

@@ -906,15 +906,18 @@ def paste_clipboard_to_events(self):
         content.append(line.split("\t"))
 
     if set(length) != set([len(cfg.PJ_EVENTS_FIELDS[self.playerType])]):
-        QMessageBox.warning(
-            self,
+        msg_box = QMessageBox(
+            QMessageBox.Warning,
             cfg.programName,
             (
-                "The clipboard does not contain events!\n"
+                "The clipboard does not contain events!<br>"
                 f"For an observation from <b>{self.playerType}</b> "
                 f"the events must be organized in {len(cfg.PJ_EVENTS_FIELDS[self.playerType])} columns separated by <TAB> character"
             ),
         )
+        msg_box.setWindowFlags(msg_box.windowFlags() | Qt.WindowStaysOnTopHint)
+        msg_box.exec()
+
         return
 
     for event in content: