Fix in BoardConfigurationWindow callback

Author: Ezetowers

MLC/GUI/Experiment/ExperimentWindow.py

@@ -284,10 +284,10 @@ def on_genealogy_button_clicked(self):
 
     def on_board_config_button_clicked(self):
         logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG_BUTTON] - Executing on_board_config_button_clicked function')
-        #FIXME Connection config name should not be related with "serial" 
+        # FIXME Connection config name should not be related with "serial"
         valid_connection = False
-        board_config_window = ArduinoBoardManager(protocol_config=self._board_config, serial_config=self._serial_conn, 
-                                                  close_handler=self.on_board_config_button_clicked, parent_win=self)
+        board_config_window = ArduinoBoardManager(protocol_config=self._board_config, serial_config=self._serial_conn,
+                                                  close_handler=self._store_board_configuration, parent_win=self)
         board_config_window.start()
 
     def _config_table_edited(self, left, right):
@@ -573,22 +573,19 @@ def _store_board_configuration(self, board_config, serial_conn):
 
         # Init the arduino singleton
         try:
-            #self._board_config = self._board_config._replace(connection = SerialConnection(**self._serial_conn._asdict()))
             ArduinoInterfaceSingleton.get_instance(protocol_setup=self._board_config,
                                                    conn_setup=self._serial_conn)
         except Exception, err:
             logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG] - '
                          'Serial port could not be initialized. Error Msg: {1}'
                          .format(self._experiment_name, err))
             selection = QMessageBox.critical(self, "Connection failure",
-                             "The current connection setup failed during initialization. Do you want to change this configuration? \
-                             (Choosing \"no\" means that the board will not be usable in the experiment)"
-                             .format(preev_path),
-                             QMessageBox.Yes | No, QMessageBox.Yes)
+                                             "The current connection setup failed during initialization. "
+                                             "Do you want to change this configuration?. "
+                                             "Choosing \"no\" means that the board will not be usable in the experiment)",
+                                             QMessageBox.Yes | QMessageBox.No,
+                                             QMessageBox.Yes)
             if selection == QMessageBox.Yes:
-                #self.on_board_config_button_clicked()
-                print "FUCK"
+                self.on_board_config_button_clicked()
             else:
-                #FIXME: If the pin setups aren't empty then the protocol init will fail
-                self._board_config = self._board_config._replace(connection = BaseConnection())
-
+                self._board_config = self._board_config._replace(connection=BaseConnection())