Changeset b0b09b9 in sasview for src/sas/qtgui/Calculators/GenericScatteringCalculator.py

Timestamp:

Oct 26, 2017 3:13:05 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

895e7359

Parents:

def64a0

Message:

Initial changes to make SasView? run with python3

File:

• src/sas/qtgui/Calculators/GenericScatteringCalculator.py (modified) (8 diffs, 1 prop)

src/sas/qtgui/Calculators/GenericScatteringCalculator.py

@@ -22 +22 @@
 
 # Local UI
-from UI.GenericScatteringCalculator import Ui_GenericScatteringCalculator
+from .UI.GenericScatteringCalculator import Ui_GenericScatteringCalculator
 
 _Q1D_MIN = 0.001
@@ -119 +119 @@
         TODO Temporary solution to display information about option 'Ellipsoid'
         """
-        print "The option Ellipsoid has not been implemented yet."
+        print("The option Ellipsoid has not been implemented yet.")
         self.communicator.statusBarUpdateSignal.emit(
             "The option Ellipsoid has not been implemented yet.")
@@ -165 +165 @@
                 self.reader.queue()
         except (RuntimeError, IOError):
-            log_msg = "Generic SAS Calculator: %s" % sys.exc_value
+            log_msg = "Generic SAS Calculator: %s" % sys.exc_info()[1]
             logging.info(log_msg)
             raise
@@ -556 +556 @@
             d.addCallback(self.plot_1_2d)
         except:
-            log_msg = "{}. stop".format(sys.exc_value)
+            log_msg = "{}. stop".format(sys.exc_info()[1])
             logging.info(log_msg)
         return
@@ -644 +644 @@
             self.graph_num += 1
             # TODO
-            print 'TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED'
+            print('TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED')
             return plot1D
         else:
@@ -662 +662 @@
             self.graph_num += 1
             # TODO
-            print 'TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED'
+            print('TRANSFER OF DATA TO MAIN PANEL TO BE IMPLEMENTED')
             return plot2D
 
@@ -744 +744 @@
         # II. Plot selective points in color
         other_color = numpy.ones(len(pix_symbol), dtype='bool')
-        for key in color_dic.keys():
+        for key in list(color_dic.keys()):
             chosen_color = pix_symbol == key
             if numpy.any(chosen_color):
@@ -758 +758 @@
                 # Get atom names not in the list
                 a_names = [symb for symb in pix_symbol \
-                           if symb not in color_dic.keys()]
+                           if symb not in list(color_dic.keys())]
                 a_name = a_names[0]
                 for name in a_names: