Merge v1.2.9

Corrects GeneralResidueEvolution Popup

gui/Footer.py

@@ -102,7 +102,7 @@ def __init__(self, parent, gui_settings=None):
         #
         version = '<span style="color: #036D8F; font-size: 6pt; ' \
                   'font-weight: 400; margin-right: 29px; margin-top: 4px;"' \
-                  '>v.1.2.8&nbsp;&nbsp;&nbsp;&nbsp;</span>'
+                  '>v.1.2.9&nbsp;&nbsp;&nbsp;&nbsp;</span>'
         self.versionLabel = QLabel(version, self)
         self.versionLabel.setAlignment(QtCore.Qt.AlignRight)
         #

gui/popups/GeneralResidueEvolution.py

@@ -203,29 +203,29 @@ def get_defaults(self):
         # checkbox
         self.do_revo_fit.checkBox.setChecked(self.defaults["perform_resevo_fitting"])
         # dropdown list
-        self.revo_subtitle_fn.select(self.defaults["revo_subtitle_fn"])
-        self.revo_subtitle_weight.select(self.defaults["revo_subtitle_weight"])
-        self.revo_x_label_fn.select(self.defaults["revo_x_label_fn"])
-        self.revo_x_label_weight.select(self.defaults["revo_x_label_weight"])
-        self.revo_y_label_fn.select(self.defaults["revo_y_label_fn"])
-        self.revo_y_label_weight.select(self.defaults["revo_y_label_weight"])
-        self.revo_x_ticks_fn.select(self.defaults["revo_x_ticks_fn"])
-        self.revo_x_ticks_weight.select(self.defaults["revo_x_ticks_weight"])
-        self.revo_y_ticks_fn.select(self.defaults["revo_y_ticks_fn"])
-        self.revo_y_ticks_weight.select(self.defaults["revo_y_ticks_weight"])
+        self.revo_subtitle_fn.select(self.defaults["subtitle_fn"])
+        self.revo_subtitle_weight.select(self.defaults["subtitle_weight"])
+        self.revo_x_label_fn.select(self.defaults["x_label_fn"])
+        self.revo_x_label_weight.select(self.defaults["x_label_weight"])
+        self.revo_y_label_fn.select(self.defaults["y_label_fn"])
+        self.revo_y_label_weight.select(self.defaults["y_label_weight"])
+        self.revo_x_ticks_fn.select(self.defaults["x_ticks_fn"])
+        self.revo_x_ticks_weight.select(self.defaults["x_ticks_weight"])
+        self.revo_y_ticks_fn.select(self.defaults["y_ticks_fn"])
+        self.revo_y_ticks_weight.select(self.defaults["y_ticks_weight"])
         # value
-        self.revo_subtitle_fs.setValue(self.defaults["revo_subtitle_fs"])
-        self.revo_subtitle_pad.setValue(self.defaults["revo_subtitle_pad"])
-        self.revo_x_label_fs.setValue(self.defaults["revo_x_label_fs"])
-        self.revo_x_label_pad.setValue(self.defaults["revo_x_label_pad"])
-        self.revo_y_label_fs.setValue(self.defaults["revo_y_label_fs"])
-        self.revo_y_label_pad.setValue(self.defaults["revo_y_label_pad"])
-        self.revo_x_ticks_fs.setValue(self.defaults["revo_x_ticks_fs"])
-        self.revo_x_ticks_pad.setValue(self.defaults["revo_x_ticks_pad"])
-        self.revo_x_ticks_rotation.setValue(self.defaults["revo_x_ticks_rot"])
-        self.revo_y_ticks_fs.setValue(self.defaults["revo_y_ticks_fs"])
-        self.revo_y_ticks_pad.setValue(self.defaults["revo_y_ticks_pad"])
-        self.revo_y_ticks_rot.setValue(self.defaults["revo_y_ticks_rot"])
+        self.revo_subtitle_fs.setValue(self.defaults["subtitle_fs"])
+        self.revo_subtitle_pad.setValue(self.defaults["subtitle_pad"])
+        self.revo_x_label_fs.setValue(self.defaults["x_label_fs"])
+        self.revo_x_label_pad.setValue(self.defaults["x_label_pad"])
+        self.revo_y_label_fs.setValue(self.defaults["y_label_fs"])
+        self.revo_y_label_pad.setValue(self.defaults["y_label_pad"])
+        self.revo_x_ticks_fs.setValue(self.defaults["x_ticks_fs"])
+        self.revo_x_ticks_pad.setValue(self.defaults["x_ticks_pad"])
+        self.revo_x_ticks_rotation.setValue(self.defaults["x_ticks_rot"])
+        self.revo_y_ticks_fs.setValue(self.defaults["y_ticks_fs"])
+        self.revo_y_ticks_pad.setValue(self.defaults["y_ticks_pad"])
+        self.revo_y_ticks_rot.setValue(self.defaults["y_ticks_rot"])
         # text
         self.titration_x_values.field.setText(
             ','.join([str(x) for x in self.defaults["titration_x_values"]])