Type annotations destroy some functions (#302)

* fix

comptages/chart/chart_dialog.py

@@ -24,7 +24,7 @@ def __init__(self, iface, layers, parent=None):
         self.count = None
         self.sensor = None
 
-    def set_attributes(self, count: models.Count):
+    def set_attributes(self, count):
         self.count = count
 
         self.setWindowTitle(
@@ -63,7 +63,7 @@ def set_attributes(self, count: models.Count):
 
         self._create_tabs(count)
 
-    def _create_tabs(self, count: models.Count):
+    def _create_tabs(self, count):
         try:
             self.tabWidget.currentChanged.disconnect(self.current_tab_changed)
         except Exception:
@@ -81,7 +81,7 @@ def _create_tabs(self, count: models.Count):
             self.tabWidget.addTab(tab, section.id)
             self._populate_tab(tab, section, count)
 
-    def _populate_tab(self, tab, section: models.Section, count: models.Count):
+    def _populate_tab(self, tab, section, count):
         # Check if there is data to be validated
         approval_process = False
         if models.CountDetail.objects.filter(
@@ -112,7 +112,7 @@ def _populate_tab(self, tab, section: models.Section, count: models.Count):
             tab.buttonValidate.hide()
             tab.buttonRefuse.hide()
 
-        sensor_type: models.SensorType = count.id_sensor_type
+        sensor_type = count.id_sensor_type
         lanes = models.Lane.objects.filter(id_section=section)
         directions = (
             lanes.values("direction").distinct().values_list("direction", flat=True)

comptages/core/importer.py

@@ -13,9 +13,7 @@ def simple_print_callback(progress):
     print(f"Importing... {progress}%")
 
 
-def import_file(
-    file_path: str, count: models.Count, callback_progress=simple_print_callback
-):
+def import_file(file_path: str, count, callback_progress=simple_print_callback):
     file_format = get_file_format(file_path)
     file_header = _parse_file_header(file_path)
 
@@ -46,7 +44,7 @@ def import_file(
 
 def _parse_and_write(
     file_path: str,
-    count: models.Count,
+    count,
     line_parser: Callable,
     callback_progress,
     from_aggregate: bool = False,
@@ -360,7 +358,7 @@ def _parse_data_header(file_path: str) -> List:
     return data_header
 
 
-def _populate_lane_dict(count: models.Count) -> Dict[int, int]:
+def _populate_lane_dict(count) -> Dict[int, int]:
     # e.g. lanes = {1: 435, 2: 436}
 
     lanes = models.Lane.objects.filter(id_installation__count=count).order_by("number")

comptages/core/importer_task.py

@@ -10,7 +10,7 @@
 
 
 class ImporterTask(QgsTask):
-    def __init__(self, file_path: str, count: models.Count):
+    def __init__(self, file_path: str, count):
         self.basename = os.path.basename(file_path)
         super().__init__("Importation fichier {}".format(self.basename))
 

comptages/core/layers.py

@@ -1014,15 +1014,15 @@ def get_sensor_length(self, lane_id: str):
             return query.value(0)
         return None
 
-    def get_models_by_sensor_type(self, sensor_type: models.SensorType):
+    def get_models_by_sensor_type(self, sensor_type):
         qs = models.SensorTypeModel.objects.filter(id_sensor_type=sensor_type)
 
         result = []
         for i in qs:
             result.append(i.id_model.id)
         return result
 
-    def get_classes_by_sensor_type(self, sensor_type: models.SensorType):
+    def get_classes_by_sensor_type(self, sensor_type):
         qs = models.SensorTypeClass.objects.filter(id_sensor_type=sensor_type)
 
         result = []

comptages/core/statistics.py

@@ -11,8 +11,8 @@
 
 
 def get_time_data(
-    count: models.Count,
-    section: models.Section,
+    count,
+    section,
     lane=None,
     direction=None,
     start=None,
@@ -422,9 +422,9 @@ def get_average_speed_by_hour(
 
 
 def get_category_data_by_hour(
-    count: models.Count,
-    section: models.Section,
-    category: models.Category,
+    count,
+    section,
+    category,
     lane=None,
     direction=None,
     start=None,

comptages/plan/plan_creator.py

@@ -10,7 +10,7 @@ class PlanCreator:
     def __init__(self):
         self.settings = Settings()
 
-    def export_pdf(self, count: models.Count, file_name: str):
+    def export_pdf(self, count, file_name: str):
         current_dir = os.path.dirname(os.path.abspath(__file__))
         qpt_file_path = os.path.join(current_dir, os.pardir, "qml", "plan.qpt")
         self.layout = PlanCreator.create_layout_from_template(qpt_file_path)
@@ -26,7 +26,7 @@ def export_pdf(self, count: models.Count, file_name: str):
 
         exporter.exportToPdf(file_name, exporter.PdfExportSettings())
 
-    def set_fields(self, count: models.Count):
+    def set_fields(self, count):
         section = models.Section.objects.filter(
             lane__id_installation__count=count
         ).distinct()[0]