Fix in closeButton in ExperimentInProgress Window

* We were not asking or cancelling the experiment when the close
  butto was pressed in the ExperimentInProgress Window

Author: Ezequiel Torres

MLC/GUI/Experiment/ExperimentInProgress.py

@@ -147,6 +147,13 @@ def __init__(self, parent, parent_signal, chart_params, from_gen, to_gen):
 
         # Condition variable used to check when the experiment has been stopped or cancelled
         self._experiment_condition = ExperimentCondition()
+        self._simulation_has_finished = False
+
+    def closeEvent(self, event):
+        logger.debug('[EXPERIMENT_IN_PROGRESS] [CLOSE_DIALOG] - Executing overriden closeEvent function')
+        if not self._simulation_has_finished:
+            if not self.on_cancel_button_clicked():
+                event.ignore()
 
     def add_experiment_data(self, amount_gens, indivs_per_gen):
         self._amount_gens = amount_gens
@@ -167,9 +174,14 @@ def on_cancel_button_clicked(self):
                                            QMessageBox.No)
 
         if response == QMessageBox.Yes:
+
             self._experiment_condition.cancel_experiment()
+            # Set the MainWindow to invisible to not see the it after press 'Yes'
+            self.setVisible(False)
+            return True
         else:
             self._experiment_condition.continue_experiment()
+            return False
 
     def _update_dialog(self, indivs_per_gen_counter, total_indivs_counter, gen_counter, cost):
         logger.debug('{0} [UPDATE_EXP_IN_PROGRESS] - Executing update_dialog function'.format(self._log_prefix))
@@ -192,6 +204,8 @@ def _simulation_finished(self):
         logger.debug('{0} [SIM_FINISHED] - Executing _simulation_finished function'.format(self._log_prefix))
         self._parent_signal.emit(self._experiment_condition.experiment_cancelled(),
                                  self._experiment_condition.experiment_failure())
+        self._simulation_has_finished = True
+        self.close()
 
     def _update_current_gen_experiment(self, indiv_index, cost):
         if cost > self._chart_params["max_cost"]:
@@ -249,19 +263,20 @@ def _create_new_chart(self):
     def _board_setup_failure(self, error):
         logger.debug('{0} [SIM_FINISHED] - Board setup failure: {1}'.format(self._log_prefix, error))
         selection = QMessageBox.critical(self, "Board Setup error",
-                                            error,
-                                            QMessageBox.Ok)
+                                         error,
+                                         QMessageBox.Ok)
         self._experiment_condition.cancel_experiment()
         self._simulation_finished()
 
     def _board_io_error(self, error):
         logger.debug('{0} [SIM_FINISHED] - Board IO error: {1}'.format(self._log_prefix, error))
         selection = QMessageBox.critical(self, "Board IO error",
-                                            error,
-                                            QMessageBox.Ok)
+                                         error,
+                                         QMessageBox.Ok)
         self._experiment_condition.cancel_experiment()
         self._simulation_finished()
 
+
 class ExperimentInProgress(Thread):
 
     def __init__(self, mlc_local, experiment_name,
@@ -362,8 +377,6 @@ def simulation_started(self):
     def simulation_finished(self):
         logger.debug('{0} [SIM_FINISHED] - Executing simulation_finished function'.format(self._log_prefix))
         self._dialog.simulation_finished.emit()
-
-    def close_window(self):
         self._dialog.close()
 
     def _check_if_project_stopped_or_cancelled(self):

MLC/GUI/Experiment/ExperimentWindow.py

@@ -130,16 +130,17 @@ def __init__(self, mlc_local,
         self._board_config, self._serial_conn = mlc_local.get_board_configuration(self._experiment_name)
 
     def closeEvent(self, event):
-        logger.debug('[EXPERIMENT {0}] [CLOSE_DIALOG] - Executing overriden closeEvent function'.format(self._experiment_name))
+        logger.debug('[EXPERIMENT {0}] [CLOSE_DIALOG] - Executing overriden closeEvent function'
+                     .format(self._experiment_name))
         self._ask_if_experiment_config_must_be_saved()
         # Close the experiment
         self._file_watcher.removePath(self._experiment_conf_path)
         self._mlc_local.close_experiment(self._experiment_name)
         self._experiment_closed_signal.emit(self._experiment_name)
 
     def on_start_button_clicked(self):
-
-        logger.debug('[EXPERIMENT {0}] [START_BUTTON] - Executing on_start_button_clicked function'.format(self._experiment_name))
+        logger.debug('[EXPERIMENT {0}] [START_BUTTON] - Executing on_start_button_clicked function'
+                     .format(self._experiment_name))
 
         try:
             ArduinoInterfaceSingleton.get_instance(protocol_config=self._board_config,
@@ -863,7 +864,6 @@ def _ask_if_experiment_config_must_be_saved(self):
             self._autogenerated_object.save_config_button.setDisabled(True)
 
     def _update_experiment(self, cancelled, failed):
-        self._progress_dialog.close_window()
         if not cancelled and not failed:
             QMessageBox.information(self, 'Experiment {0}'.format(self._experiment_name),
                                     'Experiment was succesfully executed.', QMessageBox.Ok)
@@ -892,7 +892,6 @@ def _store_board_configuration(self, board_config, serial_conn):
             ArduinoInterfaceSingleton.get_instance(protocol_config=self._board_config,
                                                    conn_setup=self._serial_conn._asdict())
 
-
             # Update board configuration in the DB
             self._mlc_local.save_board_configuration(self._experiment_name, self._board_config, self._serial_conn)
 
@@ -922,4 +921,4 @@ def _report_arduino_unhandled_error(self, error):
         logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG] - '
                      'Unhandled error. Error Msg: {1}'
                      .format(self._experiment_name, error))
-        QMessageBox.critical(self, "Critical error", "Error: {0}".format(error))
+        QMessageBox.critical(self, "Critical error", "Error: {0}".format(error))