Merge commit '47e5d2064111a6258a2cf3ca4eabc2d85bc4a7e1' into zedxmini

zauberzeug · Sep 24, 2024 · 58a8542 · 58a8542
2 parents b13fffe + 47e5d20
commit 58a8542
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/field_friend/automations/implements/weeding_implement.py b/field_friend/automations/implements/weeding_implement.py
@@ -210,7 +210,7 @@ def _update_time_and_distance(self):
 
     def settings_ui(self):
         super().settings_ui()
-        ui.select(self.system.crop_category_names, label='cultivated crop', on_change=self.request_backup) \
+        ui.select(self.system.plant_locator.crop_category_names, label='cultivated crop', on_change=self.request_backup) \
             .bind_value(self, 'cultivated_crop').props('clearable') \
             .classes('w-40').tooltip('Set the cultivated crop which should be kept safe')
         ui.number('Crop safety distance', step=0.001, min=0.001, max=0.05, format='%.3f', on_change=self.request_backup) \

diff --git a/field_friend/interface/components/field_planner.py b/field_friend/interface/components/field_planner.py
@@ -27,7 +27,7 @@ def __init__(self, system: 'System', leaflet: leaflet_map) -> None:
         self.field_provider = system.field_provider
         self.odometer = system.odometer
         self.gnss = system.gnss
-        self.cultivatable_crops = system.crop_category_names
+        self.cultivatable_crops = system.plant_locator.crop_category_names
         self.leaflet_map = leaflet
         self.tab: TabType = "Plants"
         self.active_object: ActiveObject | None = None