diff --git a/src/entities/gui_entities.py b/src/entities/gui_entities.py index 16c30108364e3cf4bf326db20fbabfcd59ed3e33..9b403ea2b367260ad28e821550d32365550c025e 100644 --- a/src/entities/gui_entities.py +++ b/src/entities/gui_entities.py @@ -18,8 +18,8 @@ from fclist import fcmatch from src.logging import init_logging from src.misc import ( set_roomba_vision_range_0, - set_roomba_vision_range_1, set_roomba_vision_range_2, + set_roomba_vision_range_4, set_roomba_vision_range_full, toggle_roomba_ai, toggle_roomba_failure, @@ -148,28 +148,28 @@ class GuiCore: ) self.elements.append(self.vision_0) - # Initialize "roomba vision distance of 1" button. - self.vision_1 = GuiButton( - data_manager, - 'Distance of 1', - 340, - name='Distance of 1', - function_call=set_roomba_vision_range_1, - function_args=data_manager, - ) - self.elements.append(self.vision_1) - # Initialize "roomba vision distance of 2" button. self.vision_2 = GuiButton( data_manager, 'Distance of 2', - 380, + 340, name='Distance of 2', function_call=set_roomba_vision_range_2, function_args=data_manager, ) self.elements.append(self.vision_2) + # Initialize "roomba vision distance of 4" button. + self.vision_4 = GuiButton( + data_manager, + 'Distance of 4', + 380, + name='Distance of 4', + function_call=set_roomba_vision_range_4, + function_args=data_manager, + ) + self.elements.append(self.vision_4) + # Initialize "roomba vision distance of 'all seeing'" button. self.vision_full = GuiButton( data_manager, diff --git a/src/misc.py b/src/misc.py index 24d9b0dea4c58689fa7c39f8204a49048480e39a..65a78161b45be44830bcbd1756194c0d42b00a5e 100644 --- a/src/misc.py +++ b/src/misc.py @@ -47,7 +47,7 @@ class DataManager: self.roomba = None self.ai_active = False self.ai_can_fail = False - self.roomba_vision = 1 + self.roomba_vision = 2 self.ideal_trash_paths = None self.ideal_overall_path = None self.graph = networkx.Graph() @@ -187,24 +187,24 @@ def set_roomba_vision_range_0(data_manager): data_manager.roomba_vision = 0 -def set_roomba_vision_range_1(data_manager): +def set_roomba_vision_range_2(data_manager): """ Adjusts roomba AI sight to see 1 tiles out from current location. :param data_manager: Data manager data structure. Consolidates useful program data to one location. """ - logger.debug('set_roomba_vision_range_1()') - logger.info('Setting roomba vision to "1 tiles".') - data_manager.roomba_vision = 1 + logger.debug('set_roomba_vision_range_2()') + logger.info('Setting roomba vision to "2 tiles".') + data_manager.roomba_vision = 2 -def set_roomba_vision_range_2(data_manager): +def set_roomba_vision_range_4(data_manager): """ Adjusts roomba AI sight to see 2 tiles out from current location. :param data_manager: Data manager data structure. Consolidates useful program data to one location. """ - logger.debug('set_roomba_vision_range_2()') - logger.info('Setting roomba vision to "2 tiles".') - data_manager.roomba_vision = 2 + logger.debug('set_roomba_vision_range_4()') + logger.info('Setting roomba vision to "4 tiles".') + data_manager.roomba_vision = 4 def set_roomba_vision_range_full(data_manager):