Removed trajectory recorder from master

tud-hri · May 8, 2020 · 2f57aac · 2f57aac
1 parent b10c95c
commit 2f57aac
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 51 deletions.
diff --git a/modules/joanmodules.py b/modules/joanmodules.py
@@ -14,8 +14,8 @@ class JOANModules(enum.Enum):
  HARDWARE_MANAGER = 1
  CARLA_INTERFACE = 2
  EXPERIMENT_MANAGER = 3
- FEED_BACK_CONTROLLER = 4
- TRAJECTORY_RECORDER = 5
+ # FEED_BACK_CONTROLLER = 4
+ # TRAJECTORY_RECORDER = 5
 
 
  @property
@@ -25,16 +25,16 @@ def action(self):
  from modules.hardwaremanager.action.hardwaremanageraction import HardwaremanagerAction
  from modules.carlainterface.action.carlainterfaceaction import CarlainterfaceAction
  from modules.experimentmanager.action.experimentmanageraction import ExperimentManagerAction
- from modules.trajectoryrecorder.action.trajectoryrecorder import TrajectoryrecorderAction
- from modules.feedbackcontroller.action.feedbackcontroller import FeedbackcontrollerAction
+ # from modules.trajectoryrecorder.action.trajectoryrecorder import TrajectoryrecorderAction
+ # from modules.feedbackcontroller.action.feedbackcontroller import FeedbackcontrollerAction
 
  return {JOANModules.TEMPLATE: TemplateAction,
  JOANModules.DATA_RECORDER: DatarecorderAction,
  JOANModules.HARDWARE_MANAGER: HardwaremanagerAction,
  JOANModules.CARLA_INTERFACE: CarlainterfaceAction,
- JOANModules.EXPERIMENT_MANAGER: ExperimentManagerAction,
- JOANModules.TRAJECTORY_RECORDER: TrajectoryrecorderAction,
- JOANModules.FEED_BACK_CONTROLLER: FeedbackcontrollerAction}[self]
+ JOANModules.EXPERIMENT_MANAGER: ExperimentManagerAction}[self]
+ # JOANModules.TRAJECTORY_RECORDER: TrajectoryrecorderAction,
+ # JOANModules.FEED_BACK_CONTROLLER: FeedbackcontrollerAction
 
  @property
  def dialog(self):
@@ -43,16 +43,16 @@ def dialog(self):
  from modules.hardwaremanager.dialog.hardwaremanagerdialog import HardwaremanagerDialog
  from modules.carlainterface.dialog.carlainterfacedialog import CarlainterfaceDialog
  from modules.experimentmanager.dialog.experimentmanagerdialog import ExperimentManagerDialog
- from modules.trajectoryrecorder.widget.trajectoryrecorder import TrajectoryrecorderWidget
- from modules.feedbackcontroller.widget.feedbackcontroller import FeedbackcontrollerWidget
+ # from modules.trajectoryrecorder.widget.trajectoryrecorder import TrajectoryrecorderWidget
+ # from modules.feedbackcontroller.widget.feedbackcontroller import FeedbackcontrollerWidget
 
  return {JOANModules.TEMPLATE: TemplateDialog,
  JOANModules.DATA_RECORDER: DatarecorderDialog,
  JOANModules.HARDWARE_MANAGER: HardwaremanagerDialog,
  JOANModules.CARLA_INTERFACE: CarlainterfaceDialog,
- JOANModules.EXPERIMENT_MANAGER: ExperimentManagerDialog,
- JOANModules.TRAJECTORY_RECORDER: TrajectoryrecorderWidget,
- JOANModules.FEED_BACK_CONTROLLER: FeedbackcontrollerWidget}[self]
+ JOANModules.EXPERIMENT_MANAGER: ExperimentManagerDialog}[self]
+ # JOANModules.TRAJECTORY_RECORDER: TrajectoryrecorderWidget,
+ # JOANModules.FEED_BACK_CONTROLLER: FeedbackcontrollerWidget
 
  @property
  def states(self):
@@ -61,16 +61,16 @@ def states(self):
  from modules.hardwaremanager.action.states import HardwaremanagerStates
  from modules.carlainterface.action.states import CarlainterfaceStates
  from modules.experimentmanager.action.states import ExperimentManagerStates
- from modules.trajectoryrecorder.action.states import TrajectoryrecorderStates
- from modules.feedbackcontroller.action.states import FeedbackcontrollerStates
+ # from modules.trajectoryrecorder.action.states import TrajectoryrecorderStates
+ # from modules.feedbackcontroller.action.states import FeedbackcontrollerStates
 
  return {JOANModules.TEMPLATE: TemplateStates,
  JOANModules.DATA_RECORDER: DatarecorderStates,
  JOANModules.HARDWARE_MANAGER: HardwaremanagerStates,
  JOANModules.CARLA_INTERFACE: CarlainterfaceStates,
- JOANModules.EXPERIMENT_MANAGER: ExperimentManagerStates,
- JOANModules.TRAJECTORY_RECORDER: TrajectoryrecorderStates,
- JOANModules.FEED_BACK_CONTROLLER: FeedbackcontrollerStates}[self]
+ JOANModules.EXPERIMENT_MANAGER: ExperimentManagerStates}[self]
+ # JOANModules.TRAJECTORY_RECORDER: TrajectoryrecorderStates,
+ # JOANModules.FEED_BACK_CONTROLLER: FeedbackcontrollerStates
 
  @property
  def ui_file(self):
@@ -79,15 +79,15 @@ def ui_file(self):
  JOANModules.DATA_RECORDER: os.path.join(path_to_modules, "datarecorder/dialog/datarecorder.ui"),
  JOANModules.CARLA_INTERFACE: os.path.join(path_to_modules, "carlainterface/dialog/carlainterface.ui"),
  JOANModules.HARDWARE_MANAGER: os.path.join(path_to_modules, "hardwaremanager/dialog/hardwaremanager.ui"),
- JOANModules.EXPERIMENT_MANAGER: os.path.join(path_to_modules, "experimentmanager/dialog/experimentmanager.ui"),
- JOANModules.TRAJECTORY_RECORDER: os.path.join(path_to_modules, "trajectoryrecorder/widget/trajectoryrecorder.ui"),
- JOANModules.FEED_BACK_CONTROLLER: os.path.join(path_to_modules, "feedbackcontroller/widget/feedbackcontroller.ui")}[self]
+ JOANModules.EXPERIMENT_MANAGER: os.path.join(path_to_modules, "experimentmanager/dialog/experimentmanager.ui")}[self]
+ # JOANModules.TRAJECTORY_RECORDER: os.path.join(path_to_modules, "trajectoryrecorder/widget/trajectoryrecorder.ui"),
+ # JOANModules.FEED_BACK_CONTROLLER: os.path.join(path_to_modules, "feedbackcontroller/widget/feedbackcontroller.ui")
 
  def __str__(self):
  return {JOANModules.TEMPLATE: 'Template',
  JOANModules.DATA_RECORDER: 'Data Recorder',
  JOANModules.HARDWARE_MANAGER: 'Hardware Communication',
  JOANModules.CARLA_INTERFACE: 'Carla Interface',
- JOANModules.EXPERIMENT_MANAGER: 'Experiment Manager',
- JOANModules.TRAJECTORY_RECORDER: 'Trajectory Recorder',
- JOANModules.FEED_BACK_CONTROLLER: 'Feed Back Controller'}[self]
+ JOANModules.EXPERIMENT_MANAGER: 'Experiment Manager'}[self]
+ # JOANModules.TRAJECTORY_RECORDER: 'Trajectory Recorder',
+ # JOANModules.FEED_BACK_CONTROLLER: 'Feed Back Controller'
diff --git a/process/joanhq/action/joanhqaction.py b/process/joanhq/action/joanhqaction.py
@@ -60,16 +60,17 @@ def add_module(self, module: JOANModules, name='', parent=None, millis=100):
  if not parent:
  parent = self.window
 
- if module is JOANModules.FEED_BACK_CONTROLLER or module is JOANModules.TRAJECTORY_RECORDER: 
- # old style
- module_action = None
-
- module_widget = module.dialog()
- module_widget.setObjectName(name)
- module_dialog = module_widget
- else:
- module_action = module.action(self.master_state_handler, millis=millis)
- module_dialog = module.dialog(module_action, self.master_state_handler, parent=parent)
+ # if module is JOANModules.FEED_BACK_CONTROLLER:
+ # # old style
+ # module_action = None
+
+ # module_widget = module.dialog()
+ # module_widget.setObjectName(name)
+ # module_dialog = module_widget
+ # else:
+
+ module_action = module.action(self.master_state_handler, millis=millis)
+ module_dialog = module.dialog(module_action, self.master_state_handler, parent=parent)
 
  self.window.add_module(module_dialog, module)
 

diff --git a/process/joanhq/mainwindow/joanhqwindow.py b/process/joanhq/mainwindow/joanhqwindow.py
@@ -60,24 +60,25 @@ def add_module(self, module_dialog, module_enum):
  widget.setObjectName(name)
  widget.grpbox.setTitle(name)
 
- if isinstance(module_dialog, (JOANModules.FEED_BACK_CONTROLLER.dialog, JOANModules.TRAJECTORY_RECORDER.dialog)): # syntax is changed slightly in new example: wrapping show() in _show() is unnecessary
- widget.btn_showclose.clicked.connect(module_dialog._show)
- widget.btn_showclose.setCheckable(True)
- widget.btn_showclose.toggled.connect(lambda: self.button_showclose_checked(widget.btn_showclose))
-
- widget.lbl_state.setText(module_dialog.module_state_handler.get_current_state().name)
- module_dialog.module_state_handler.state_changed.connect(
- lambda state: widget.lbl_state.setText(module_dialog.module_state_handler.get_state(state).name)
- )
- else:
- widget.btn_showclose.clicked.connect(module_dialog.toggle_show_close)
- widget.btn_showclose.setCheckable(True)
- widget.btn_showclose.toggled.connect(lambda: self.button_showclose_checked(widget.btn_showclose)) # change text in the button, based toggle status
- module_dialog.closed.connect(lambda: widget.btn_showclose.setChecked(False)) # if the user closes the dialog, uncheck the button
-
- module_dialog.module_action.module_state_handler.state_changed.connect(
- lambda state: widget.lbl_state.setText(module_dialog.module_action.module_state_handler.get_state(state).name)
- )
+ # if isinstance(module_dialog, (JOANModules.FEED_BACK_CONTROLLER.dialog, JOANModules.TRAJECTORY_RECORDER.dialog)): # syntax is changed slightly in new example: wrapping show() in _show() is unnecessary
+ # widget.btn_showclose.clicked.connect(module_dialog._show)
+ # widget.btn_showclose.setCheckable(True)
+ # widget.btn_showclose.toggled.connect(lambda: self.button_showclose_checked(widget.btn_showclose))
+
+ # widget.lbl_state.setText(module_dialog.module_state_handler.get_current_state().name)
+ # module_dialog.module_state_handler.state_changed.connect(
+ # lambda state: widget.lbl_state.setText(module_dialog.module_state_handler.get_state(state).name)
+ # )
+ # else:
+
+ widget.btn_showclose.clicked.connect(module_dialog.toggle_show_close)
+ widget.btn_showclose.setCheckable(True)
+ widget.btn_showclose.toggled.connect(lambda: self.button_showclose_checked(widget.btn_showclose)) # change text in the button, based toggle status
+ module_dialog.closed.connect(lambda: widget.btn_showclose.setChecked(False)) # if the user closes the dialog, uncheck the button
+
+ module_dialog.module_action.module_state_handler.state_changed.connect(
+ lambda state: widget.lbl_state.setText(module_dialog.module_action.module_state_handler.get_state(state).name)
+ )
 
  # add it to the layout
  self._main_widget.module_list_layout.addWidget(widget)