Changeset 54492dc in sasview

Timestamp:

Aug 23, 2018 10:09:31 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

ff3b293

Parents:

b7f7d3f

Message:

Fixed issue with batch loading
Added log/log to the quick list SASVIEW-990

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)
• Plotting/ScaleProperties.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -184 +184 @@
         else:
             # batch datasets
+            self._logic = []
             for data_item in value:
                 logic = FittingLogic(data=GuiUtils.dataFromItem(data_item))

src/sas/qtgui/Plotting/ScaleProperties.py

@@ -12 +12 @@
 y_values = ["y", "1/y", "ln(y)", "y^(2)", "y*x^(2)", "y*x^(4)", "1/sqrt(y)",
             "log10(y)", "ln(y*x)", "ln(y*x^(2))", "ln(y*x^(4))", "log10(y*x^(4))"]
-view_values = ["--", "Linear y vs x", "Guinier lny vs x^(2)",
+view_values = ["--", "Linear y vs x", "log(y) vs log(x)", "Guinier lny vs x^(2)",
             "XS Guinier ln(y*x) vs x^(2)", "Porod y*x^(4) vs x^(4)", "Kratky y*x^(2) vs x"]
 view_to_xy = {
     view_values[0]: [None, None], # custom
     view_values[1]: [0, 0], # linear
-    view_values[2]: [1, 2], # Guinier
-    view_values[3]: [1, 8], # XS Guinier
-    view_values[4]: [2, 5], # Porod
-    view_values[5]: [0, 4], # Kratky
+    view_values[2]: [4, 7], # log
+    view_values[3]: [1, 2], # Guinier
+    view_values[4]: [1, 8], # XS Guinier
+    view_values[5]: [2, 5], # Porod
+    view_values[6]: [0, 4], # Kratky
 }
 class ScaleProperties(QtWidgets.QDialog, Ui_scalePropertiesUI):