Changeset fa05c6c1 in sasview for src/sas

Timestamp:

May 8, 2018 4:23:59 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:

acd9c311, bac81f4, fca1f50

Parents:

42787fb

Message:

Minor stability fixes for some calculators

Location:

src/sas/qtgui

Files:

• Calculators/ResolutionCalculatorPanel.py (modified) (1 diff)
• Calculators/SlitSizeCalculator.py (modified) (1 diff)
• MainWindow/GuiManager.py (modified) (2 diffs)

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -327 +327 @@
                 return
 
-            try:
-                basename = os.path.basename(datafile)
+            basename = os.path.basename(datafile)
+
+            input_f = open(datafile, 'r')
+            buff = input_f.read()
+            lines = buff.split('\n')
+
+            wavelength = []
+            intensity = []
+
+            for line in lines:
+                toks = line.split()
+                try:
+                    wave = float(toks[0])
+                    intens = float(toks[1])
+                    wavelength.append(wave)
+                    intensity.append(intens)
+                except:
+                    logging.info('Could not extract values from file')
+            if wavelength and intensity:
                 if basename not in list(self.spectrum_dic.keys()):
                     self.cbCustomSpectrum.addItem(basename)
-
-                input_f = open(datafile, 'r')
-                buff = input_f.read()
-                lines = buff.split('\n')
-
-                wavelength = []
-                intensity = []
-
-                for line in lines:
-                    toks = line.split()
-                    try:
-                        wave = float(toks[0])
-                        intens = float(toks[1])
-                        wavelength.append(wave)
-                        intensity.append(intens)
-                    except:
-                        logging.info('Could not extract values from file')
-            except:
-                raise
-
-            self.spectrum_dic[basename] = [wavelength, intensity]
-            self.resolution.set_spectrum(self.spectrum_dic[basename])
+                self.spectrum_dic[basename] = [wavelength, intensity]
+                self.resolution.set_spectrum(self.spectrum_dic[basename])
         return
 

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -115 +115 @@
             xdata = data.x
             ydata = data.y
-            #if xdata == [] or xdata is None or ydata == [] or ydata is None:
-            if (not xdata or xdata is None) or (not ydata or ydata is None):
+            if xdata == [] or xdata is None or ydata == [] or ydata is None:
                 msg = "The current data is empty please check x and y"
                 logging.error(msg)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -602 +602 @@
         """
         """
-        #self.DVCalculator.show()
         self.KIESSIGCalculator.show()
 
@@ -613 +612 @@
         """
         """
-        self.ResolutionCalculator.show()
+        try:
+            self.ResolutionCalculator.show()
+        except Exception as ex:
+            logging.error(str(ex))
+            return
 
     def actionGeneric_Scattering_Calculator(self):
         """
         """
-        self.GENSASCalculator.show()
+        try:
+            self.GENSASCalculator.show()
+        except Exception as ex:
+            logging.error(str(ex))
+            return
 
     def actionPython_Shell_Editor(self):