Merge branch 'dev' of code.it4i.cz:vys0053/SGS18-READEX into dev

set_env_salomon.sh

 #!/bin/sh
 
 # radarGUI
-ml PyQt5
-ml scikit-learn/0.19.1-Py-3.6
-
-# heatmap + graphs
-ml numpy/1.13.3-Py-3.6
-ml matplotlib
-ml seaborn
-ml packaging/17.1-Py-3.6
-ml pydot
+ml GCCcore/6.3.0 \
+   binutils/2.27-GCCcore-6.3.0 \
+   GCC/6.3.0-2.27 \
+   bzip2/1.0.6 \
+   ncurses/6.0 \
+   libreadline/7.0 \
+   zlib/1.2.11 \
+   Tcl/8.6.6 \
+   SQLite/3.17.0 \
+   Tk/8.6.6 GMP/6.1.2 \
+   gettext/0.19.4 \
+   XZ/5.2.3 \
+   Python/3.6.4-GCC-6.3.0-2.27-base \
+   Py/3.6 pyparsing/2.2.0-Py-3.6 \
+   pydot/1.2.4-Py-3.6 \
+   libpng/1.6.29 \
+   freetype/2.8 \
+   six/1.11.0-Py-3.6 \
+   python-dateutil/2.6.1-Py-3.6 \
+   mkl/2017.4.239 \
+   numpy/1.13.3-Py-3.6 \
+   matplotlib/2.1.1-Py-3.6 \
+   PyQt5/5.11.3-Py-3.6 \
+   packaging/17.1-Py-3.6 \
+   seaborn/0.8.1-Py-3.6
 
 export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb

src/csv_vals_edit.py

@@ -43,6 +43,13 @@ class csv_vals_edit_window(QtWidgets.QDialog, design_csv_vals_edit.Ui_csv_vals_e
         xLabel_multiplier = config_dic['x_val_multiplier']
         funcLabel_multiplier = config_dic['label_val_multiplier']
 
+        if keys:
+            keyInd = [i for i, x in enumerate(config_dic['file_name_args_tup']) if 'key' in x]
+            keyVal = []
+            for key in keys:
+                key = key.split(';')[0]
+                keyVal.append(key)
+
         data_path = config_dic['root_folder'][0][0] + "/" + region
         csv_names = glob.glob(data_path + '/*.csv')
         first_csv_path = csv_names[0]
@@ -50,12 +57,18 @@ class csv_vals_edit_window(QtWidgets.QDialog, design_csv_vals_edit.Ui_csv_vals_e
         target_csv_name = first_csv_name
         target_csv_name[xLabelInd[0]] = str(int(round(float(xLabelVal)/xLabel_multiplier)))
         target_csv_name[funcLabelInd[0]] = str(int(round(float(funcLabelVal)/funcLabel_multiplier)))
+        for i, index in enumerate(keyInd):
+            target_csv_name[index] = keyVal[i]
+        #all config parameters
+        for i in range(len(target_csv_name)):
+            if not i in keyInd and i is not funcLabelInd[0] and i is not xLabelInd[0]:
+                target_csv_name[i] =  '*'
         target_csv_name = ('_').join(target_csv_name) + ".csv"
-        self.target_csv_path = data_path + '/' + target_csv_name
+        self.target_csv_path = glob.glob(data_path + '/' + target_csv_name)
 
         vals_ind = []
         vals = []
-        with open(self.target_csv_path) as csvfile:
+        with open(self.target_csv_path[0]) as csvfile:
             reader = csv.reader(csvfile, delimiter=',')
             yLabel_category = False
             self.all_csv_lines = []

src/heatmap.py

@@ -92,7 +92,7 @@ class Window(QtWidgets.QDialog):
         self.layout = QtWidgets.QVBoxLayout()
 
         self.plot_data = self.D[0]
-        self.keyList = self.plot_data[1]["config"][2:]
+        self.keyList = self.plot_data[1]["key"]
 
         self.gl = QtWidgets.QGridLayout()
 
@@ -316,10 +316,9 @@ class Window(QtWidgets.QDialog):
                 if str(self.combo.currentText()) == "{}, {}".format(self.D[i][0]["category"],self.D[i][0]["arg"]):
                     self.plot_data = self.D[i]
         if dataLabel == "Overall summary":
-            self.keyList = self.plot_data[1]["config"][2:]
+            self.keyList = self.plot_data[1]["key"]
         else:
-            self.keyList = self.plot_data[1]['head_text_config'][1].replace('\\,', ' ')
-            self.keyList = self.keyList.split(',')[2:]
+            self.keyList = self.plot_data[1]['key']
         self.draw_heatmap()
 
 
@@ -347,7 +346,7 @@ class Window(QtWidgets.QDialog):
 
         self.csv_vals_edit_dialog = csv_vals_edit.csv_vals_edit_window(reg, self.plot_data[1]["x_label_name"], str(self.ky[idy]),
                         self.plot_data[1]["func_label_name"], list(self.k)[idx],
-                        (self.plot_data[0]['category'], self.plot_data[0]['arg']), self.keyStr, main_menu_instance = self.main_menu_instance)
+                        (self.plot_data[0]['category'], self.plot_data[0]['arg']), self.keyList, main_menu_instance = self.main_menu_instance)
         self.csv_vals_edit_dialog.show()