Changeset 70308f6c in sasview for src/sas/sasgui
- Timestamp:
- Aug 15, 2016 10:01:36 AM (8 years ago)
- Branches:
- master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- fa1cbee
- Parents:
- cba0c77
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py
rcba0c77 r70308f6c 173 173 log_msg = '' 174 174 output = {} 175 any_error = False176 175 data_error = False 177 176 error_message = "" 178 177 179 178 for p_file in path: 179 file_error = False 180 180 info = "info" 181 181 basename = os.path.basename(p_file) 182 182 _, extension = os.path.splitext(basename) 183 183 if extension.lower() in EXTENSIONS: 184 any_error = True185 184 info = "error" 186 185 log_msg = "Data Loader cannot " … … 211 210 except: 212 211 logging.error(sys.exc_value) 213 any_error = True214 if any_error:212 file_error = True 213 if file_error: 215 214 error = "Error: " + str(sys.exc_info()[1]) 216 215 error += " while loading file: %s" % str(basename) … … 228 227 info = "error" 229 228 230 if any_error or error_message:229 if error_message != "": 231 230 self.load_update(output=output, message=error_message, info=info) 232 231 else:
Note: See TracChangeset
for help on using the changeset viewer.