Changeset e540cd2 in sasview for src/sas/qtgui/GuiUtils.py

Timestamp:

Jul 7, 2016 2:54:18 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.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:

0cd8612

Parents:

f0f309d

Message:

Status bar, progress bar, initial treeview context menu + minor cleanup

File:

• src/sas/qtgui/GuiUtils.py (modified) (10 diffs)

src/sas/qtgui/GuiUtils.py

@@ -80 +80 @@
         fObj, path_config, descr = imp.find_module(confg_file, [path])
         config_module = imp.load_module(confg_file, fObj, path_config, descr)
-    except:
+    except ImportError:
         logging.error("Error loading %s/%s: %s" % (path, confg_file, sys.exc_value))
     finally:
@@ -104 +104 @@
         logging.info("using default local_config")
     else:
-        logging.info("found local_config in %s" % os.getcwd())
+        logging.info("found local_config in %s", os.getcwd())
 else:
-    logging.info("found local_config in %s" % PATH_APP)
+    logging.info("found local_config in %s", PATH_APP)
 
 
@@ -118 +118 @@
         logging.info(msgConfig)
     else:
-        logging.info("using custom_config in %s" % os.getcwd())
+        logging.info("using custom_config in %s", os.getcwd())
 else:
-    logging.info("using custom_config from %s" % c_conf_dir)
+    logging.info("using custom_config from %s", c_conf_dir)
 
 #read some constants from config
@@ -154 +154 @@
     else:
         DEFAULT_OPEN_FOLDER = PATH_APP
-except:
+except AttributeError:
     DATALOADER_SHOW = True
     TOOLBAR_SHOW = True
@@ -181 +181 @@
 try:
     PLUGINS_WLIST = '|'.join(config.PLUGINS_WLIST)
-except:
+except AttributeError:
     PLUGINS_WLIST = ''
 APPLICATION_WLIST = config.APPLICATION_WLIST
@@ -214 +214 @@
     plotRequestedSignal = QtCore.pyqtSignal(str)
 
+    # Progress bar update value
+    progressBarUpdateSignal = QtCore.pyqtSignal(int)
+
 
 def updateModelItem(item, update_data, name=""):
@@ -220 +223 @@
     Adds QVariant 'update_data' to that row.
     """
-    assert type(item) == QtGui.QStandardItem
-    assert type(update_data) == QtCore.QVariant
+    assert isinstance(item, QtGui.QStandardItem)
+    assert isinstance(update_data, QtCore.QVariant)
 
     checkbox_item = QtGui.QStandardItem(True)
@@ -230 +233 @@
     # Add "Info" item
     py_update_data = update_data.toPyObject()
-    if type(py_update_data) == (Data1D or Data2D):
+    if isinstance(py_update_data, (Data1D or Data2D)):
         # If Data1/2D added - extract Info from it
         info_item = infoFromData(py_update_data)
@@ -254 +257 @@
     Returns the list of plots for items in the model which are checked
     """
-    assert type(model_item) == QtGui.QStandardItemModel
-
-    checkbox_item = QtGui.QStandardItem(True)
+    assert isinstance(model_item, QtGui.QStandardItemModel)
+
     plot_data = []
-
     # Iterate over model looking for items with checkboxes
     for index in range(model_item.rowCount()):
@@ -279 +280 @@
     and add them to a model item
     """
-    assert type(data) in [Data1D, Data2D]
+    assert isinstance(data, (Data1D, Data2D))
 
     info_item = QtGui.QStandardItem("Info")