scipion-pyworkflow 3.10.6__py3-none-any.whl → 3.11.1__py3-none-any.whl

pyworkflow/gui/form.py

@@ -29,6 +29,9 @@ creation of protocol form GUI from its
 params definition.
 """
 import logging
+
+from typing import Type
+
 logger = logging.getLogger(__name__)
 import os
 import tkinter as tk
@@ -558,11 +561,15 @@ class SubclassesTreeProvider(TreeProvider):
         obj = pobj.get()
         actions = []
         domain = pw.Config.getDomain()
-        viewers = domain.findViewers(obj.getClassName(), DESKTOP_TKINTER)
+        viewers = domain.findViewers(obj, DESKTOP_TKINTER)
         proj = self.protocol.getProject()
+
+        def addViewer(viewer):
+            actions.append((viewer.getName(),
+                            lambda: viewer(project=proj).visualize(obj)))
+
         for v in viewers:
-            actions.append((v.getName(),
-                            lambda: v(project=proj).visualize(obj)))
+            addViewer(v)
         return actions
 
 
@@ -847,7 +854,7 @@ class SectionFrame(tk.Frame):
         csize = self._getContentSize()
 
         # update the inner frame's width to fill the canvas
-        self.canvas.itemconfigure(self.contentId, width=csize[0],height=csize[1])
+        self.canvas.itemconfigure(self.contentId, width=csize[0], height=csize[1])
         self.canvas.config(scrollregion="0 0 %s %s" % fsize)
 
     def _getContentSize(self):
@@ -929,9 +936,6 @@ class ParamWidget:
                  showButtons=True):
         self.window = window
         self._protocol = self.window.protocol
-        if self._protocol.getProject() is None:
-            logger.error(">>> ERROR: Project is None for protocol: %s, "
-                  "start winpdb to debug it" % self._protocol)
 
         self.row = row
         self.column = column
@@ -1005,8 +1009,8 @@ class ParamWidget:
     def _showInfo(self, msg):
         showInfo("Info", msg, self.parent)
 
-    def _showError(self, msg):
-        showError("Error", msg, self.parent)
+    def _showError(self, msg, exception=None):
+        showError("Error", msg, self.parent, exception=exception)
 
     def _showWarning(self, msg):
         showWarning("Warning", msg, self.parent)
@@ -1015,7 +1019,8 @@ class ParamWidget:
         wizClass = self.window.wizards[self.wizParamName]
         wizard = wizClass()
         # wizParamName: form attribute, the wizard object can check from which parameter it was called
-        # Used into VariableWizard objects (scipion-chem), where input and output parameters used for each wizard are defined
+        # Used into VariableWizard objects (scipion-chem), where input and output parameters used
+        # for each wizard are defined
         self.window.wizParamName = self.wizParamName
         wizard.show(self.window)
 
@@ -1235,7 +1240,7 @@ class ParamWidget:
             label, _ = getPointerLabelAndInfo(pointer, self._protocol.getMapper())
             self._showInfo('*%s* points to *None*' % label)
         else:
-            viewers = pw.Config.getDomain().findViewers(obj.getClassName(), DESKTOP_TKINTER)
+            viewers = pw.Config.getDomain().findViewers(obj, DESKTOP_TKINTER)
             if len(viewers):
                 ViewerClass = viewers[0]  # Use the first viewer registered
                 # Instantiate the viewer and visualize object
@@ -1261,7 +1266,7 @@ class ParamWidget:
 
     def _browseObject(self, e=None):
         """Select an object from DB
-        This function is suppose to be used only for PointerParam"""
+        This function is supposed to be used only for PointerParam"""
         value = self.get()
         selected = []
         if isinstance(value, list):
@@ -1322,7 +1327,7 @@ class ParamWidget:
                     return ("Please select object of types: %s"
                             % self.param.paramClass.get())
 
-        title = "Select object of types: %s" % self.param.paramClass.__name__
+        title = "Select object of type %s" % self.param.paramClass.__name__
 
         # Let's ignore conditions so far
         # pointerCond = self.param.pointerCondition.get()
@@ -1364,11 +1369,11 @@ class ParamWidget:
                              selectOnDoubleClick=True)
             if dlg.values:
                 self.set(dlg.values[0])
-        except AttributeError:
+        except AttributeError as exc:
             self._showError("Error loading possible inputs. "
                             "This usually happens because the parameter "
                             "needs info from other parameters... are "
-                            "previous mandatory parameters set?")
+                            "previous mandatory parameters set?", exception=exc)
 
     def _removeRelation(self, e=None):
         self.var.remove()
@@ -1537,7 +1542,8 @@ class FormWindow(Window):
         4. Buttons: buttons at bottom for close, save and execute.
     """
 
-    def __init__(self, title, protocol, callback, master=None, position=None, **kwargs):
+    def __init__(self, title, protocol:pwprot.Protocol, callback, master=None, position=None,
+                 previousProt:pwprot.Protocol=None, **kwargs):
         """ Constructor of the Form window. 
         Params:
          title: title string of the windows.
@@ -1557,6 +1563,7 @@ class FormWindow(Window):
         self.disableRunMode = kwargs.get('disableRunMode', False)
         self.bindings = []
         self.protocol = protocol
+        self.previousProt=previousProt
         self.position = position
         # This control when to close or not after execute
         self.visualizeMode = kwargs.get('visualizeMode', False)
@@ -1573,6 +1580,25 @@ class FormWindow(Window):
         protocol.legacyCheck()
         self._createGUI()
 
+    def hasPreviousProt(self):
+        return self.previousProt is not None
+
+    def getPreviousProtOutput(self):
+        """ Returns the previous protocol output"""
+        if self.hasPreviousProt():
+
+            # NOTE: Should we cache this?.
+            for attr, output in self.previousProt.iterOutputAttributes(includePossible=True):
+                yield attr, output
+
+    def getParam(self, paramName):
+        """ Returns a specific parameter from the form definition by its name
+
+        :param paramName: Name of the parameter
+        """
+
+        return self.protocol._definition.getParam(paramName)
+
     def _createGUI(self):
         mainFrame = tk.Frame(self.root, name="main")
         configureWeigths(mainFrame, row=2)
@@ -1684,34 +1710,38 @@ class FormWindow(Window):
             allowGpu = prot.allowsGpu()
             numberOfMpi = prot.numberOfMpi.get()
             numberOfThreads = prot.numberOfThreads.get()
-            mode = prot.stepsExecutionMode
 
             if not (allowThreads or allowMpi or allowGpu):
                 return
 
-            self._createHeaderLabel(runFrame, pwutils.Message.LABEL_PARALLEL, bold=True,
-                                    sticky='e', row=r, pady=0)
 
             if allowThreads or allowMpi:
-                procFrame = tk.Frame(runFrame, bg=pw.Config.SCIPION_BG_COLOR)
-                r2 = 0
-                c2 = 0
-                sticky = 'e'
 
-                helpMessage = pwutils.Message.HELP_PARALLEL_HEADER
+                threadsParam = self.getParam(pwutils.Message.VAR_THREADS)
+                mpiParam = self.getParam(pwutils.Message.VAR_MPI)
+                binThreads = self.getParam("binThreads")
 
-                if mode == pwprot.STEPS_PARALLEL:
+                if prot.modeParallel():
                     if allowThreads and numberOfThreads > 0:
+
                         prot.numberOfMpi.set(1)
-                        self._createHeaderLabel(procFrame, pwutils.Message.LABEL_SCIPION_THREADS,
-                                                sticky=sticky, row=r2, column=c2,
-                                                pady=0)
-                        entry = self._createBoundEntry(procFrame,
+                        self._createHeaderLabel(runFrame, threadsParam.getLabel(),
+                                                sticky='e', row=r, column=0,
+                                                pady=0, bold=True)
+                        entry = self._createBoundEntry(runFrame,
                                                        pwutils.Message.VAR_THREADS)
 
-                        helpMessage += pwutils.Message.HELP_SCIPION_THREADS
+                        entry.grid(row=r, column=1, padx=(0, 5), sticky='w')
+
+                        btnHelp = IconButton(runFrame, pwutils.Message.TITLE_COMMENT,
+                                             pwutils.Icon.ACTION_HELP,
+                                             highlightthickness=0,
+                                             command=self._createHelpCommand(
+                                                 threadsParam.getHelp()))
+                        btnHelp.grid(row=r, column=2, padx=(5, 0), pady=2, sticky='e')
+
+                        r += 1
 
-                        entry.grid(row=r2, column=c2 + 1, padx=(0, 5), sticky='w')
                     elif allowMpi and numberOfMpi > 1:
                         self.showError("MPI parameter is deprecated for protocols "
                                        "with execution is set to STEPS_PARALLEL. "
@@ -1721,42 +1751,60 @@ class FormWindow(Window):
                                        "STEPS_PARALLEL number of threads "
                                        "should not be set to zero.")
 
-                else:
+                # Either is serial (threads and/or mpi as argument, or is Scipion parallel with binThreads
+                if prot.modeSerial() or binThreads:
+
+                    helpMessage = pwutils.Message.HELP_PARALLEL_HEADER
+
+                    label = pwutils.Message.LABEL_PARALLEL
+                    label = "%s compute" % prot.getClassPackageName()
+                    # Add the main header and its frame
+                    self._createHeaderLabel(runFrame, label, bold=True,
+                                            sticky='e', row=r, pady=0)
+                    procFrame = tk.Frame(runFrame, bg=pw.Config.SCIPION_BG_COLOR)
+                    r2 = 0
+                    c2 = 0
+                    sticky = 'e'
+
                     # ---- THREADS----
-                    if allowThreads:
-                        self._createHeaderLabel(procFrame, pwutils.Message.LABEL_THREADS,
+                    if binThreads or allowThreads:
+                        attrName = pwutils.Message.VAR_THREADS
+                        if binThreads:
+                            threadsParam = binThreads
+                            attrName = "binThreads"
+                        self._createHeaderLabel(procFrame, threadsParam.getLabel(),
                                                 sticky=sticky, row=r2, column=c2,
                                                 pady=0)
                         entry = self._createBoundEntry(procFrame,
-                                                       pwutils.Message.VAR_THREADS)
+                                                       attrName)
                         entry.grid(row=r2, column=c2 + 1, padx=(0, 5), sticky='w')
                         # Modify values to be used in MPI entry
                         c2 += 2
                         sticky = 'w'
 
-                        helpMessage += pwutils.Message.HELP_PARALLEL_THREADS
+                        helpMessage += threadsParam.getHelp()
                     # ---- MPI ----
                     if allowMpi:
-                        self._createHeaderLabel(procFrame, pwutils.Message.LABEL_MPI,
+                        self._createHeaderLabel(procFrame, mpiParam.getLabel(),
                                                 sticky=sticky, row=r2, column=c2,
                                                 pady=0)
                         entry = self._createBoundEntry(procFrame, pwutils.Message.VAR_MPI)
                         entry.grid(row=r2, column=c2 + 1, padx=(0, 5), sticky='w')
 
-                        helpMessage += '\n' + pwutils.Message.HELP_PARALLEL_MPI
+                        helpMessage += '\n' + mpiParam.getHelp()
 
 
-                btnHelp = IconButton(procFrame, pwutils.Message.TITLE_COMMENT,
-                                     pwutils.Icon.ACTION_HELP,
-                                     highlightthickness=0,
-                                     command=self._createHelpCommand(
-                                         helpMessage))
-                btnHelp.grid(row=0, column=4, padx=(5, 0), pady=2, sticky='e')
+                    btnHelp = IconButton(procFrame, pwutils.Message.TITLE_COMMENT,
+                                         pwutils.Icon.ACTION_HELP,
+                                         highlightthickness=0,
+                                         command=self._createHelpCommand(
+                                             helpMessage))
+                    btnHelp.grid(row=0, column=4, padx=(5, 0), pady=2, sticky='e')
 
-                procFrame.columnconfigure(0, minsize=60)
-                procFrame.grid(row=r, column=1, sticky='ew', columnspan=2)
+                    procFrame.columnconfigure(0, minsize=60)
+                    procFrame.grid(row=r, column=1, sticky='ew', columnspan=2)
 
-                r += 1
+                    r += 1
 
             if allowGpu:
                 self._createHeaderLabel(runFrame, "GPU IDs", bold=True,
@@ -2202,12 +2250,20 @@ class FormWindow(Window):
             # to avoid ghost inputs
             self._checkAllChanges(toggleWidgetVisibility=False)
 
+            # This may be viewprotocols.py.ProtocolsView._executeSaveProtocol
+            # Message is either a confirmation that the protocol has been saves or empty message
             message = self.callback(self.protocol, onlySave, doSchedule, position=self.position)
             if not self.visualizeMode:
+                # If there is a message
                 if len(message):
-                    self.showInfo(message, "Protocol action")
-                if not onlySave:
+                    if onlySave and not pw.Config.SCIPION_UNLOAD_FORM_ON_SAVE:
+                        self.showInfo(message, "Protocol action")
+                    else:
+                        logger.info(message)
+
+                if not onlySave or pw.Config.SCIPION_UNLOAD_FORM_ON_SAVE:
                     self.close()
+
         except ModificationNotAllowedException as ex:
             self.showInfo("Modification not allowed.\n\n %s\n" % ex)
         except Exception as ex:
@@ -2217,11 +2273,20 @@ class FormWindow(Window):
             self.showError("Error during %s: \n%s" % (action, ex), exception=ex)
 
     def getWidgetValue(self, protVar, param):
-        widgetValue = ""
+        """ Returns the value for the widget"""
+
+        widgetValue = protVar
         if (isinstance(param, pwprot.PointerParam) or
                 isinstance(param, pwprot.MultiPointerParam) or
                 isinstance(param, pwprot.RelationParam)):
-            widgetValue = protVar
+
+            # If protVar has already a value
+            if protVar.hasValue():
+                widgetValue = protVar
+            elif self.protocol.isNew():
+                # try to link it to the output of the previousProtocol
+                return self.suggestValueFromPreviousProt(param, protVar)
+
         # For Scalar params that allowPointers
         elif param.allowsPointers:
             if protVar.hasPointer():
@@ -2233,11 +2298,33 @@ class FormWindow(Window):
             widgetValue = protVar.get(param.default.get())
         return widgetValue
 
+    def suggestValueFromPreviousProt(self, param, pointer:pwobj.Pointer):
+
+        """Suggest an input from the previous selected protocol that matches the param type"""
+        if not hasattr(param, "pointerClass"):
+            return pointer
+
+        paramTypeStr = param.pointerClass.get().split(",")
+
+        # Iterate over the output of the selected protocol
+        for attr, value in self.getPreviousProtOutput():
+
+            # Deal with possible outputs where value is the class and not an instance
+            # TODO: We may want here to deal with inheritance and use isinstance...
+            #       but for that we need the class and not the string
+            outputType = value.getClassName()
+            if outputType in paramTypeStr:
+                pointer.set(self.previousProt)
+                pointer.setExtended(attr)
+                # First found is enough
+                break
+
+        return pointer
     def _visualize(self, paramName):
         protVar = getattr(self.protocol, paramName)
         if protVar.hasValue():
             obj = protVar.get()  # Get the reference to the object
-            viewers = pw.Config.getDomain().findViewers(obj.getClassName(), DESKTOP_TKINTER)
+            viewers = pw.Config.getDomain().findViewers(obj, DESKTOP_TKINTER)
             if len(viewers):
                 ViewerClass = viewers[0]  # Use the first viewer registered
                 v = ViewerClass(project=self.protocol.getProject(),
@@ -2259,6 +2346,8 @@ class FormWindow(Window):
                 widget = LineWidget(r, paramName, param, self, parent, None)
                 self._fillLine(param, widget)
             else:
+
+                # Attribute of the protocol
                 protVar = getattr(self.protocol, paramName, None)
 
                 if protVar is None:

pyworkflow/gui/gui.py

@@ -133,7 +133,7 @@ def getBigFont():
     return getNamedFont(FONT_BIG)
 
 
-def setCommonFonts(windows=None):
+def setCommonFonts(window=None):
     """Set some predefined common fonts.
     Same conditions of setFont applies here."""
     f = setFont(FONT_NORMAL, family=pw.Config.SCIPION_FONT_NAME, size=pw.Config.SCIPION_FONT_SIZE)
@@ -150,17 +150,17 @@ def setCommonFonts(windows=None):
 
     setFont(FONT_BIG, family=pw.Config.SCIPION_FONT_NAME, size=pw.Config.SCIPION_FONT_SIZE+8)
 
-    if windows:
-        windows.fontBig = tkFont.Font(size=pw.Config.SCIPION_FONT_SIZE + 2, family=pw.Config.SCIPION_FONT_NAME,
+    if window:
+        window.fontBig = tkFont.Font(size=pw.Config.SCIPION_FONT_SIZE + 2, family=pw.Config.SCIPION_FONT_NAME,
                                       weight='bold')
-        windows.font = f
-        windows.fontBold = fb
-        windows.fontItalic = fi
+        window.font = f
+        window.fontBold = fb
+        window.fontItalic = fi
 
         # This adds the default value for the listbox inside a combo box
         # Which seems to not react to default font!!
-        windows.root.option_add("*TCombobox*Listbox*Font", default_font)
-        windows.root.option_add("*TCombobox*Font", default_font)
+        window.root.option_add("*TCombobox*Listbox*Font", default_font)
+        window.root.option_add("*TCombobox*Font", default_font)
 
 
 def changeFontSizeByDeltha(font, deltha, minSize=-999, maxSize=999):

pyworkflow/gui/project/project.py

@@ -136,8 +136,6 @@ class ProjectWindow(ProjectBaseWindow):
 
         self.initProjectTCPServer()  # Socket thread to communicate with clients
 
-        ProjectWorkflowNotifier(self.project).notifyWorkflow()
-
 
     def createHeaderFrame(self, parent):
         """Create the header and add the view selection frame at the right."""
@@ -175,6 +173,9 @@ class ProjectWindow(ProjectBaseWindow):
     def _onClosing(self):
         if not self.project.openedAsReadOnly():
             self.saveSettings()
+            # Send usage stats when closing scipion.
+            ProjectWorkflowNotifier(self.project).notifyWorkflow()
+
 
         ProjectBaseWindow._onClosing(self)
      
@@ -243,11 +244,9 @@ class ProjectWindow(ProjectBaseWindow):
         try:
             for fname in os.listdir(tmpPath):
                 fpath = "%s/%s" % (tmpPath, fname)
-                if os.path.isfile(fpath):
-                    os.remove(fpath)
-                    n += 1
-                # TODO: think what to do with directories. Delete? Report?
-            self.showInfo("Deleted content of %s -- %d file(s)." % (tmpPath, n))
+                pwutils.cleanPath(fpath)
+                n += 1
+            self.showInfo("Deleted content of %s -- %d files or folders." % (tmpPath, n))
         except Exception as e:
             self.showError(str(e))
         

pyworkflow/gui/project/searchprotocol.py

@@ -22,16 +22,17 @@
 # *  e-mail address 'scipion@cnb.csic.es'
 # *
 # **************************************************************************
-""" This modules hosts code provider and window to search for a protocol"""
+""" This module contains the provider and dialog to search for a protocol"""
 import tkinter as tk
-
 from pyworkflow import Config
-import  pyworkflow.gui as pwgui
+import pyworkflow.gui as pwgui
 import pyworkflow.object as pwobj
 from pyworkflow.gui.dialog import SearchBaseWindow
 
 from pyworkflow.gui.project.utils import isAFinalProtocol
 from pyworkflow.gui.project.viewprotocols_extra import ProtocolTreeConfig
+from pyworkflow.project.usage import getNextProtocolSuggestions
+from pyworkflow.utils import Icon
 
 UPDATED = "updated"
 
@@ -63,22 +64,60 @@ class SearchProtocolWindow(SearchBaseWindow):
         '#0': ('Status', {'width': 50, 'minwidth': 50, 'stretch': tk.NO}, 5),
         # Heading, tree column kwargs, casting for sorting
         'protocol': ('Protocol', {'width': 300, 'stretch': tk.FALSE}, 10),
+        'score': ('Score/Freq.', {'width': 50, 'stretch': tk.FALSE}, 5, int),
         'streaming': ('Streamified', {'width': 100, 'stretch': tk.FALSE}, 5),
         'installed': ('Installation', {'width': 110, 'stretch': tk.FALSE}, 5),
         'help': ('Help', {'minwidth': 300, 'stretch': tk.YES}, 5),
-        'score': ('Score', {'width': 50, 'stretch': tk.FALSE}, 5, int)
     }
 
-    def __init__(self, parentWindow, position=None):
+    def __init__(self, parentWindow, position=None, selectionGetter=None):
 
         posStr = "" if position is None else " at (%s,%s)" % position
         self.position = position
+        self.selectionGetter = selectionGetter
+        self.selectedProtocol = None
+        self._infoLbl = None  # Label to show information
         super().__init__(parentWindow,
                          title="Add a protocol" + posStr)
 
+        self.root.bind("<FocusIn>", self._onWindowFocusIn)
+
+    def _onWindowFocusIn(self, event):
+        """
+        To refresh the selected protocol in the graph upon window activation.
+        :param event: event information
+        :return: Nothing
+        """
+        if event.widget == self.root and self.selectionGetter:
+            self.selectedProtocol = self.selectionGetter()
+            if self._isSuggestionActive():
+                self._onSearchClick()
+    def _isSuggestionActive(self):
+        """
+        :return: Returns true if current mode is suggestion mode.
+        """
+        return self._searchVar.get().lower().strip() ==""
+
+    def _createSearchBox(self, content):
+        frame = super()._createSearchBox(content)
+
+        btn = pwgui.widgets.IconButton(frame, "Suggest",
+                                 tooltip="Suggestions for active protocol based on usage.",
+                                 imagePath=Icon.LIGHTBULB,
+                                 command=self.showSuggestions)
+        btn.grid(row=0, column=3, sticky='nw')
+
+        self.lbl = tk.StringVar()
+        lbl = tk.Label(frame, text="", bg=Config.SCIPION_BG_COLOR, textvariable=self.lbl, font=self.font)
+        lbl.grid(row=0, column=4, sticky='news')
+
     def _createResultsTree(self, frame, show, columns):
+        # This code is where the callback (on double click) is defined.
         return self.master.getViewWidget()._createProtocolsTree(frame, show=show, columns=columns, position=self.position)
 
+    def showSuggestions(self, e=None):
+        self._searchVar.set("")
+        self._onSearchClick()
     def _onSearchClick(self, e=None):
 
         self._resultsTree.clear()
@@ -92,7 +131,12 @@ class SearchProtocolWindow(SearchBaseWindow):
 
     def scoreProtocols(self):
 
+        if self._isSuggestionActive():
+            return self.addSuggestions()
+
         keyword = self._searchVar.get().lower().strip()
+        self.lbl.set('Showing text search matches for "%s"' % keyword)
+
         emProtocolsDict = Config.getDomain().getProtocols()
         protList = []
 
@@ -114,6 +158,46 @@ class SearchProtocolWindow(SearchBaseWindow):
 
         return protList
 
+    def addSuggestions(self):
+
+        if self.selectedProtocol is None:
+            self.lbl.set("Showing suggestions for a first protocol")
+            protName =str(None)
+        else:
+            protName = self.selectedProtocol.getClassName()
+            self.lbl.set("Usage suggestions for selected protocol: %s" % self.selectedProtocol.getClassLabel())
+
+        protList = []
+        suggestions = getNextProtocolSuggestions(protName)
+        for suggestion in suggestions:
+            #Fields comming from the site:
+            # https://scipion.i2pc.es/report_protocols/api/v2/nextprotocol/suggestion/None/
+            # 'next_protocol__name', 'count', 'next_protocol__friendlyName', 'next_protocol__package', 'next_protocol__description'
+            nextProtName, count, name, package, descr = suggestion
+            streamstate = "unknown"
+            installed = "Missing. Available in %s plugin." % package
+            protClass = Config.getDomain().getProtocols().get(nextProtName, None)
+
+            # Get accurate values from existing installations
+            if protClass is not None:
+                name = protClass.getClassLabel().lower()
+                descr = protClass.getHelpText().strip().replace('\r', '').replace('\n', '').lower()
+                streamstate = "streamified" if protClass.worksInStreaming() else "static"
+                installed = "installed" if protClass.isInstalled() else "missing installation"
+
+            line = (nextProtName, name,
+                    installed,
+                    descr,
+                    streamstate,
+                    "",
+                    "",
+                    "",
+                    count)
+
+            protList.append(line)
+
+        return protList
+
     @staticmethod
     def _addSearchWeight(line2Search, searchtext):
         # Adds a weight value for the search
@@ -139,7 +223,7 @@ class SearchProtocolWindow(SearchBaseWindow):
     def _addProtocolToTree(self, protList):
         """ Adds the items in protList to the tree
 
-        :param protList: List of tuples with all the values/columns used in the search search to show in the tree"""
+        :param protList: List of tuples with all the values/columns used in search and shown in the tree"""
 
         for key, label, installed, help, streamified, beta, new, updated, weight in protList:
             tag = ProtocolTreeConfig.getProtocolTag(installed == 'installed',
@@ -149,6 +233,6 @@ class SearchProtocolWindow(SearchBaseWindow):
 
             self._resultsTree.insert(
                 '', 'end', key, text="", tags=tag,
-                values=(label, streamified, installed, help, weight))
+                values=(label, weight, streamified, installed, help))
 
 

pyworkflow/gui/project/viewdata.py

@@ -381,7 +381,7 @@ class ProjectDataView(tk.Frame):
     def _viewObject(self, objId):
         """ Call appropriate viewer for objId. """
         obj = self.project.getObject(int(objId))
-        viewerClasses = self.domain.findViewers(obj.getClassName(),
+        viewerClasses = self.domain.findViewers(obj,
                                                 pwviewer.DESKTOP_TKINTER)
         if not viewerClasses:
             return  # TODO: protest nicely