Move util.py and QWaitingSpinner classes to a common folder

Author: Ezequiel Torres

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoBoardManager.py

@@ -21,7 +21,6 @@
 
 from ArduinoBoardDialog import ArduinoBoardDialog
 from ArduinoBench import ArduinoBench
-from ArduinoStatsDialog import ArduinoStatsDialog
 
 from MLC.GUI.Autogenerated.autogenerated import Ui_BoardConfigurationWindow
 from MLC.GUI.Experiment.ArduinoConfigManager.BoardConfigurationWindow import BoardConfigurationWindow

MLC/GUI/Experiment/ArduinoConfigManager/ArduinoConnectionDialog.py

@@ -28,8 +28,8 @@
 from PyQt5.QtWidgets import QLabel
 from MLC.GUI.Autogenerated.autogenerated import Ui_ArduinoConnectionDialog
 
+from MLC.GUI.Common.QtWaitingSpinner import QtWaitingSpinner
 from MLC.GUI.Experiment.ArduinoConfigManager.Common import create_local_full_path
-from waitingspinnerwidget import QtWaitingSpinner
 
 
 class ArduinoConnectionDialog(QDialog, QObject):

MLC/GUI/Experiment/ArduinoConfigManager/BoardConfigurationWindow.py

@@ -29,7 +29,7 @@
 from PyQt5.QtWidgets import QLineEdit
 from PyQt5.QtWidgets import QMessageBox
 
-from MLC.GUI.util import add_permissions_to_file
+from MLC.GUI.Common.util import add_permissions_to_file
 from MLC.GUI.Autogenerated.autogenerated import Ui_BoardConfigurationWindow
 from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoBoardDialog import ArduinoBoardDialog
 from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoConnectionDialog import ArduinoConnectionDialog

MLC/GUI/Experiment/ExperimentWindow.py

@@ -28,8 +28,8 @@
 import time
 
 from MLC.Log.log import get_gui_logger
-from MLC.GUI.util import test_individual_value
-from MLC.GUI.util import check_if_indiv_pass_preevaluation
+from MLC.GUI.Common.util import test_individual_value
+from MLC.GUI.Common.util import check_if_indiv_pass_preevaluation
 from MLC.GUI.Autogenerated.autogenerated import Ui_ExperimentWindow
 from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoBoardManager import ArduinoBoardManager
 from MLC.GUI.Experiment.ChartConfiguration import ChartConfiguration
@@ -98,9 +98,6 @@ def __init__(self, mlc_local,
         # experiment evaluation finished
         self.experiment_finished.connect(self._update_experiment)
 
-        # Store the experiment in progress to close it at the end of the evaluation
-        self._progress_dialog = None
-
         # Signal to be emitted when the experiment is closed
         self._experiment_closed_signal = experiment_closed_signal
 
@@ -208,6 +205,7 @@ def on_start_button_clicked(self):
                     'N°{1} to Generation N°{2}'.format(self._experiment_name, from_gen, to_gen))
 
         progress_dialog = ExperimentInProgress(mlc_local=self._mlc_local,
+                                               parent=self,
                                                experiment_name=self._experiment_name,
                                                to_gen=to_gen,
                                                from_gen=from_gen,
@@ -216,7 +214,6 @@ def on_start_button_clicked(self):
                                                gen_creator=gen_creator)
 
         progress_dialog.start()
-        self._progress_dialog = progress_dialog
 
     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))

MLC/GUI/Experiment/FirstIndividualsManager.py

@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
 from MLC.GUI.Tables.ConfigTableModel import ConfigTableModel
-from MLC.GUI.util import check_individual_value
+from MLC.GUI.Common.util import check_individual_value
 from MLC.Log.log import get_gui_logger
 from MLC.individual.Individual import Individual
 from MLC.mlc_parameters.mlc_parameters import Config

MLC/GUI/ExperimentsManager.py

@@ -183,6 +183,10 @@ def rename_experiment(self, experiment_name_old, experiment_name_new):
                          "Experiment to be renamed ({0}) could not be removed. "
                          "Check the workspace to be OK".format(experiment_new_old))
             return False
+        except ExperimentNotExistException:
+            logger.error("[GUI_EXPERIMENT_MANAGER] [EXPORT] - "
+                         "Experiment to be renamed ({0}) could not be removed. "
+                         "Check the workspace to be OK".format(experiment_new_old))
 
         # Everything went OK. Remove the last experiment and add the new one
         self._experiment_list.remove(experiment_name_old)

MLC/GUI/mlc_gui.py

@@ -21,6 +21,9 @@
 
 import os
 import sys
+reload(sys)
+sys.setdefaultencoding("utf-8")
+
 mlc_gui_dir = os.path.dirname(os.path.abspath(__file__))
 root_dir = os.path.join(*[mlc_gui_dir, "..", ".."])
 sys.path.append(root_dir)

MLC/GUI/util.py

@@ -81,7 +81,12 @@ def individual_data(indiv):
     badvalue = config.getfloat('EVALUATOR', 'badvalue')
 
     # Get the Individual as a formal expressions and make some replacements
-    formal = indiv.get_formal()
+    formal = None
+    if type(indiv.get_formal()) == list:
+        formal = indiv.get_formal()[0]
+    else:
+        formal = indiv.get_formal()
+
     # Simulink does not support .*
     formal = formal.replace('.*', '*')
     # Replace the sensor with a Heaviside step function
@@ -189,14 +194,17 @@ def cost(indiv):
     return simulink_results['j0']
 
 
-def show_best(index, indiv, block=True):
+def show_best(index, generation, indiv, cost, block=True):
     # TODO: Add texlive-latex-extra and textlive-latex-recommended in the Wiki if we want to use LaTeX fonts
     sl_results = individual_data(indiv)
     config = Config.get_instance()
     problem_variables = retrieve_problem_variables(config)
     fig_title = create_figure_title(problem_variables, indiv.get_value())
 
-    plt.clf()
+    fig = plt.figure()
+    # Put figure window on top of all other windows
+    fig.canvas.manager.window.setWindowModality(Qt.ApplicationModal)
+
     plt.rc('text', usetex=True)
     plt.rc('font', family='serif')
     plt.suptitle(fig_title)

MLC/Scripts/Evaluation/simulink_ev.py

@@ -174,7 +174,8 @@ def new_experiment(self, experiment_name,
         if experiment_configuration is None:
             config = MLCLocal.DEFAULT_EXPERIMENT_CONFIG
 
-        self._load_new_experiment(experiment_name, config,
+        self._load_new_experiment(experiment_name, 
+                                  config,
                                   evaluation_script,
                                   preevaluation_script)
 
@@ -219,7 +220,9 @@ def clone_experiment(self, experiment_name, cloned_experiment):
     def rename_experiment(self, experiment_name_old, experiment_name_new):
         # Rename can be implemented as a clone and remove operation
         logger.info("[MLC_LOCAL] [RENAME] - Proceed to clone and remove the experiment given. "
-                    "Old: {0} - New: {1}".format(experiment_name_old, experiment_name_new))
+                    "Old: {0} - New: {1}"
+                    .format(experiment_name_old.encode('utf-8'), 
+                            experiment_name_new.encode('utf-8')))
         if self.clone_experiment(experiment_name_old, experiment_name_new):
             try:
                 self.delete_experiment(experiment_name_old)