remove kpi (#201)

remove references to old kpis and kpi page
zauberzeug · Oct 16, 2024 · fe2f8d2 · fe2f8d2
1 parent e57535d
commit fe2f8d2
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 63 deletions.
diff --git a/field_friend/automations/implements/implement.py b/field_friend/automations/implements/implement.py
@@ -14,7 +14,7 @@ async def prepare(self) -> bool:
         return True
 
     async def finish(self) -> None:
-        """Finish the implement once at the end (for example to store KPIs)"""
+        """Finish the implement once at the end"""
 
     async def activate(self):
         """Activate the implement (for example to start weeding in a new row)"""

diff --git a/field_friend/automations/puncher.py b/field_friend/automations/puncher.py
@@ -6,7 +6,6 @@
 from rosys.geometry import Point
 
 from ..hardware import Axis, ChainAxis, FieldFriend, Tornado
-from .kpi_provider import KpiProvider
 
 
 class PuncherException(Exception):

diff --git a/field_friend/interface/components/status_dev.py b/field_friend/interface/components/status_dev.py
@@ -147,31 +147,7 @@ def status_dev_page(robot: FieldFriend, system: 'System'):
         with ui.row().classes('place-items-center'):
             ui.markdown('**Current Row:**').style('color: #EDF4FB')
             current_row_label = ui.label()
-        with ui.row().classes('place-items-center'):
-            ui.markdown('**Time on Field:**').style('color: #EDF4FB')
-            kpi_fieldtime_label = ui.label()
-        with ui.row().classes('place-items-center'):
-            ui.markdown('**Distance:**').style('color: #EDF4FB')
-            kpi_distance_label = ui.label()
-        with ui.row().classes('place-items-center'):
-            ui.markdown('**Processed Rows:**').style('color: #EDF4FB')
-            kpi_rows_weeded_label = ui.label()
-        with ui.row().classes('place-items-center'):
-            ui.markdown('**Crops Detected:**').style('color: #EDF4FB')
-            kpi_crops_detected_label = ui.label()
-        with ui.row().classes('place-items-center'):
-            ui.markdown('**Weeds Detected:**').style('color: #EDF4FB')
-            kpi_weeds_detected_label = ui.label()
-        with ui.row().classes('place-items-center'):
-            ui.markdown('**Weeds Removed:**').style('color: #EDF4FB')
-            kpi_weeds_removed_label = ui.label()
-        with ui.row().classes('place-items-center'):
-            ui.markdown('**Punches:**').style('color: #EDF4FB')
-            kpi_punches_label = ui.label()
-        if robot.implement_name == 'dual_mechanism':
-            with ui.row().classes('place-items-center'):
-                ui.markdown('**Chops:**').style('color: #EDF4FB')
-                kpi_chops_label = ui.label()
+
 
     with ui.card().style('background-color: #3E63A6; color: white;'):
         ui.markdown('**Positioning**').style('color: #6E93D6').classes('w-full text-center')
@@ -288,27 +264,7 @@ def update_status() -> None:
             'NW' if system.gnss.current.heading <= 338 else \
             'N'
 
-        if system.automator.is_running:
-            kpi_fieldtime_label.text = f'{timedelta(seconds=system.kpi_provider.current_weeding_kpis.time)}'
-            kpi_distance_label.text = f'{system.kpi_provider.current_weeding_kpis.distance:.0f}m'
-
-            # current_automation = next(key for key, value in system.implements.items()
-            #                           if value == system.automator.default_automation)
-            # if current_automation == 'weeding' or current_automation == 'monitoring':
-            #     if current_automation == 'weeding':
-            #         current_row_label.text = system.weeding.current_row.name if system.weeding.current_row is not None else 'No row'
-            #         worked_area_label.text = f'{system.weeding.field.worked_area(system.kpi_provider.current_weeding_kpis.rows_weeded):.2f}m²/{system.weeding.field.area():.2f}m²' if system.weeding.field is not None else 'No field'
-            #     elif current_automation == 'monitoring':
-            #         current_row_label.text = system.monitoring.current_row.name if system.monitoring.current_row is not None else 'No row'
-            #         worked_area_label.text = f'{system.monitoring.field.worked_area(system.kpi_provider.current_weeding_kpis.rows_weeded):.2f}m²/{system.monitoring.field.area():.2f}m²' if system.monitoring.field is not None else 'No field'
-            #     kpi_weeds_detected_label.text = system.kpi_provider.current_weeding_kpis.weeds_detected
-            #     kpi_crops_detected_label.text = system.kpi_provider.current_weeding_kpis.crops_detected
-            #     kpi_weeds_removed_label.text = system.kpi_provider.current_weeding_kpis.weeds_removed
-            #     kpi_rows_weeded_label.text = system.kpi_provider.current_weeding_kpis.rows_weeded
-            #     if current_automation == 'weeding':
-            #         kpi_punches_label.text = system.kpi_provider.current_weeding_kpis.punches
-            #         if robot.implement_name == 'dual_mechanism':
-            #             kpi_chops_label.text = system.kpi_provider.current_weeding_kpis.chops
+
         if system.is_real:
             if robot.wheels.odrive_version == 6:
                 l0_status.text = 'Error in l0' if robot.wheels.l0_error else 'No error'

diff --git a/field_friend/interface/components/status_drawer.py b/field_friend/interface/components/status_drawer.py
@@ -195,18 +195,6 @@ def update_status() -> None:
 
 
 
-                # TODO reimplement with navigation and tools
-                # current_automation = next(key for key, value in system.tools.items()
-                #                           if value == system.automator.default_automation)
-                # if current_automation == 'weeding' or current_automation == 'monitoring':
-                #     if system.field_provider.active_object is not None and system.field_provider.active_object['object'] is not None:
-                #         current_row_label.text = system.field_provider.active_object['object'].name
-                #     kpi_weeds_detected_label.text = system.kpi_provider.current_weeding_kpis.weeds_detected
-                #     kpi_crops_detected_label.text = system.kpi_provider.current_weeding_kpis.crops_detected
-                #     kpi_rows_weeded_label.text = system.kpi_provider.current_weeding_kpis.rows_weeded
-                #     if current_automation == 'weeding':
-                #         kpi_punches_label.text = system.kpi_provider.current_weeding_kpis.punches
-
             kpi_time_in_automation_off.text = f'{system.kpi_provider.get_time_kpi()}'
             gnss_device_label.text = 'No connection' if gnss.device is None else 'Connected'
             reference_position_label.text = 'No reference' if localization.reference is None else 'Set'

diff --git a/field_friend/interface/pages/__init__.py b/field_friend/interface/pages/__init__.py
@@ -1,5 +1,4 @@
 from .dev_page import dev_page
-from .kpi_page import kpi_page
 from .main_page import main_page
 from .monitor_page import monitor_page
 from .path_planner_page import path_planner_page

diff --git a/main.py b/main.py
@@ -10,7 +10,6 @@
 from field_friend.interface.components import header_bar, status_drawer, system_bar
 from field_friend.system import System
 
-
 logger = log_configuration.configure()
 app.add_static_files('/assets', 'assets')
 
@@ -38,7 +37,6 @@ def page_wrapper() -> None:
     # interface.pages.path_planner_page(page_wrapper, system)  # /path
     interface.pages.dev_page(page_wrapper, system)  # /dev
     interface.pages.test_page(page_wrapper, system)  # /test
-    interface.pages.kpi_page(page_wrapper, system)  # /kpis
     interface.pages.monitor_page(page_wrapper, system)  # /monitor
     interface.pages.bms_page(page_wrapper, system)  # /bms