Fix in disable check in ExperimentWindow

* It was crashing when no Arduino was connected

Author: Ezetowers

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.0.4] 2017-04-25
+- [FIX] Changes in ArduinoUserInterface initialization
+- [FIX] Removed Port property from MLC Manager
+- [FIX] Added missing import in ArduinoStatsDialog
+- [FIX] Fixes in deploy dockerfiles
+- [FIX] Set MacOs and Windows log config files properly
+
 ## [0.0.3] 2017-03-24
 - [FEATURE] Added checkbox for Arduino Connector
 - [FEATURE] Added pysub dependency to detect when a board Arduino is connected

MLC/GUI/Autogenerated/autogenerated.py

@@ -1323,7 +1323,7 @@ class Ui_ExperimentWindow(object):
     def setupUi(self, ExperimentWindow):
         ExperimentWindow.setObjectName("ExperimentWindow")
         ExperimentWindow.setWindowModality(QtCore.Qt.ApplicationModal)
-        ExperimentWindow.resize(965, 814)
+        ExperimentWindow.resize(965, 687)
         self.centralWidget = QtWidgets.QWidget(ExperimentWindow)
         self.centralWidget.setObjectName("centralWidget")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.centralWidget)
@@ -1587,16 +1587,10 @@ def setupUi(self, ExperimentWindow):
         self.chart_layout.addWidget(self.textEdit_2)
         self.verticalLayout_7.addWidget(self.frame_14)
         self.db_view = QtWidgets.QTableView(self.left_menu_frame)
-        self.db_view.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
-        self.db_view.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerItem)
-        self.db_view.setWordWrap(False)
         self.db_view.setObjectName("db_view")
-        self.db_view.horizontalHeader().setCascadingSectionResizes(False)
-        self.db_view.horizontalHeader().setDefaultSectionSize(100)
+        self.db_view.horizontalHeader().setCascadingSectionResizes(True)
         self.db_view.horizontalHeader().setSortIndicatorShown(True)
         self.db_view.horizontalHeader().setStretchLastSection(True)
-        self.db_view.verticalHeader().setCascadingSectionResizes(False)
-        self.db_view.verticalHeader().setStretchLastSection(True)
         self.verticalLayout_7.addWidget(self.db_view)
         self.horizontalLayout_5.addWidget(self.left_menu_frame)
         self.right_menu_frame = QtWidgets.QFrame(self.tab)
@@ -1759,7 +1753,7 @@ def setupUi(self, ExperimentWindow):
         ExperimentWindow.setCentralWidget(self.centralWidget)
 
         self.retranslateUi(ExperimentWindow)
-        self.tabWidget.setCurrentIndex(1)
+        self.tabWidget.setCurrentIndex(0)
         self.next_gen_button.clicked.connect(ExperimentWindow.on_next_gen_button_clicked)
         self.save_config_button.clicked.connect(ExperimentWindow.on_save_config_button_clicked)
         self.show_all_check.clicked.connect(ExperimentWindow.on_show_all_check_clicked)

MLC/GUI/Experiment/ExperimentWindow.py

@@ -56,7 +56,7 @@
 from PyQt5.QtWidgets import QInputDialog
 
 from MLC.arduino.protocol import ProtocolConfig, ProtocolSetupException, ProtocolIOException
-from MLC.arduino.protocol import ArduinoInterfaceSingleton
+from MLC.arduino.protocol import ArduinoUserInterface
 from MLC.arduino.connection.base import invalid_connection_builder
 from MLC.arduino.connection.serialconnection import ConnectionException, serial_connection_builder
 from MLC.arduino.connection.base import BaseConnection
@@ -126,7 +126,7 @@ def __init__(self, mlc_local,
 
         # Arduino board configurations
         self._board_config, self._serial_conn = mlc_local.get_board_configuration(self._experiment_name)
-        ArduinoInterfaceSingleton.set_connection_builder(serial_connection_builder)
+        ArduinoUserInterface.set_connection_builder(serial_connection_builder)
 
         # Update the arduino board group for the first case
 
@@ -150,19 +150,19 @@ def on_start_button_clicked(self):
                      .format(self._experiment_name))
 
         try:
-            ArduinoInterfaceSingleton.get_instance(protocol_config=self._board_config,
-                                                   conn_setup=self._serial_conn)
+            ArduinoUserInterface.get_instance(protocol_config=self._board_config,
+                                              conn_setup=self._serial_conn)
 
         except (ProtocolSetupException, ConnectionException) as err:
             logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG] - '
                          'Serial port could not be initialized. Error Msg: {1}'
                          .format(self._experiment_name, err))
             selection = QMessageBox.warning(self, "Connection failure",
-                                             "The current connection arduino setup failed during initialization "
-                                             "(Error: {0}), this may generate an error in your experiment.\n"
-                                             "Do you want to continue?".format(err),
-                                             QMessageBox.Yes | QMessageBox.No,
-                                             QMessageBox.Yes)
+                                            "The current connection arduino setup failed during initialization "
+                                            "(Error: {0}), this may generate an error in your experiment.\n"
+                                            "Do you want to continue?".format(err),
+                                            QMessageBox.Yes | QMessageBox.No,
+                                            QMessageBox.Yes)
             if selection == QMessageBox.No:
                 logger.debug('[EXPERIMENT {0}] [START_BUTTON] - Experiment cancelled by user before start'.format(
                     self._experiment_name))
@@ -226,7 +226,8 @@ def on_start_button_clicked(self):
         progress_dialog.start()
 
     def on_prev_gen_button_clicked(self):
-        logger.debug('[EXPERIMENT {0}] [PREV_GEN_BUTTON] - Executing on_prev_gen_button_clicked function'.format(self._experiment_name))
+        logger.debug(
+            '[EXPERIMENT {0}] [PREV_GEN_BUTTON] - Executing on_prev_gen_button_clicked function'.format(self._experiment_name))
         experiment_info = self._mlc_local.get_experiment_info(self._experiment_name)
         number_of_gens = experiment_info["generations"]
 
@@ -237,7 +238,8 @@ def on_prev_gen_button_clicked(self):
             self._update_scatter_chart()
 
     def on_next_gen_button_clicked(self):
-        logger.debug('[EXPERIMENT {0}] [NEXT_GEN_BUTTON] - Executing on_next_gen_button_clicked function'.format(self._experiment_name))
+        logger.debug(
+            '[EXPERIMENT {0}] [NEXT_GEN_BUTTON] - Executing on_next_gen_button_clicked function'.format(self._experiment_name))
         experiment_info = self._mlc_local.get_experiment_info(self._experiment_name)
         number_of_gens = experiment_info["generations"]
 
@@ -571,13 +573,16 @@ def on_disable_arduino_toggle(self, active):
         self._autogenerated_object.board_config_button.setDisabled(active)
 
         if active:
-            ArduinoInterfaceSingleton.disable_interface()
+            ArduinoUserInterface.disable_interface()
         else:
             # FIXME In the future, some logic to get the old connection builder must be implemented
-            ArduinoInterfaceSingleton.set_connection_builder(serial_connection_builder)
+            ArduinoUserInterface.set_connection_builder(serial_connection_builder)
 
-        ArduinoInterfaceSingleton.get_instance(protocol_config=self._board_config,
-                                               conn_setup=self._serial_conn)
+        try:
+            ArduinoUserInterface.get_instance(protocol_config=self._board_config,
+                                              conn_setup=self._serial_conn)
+        except (ProtocolSetupException, ConnectionException) as err:
+            pass
 
 
 ################################### VIEW AND MODEL METHODS #########################################
@@ -919,8 +924,8 @@ def _store_board_configuration(self, board_config, serial_conn):
 
         # Init the arduino singleton
         try:
-            ArduinoInterfaceSingleton.get_instance(protocol_config=self._board_config,
-                                                   conn_setup=self._serial_conn)
+            ArduinoUserInterface.get_instance(protocol_config=self._board_config,
+                                              conn_setup=self._serial_conn)
 
             # Update board configuration in the DB
             self._mlc_local.save_board_configuration(self._experiment_name, self._board_config, self._serial_conn)
@@ -930,11 +935,11 @@ def _store_board_configuration(self, board_config, serial_conn):
                          'Serial port could not be initialized. Error Msg: {1}'
                          .format(self._experiment_name, err))
             selection = QMessageBox.warning(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)",
-                                             QMessageBox.Yes | QMessageBox.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()
             else:

MLC/GUI/mlc_gui.py

@@ -69,7 +69,6 @@
 class MLC_GUI(QMainWindow):
     MLC_ICON_FILE = os.path.join(*[mlc_gui_dir, "images", "mlc_icon.png"])
     GUI_CONFIG_FILE = os.path.join(mlc_gui_dir, ".mlc_gui.conf")
-    WEBSERVICE_PORT = 5000
     experiment_closed = pyqtSignal(['QString'])
 
     def __init__(self):
@@ -500,8 +499,6 @@ def _create_gui_config_from_scratch(self, config_filepath, workspace_dir):
         self._gui_config = ConfigParser.ConfigParser()
         self._gui_config.add_section('MAIN')
         self._gui_config.set('MAIN', 'workspace', workspace_dir)
-        self._gui_config.add_section('WEB_SERVICE')
-        self._gui_config.set('WEB_SERVICE', 'port', MLC_GUI.WEBSERVICE_PORT)
         with open(config_filepath, 'w') as cfg:
             self._gui_config.write(cfg)
 

MLC/arduino/protocol.py

@@ -312,7 +312,7 @@ def init_interface(protocol_config):
     return interface
 
 
-class ArduinoInterfaceSingleton:
+class ArduinoUserInterface:
     _instance = None
     _connection_builder = [invalid_connection_builder]
     _interface_builder = [init_interface]
@@ -323,30 +323,30 @@ def get_instance(protocol_config=None, conn_setup=None):
             serial_conn = None
             try:
                 #serial_conn = SerialConnection(**conn_setup)
-                connection = ArduinoInterfaceSingleton._connection_builder[0](conn_setup)
+                connection = ArduinoUserInterface._connection_builder[0](conn_setup)
             except ConnectionException, err:
                 lg.logger_.info("[PROTOCOL] Error while building connection. "
                                 "Err info: {0}".format(err))
                 raise
 
             protocol_config = protocol_config._replace(connection=connection)
-            ArduinoInterfaceSingleton._instance = ArduinoInterfaceSingleton._interface_builder[0](protocol_config)
+            ArduinoUserInterface._instance = ArduinoUserInterface._interface_builder[0](protocol_config)
 
-        if ArduinoInterfaceSingleton._instance is None:
+        if ArduinoUserInterface._instance is None:
             raise ProtocolSetupException("The arduino interface cannot be used if it isn't configured.")
 
-        return ArduinoInterfaceSingleton._instance
+        return ArduinoUserInterface._instance
 
     @staticmethod
     def set_connection_builder(builder):
-        ArduinoInterfaceSingleton._connection_builder[0] = builder
-        ArduinoInterfaceSingleton._interface_builder[0] = init_interface
+        ArduinoUserInterface._connection_builder[0] = builder
+        ArduinoUserInterface._interface_builder[0] = init_interface
 
     @staticmethod
     def __null_initialization(config):
         return ArduinoInterface(config.connection, config.board_type)
 
     @staticmethod
     def disable_interface():
-        ArduinoInterfaceSingleton._interface_builder[0] = ArduinoInterfaceSingleton.__null_initialization
-        ArduinoInterfaceSingleton._connection_builder[0] = invalid_connection_builder
+        ArduinoUserInterface._interface_builder[0] = ArduinoUserInterface.__null_initialization
+        ArduinoUserInterface._connection_builder[0] = invalid_connection_builder

tools/installer/Dockerfiles/centos7.dockerfile

@@ -127,7 +127,7 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
     rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
 
 # Install mlc dependencies
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install ipython pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
+RUN /opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
 RUN gem install fpm
 
 ARG RELEASE

tools/installer/Dockerfiles/debian8.dockerfile

@@ -155,7 +155,7 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
 # Create .sh who will load the desired enviroment to run nosetests within it
 RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
     export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
-    /opt/mlc-python-2.7.11/bin/mlc_pip install ipython numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
+    /opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
 
 RUN gem install fpm
 

tools/installer/Dockerfiles/fedora20.dockerfile

@@ -134,7 +134,7 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
     rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
 
 # Install mlc dependencies
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install ipython pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
+RUN /opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
 RUN gem install fpm
 
 ARG RELEASE

tools/installer/Dockerfiles/generate_containers.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-RELEASE=0.0.3
+RELEASE=0.0.4
 
 function check_run_as_root() {
     case `id` in

tools/installer/Dockerfiles/ubuntu1404.dockerfile

@@ -154,7 +154,7 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
 # Create .sh who will load the desired enviroment to run nosetests within it
 RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
     export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
-    /opt/mlc-python-2.7.11/bin/mlc_pip install ipython numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
+    /opt/mlc-python-2.7.11/bin/mlc_pip install 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
 
 RUN gem install fpm