Removed debug panel and StdRedirector (#1223)

* Removed debug panel and StdRedirector

* re-enable strategies prints + move debug icon to 'unused'

---------

Co-authored-by: marc-vdm <[email protected]>

Author: mrvisscher

activity_browser/bwutils/importers.py

@@ -81,7 +81,7 @@ def simple_automated_import(cls, filepath, db_name: str, relink: dict = None) ->
             obj.project_parameters, obj.database_parameters,
             any("parameters" in ds for ds in obj.data)
         ])
-        obj.apply_strategies(verbose=False)
+        obj.apply_strategies()
         if any(obj.unlinked) and relink:
             for db, new_db in relink.items():
                 if db == "(name missing)":

activity_browser/layouts/main.py

@@ -10,8 +10,7 @@
 from ..ui.menu_bar import MenuBar
 from ..ui.statusbar import Statusbar
 from ..ui.style import header
-from ..ui.utils import StdRedirector
-from .panels import LeftPanel, RightPanel, BottomPanel
+from .panels import LeftPanel, RightPanel
 from ..signals import signals
 
 
@@ -27,12 +26,6 @@ def __init__(self, parent):
         # Window title
         self.setWindowTitle("Activity Browser")
 
-        # Background Color
-        # self.setAutoFillBackground(True)
-        # p = self.palette()
-        # p.setColor(self.backgroundRole(), QtGui.QColor(148, 143, 143, 127))
-        # self.setPalette(p)
-
         # Small icon in main window titlebar
         self.icon = qicons.ab
         self.setWindowIcon(self.icon)
@@ -50,11 +43,9 @@ def __init__(self, parent):
 
         self.left_panel = LeftPanel(self)
         self.right_panel = RightPanel(self)
-        self.bottom_panel = BottomPanel(self)
 
         #Sets the minimum width for the right panel so scaling on Mac Screens doesnt go out of bounds
         self.right_panel.setMinimumWidth(100)
-        self.bottom_panel.setMinimumHeight(100)
 
         self.splitter_horizontal = QtWidgets.QSplitter(QtCore.Qt.Horizontal)
         self.splitter_horizontal.addWidget(self.left_panel)
@@ -64,38 +55,10 @@ def __init__(self, parent):
         self.main_horizontal_box.addWidget(self.splitter_horizontal)
         self.main_window = QtWidgets.QWidget()
         self.main_window.setLayout(self.main_horizontal_box)
+        self.main_window.icon = qicons.main_window
+        self.main_window.name = "&Main Window"
 
-        self.vertical_container = QtWidgets.QVBoxLayout()
-        self.splitter_vertical = QtWidgets.QSplitter(QtCore.Qt.Vertical)
-        self.splitter_vertical.addWidget(self.main_window)
-        self.splitter_vertical.addWidget(self.bottom_panel)
-        self.vertical_container.addWidget(self.splitter_vertical)
-
-        self.main_widget = QtWidgets.QWidget()
-        self.main_widget.icon = qicons.main_window
-        self.main_widget.name = "&Main Window"
-        self.main_widget.setLayout(self.vertical_container)
-
-        """
-        # Debug/working... stack
-        self.log = QtWidgets.QTextEdit(self)
-        sys.stdout = StdRedirector(self.log, sys.stdout, None)
-        sys.stderr = StdRedirector(self.log, sys.stderr, "blue")
-
-        working_layout = QtWidgets.QVBoxLayout()
-        working_layout.addWidget(header("Program output:"))
-        working_layout.addWidget(self.log)
-        """
-        # Debug/... window stack
-        self.debug = QtWidgets.QWidget()
-        self.debug.icon = qicons.debug
-        self.debug.name = "&Debug Window"
-
-        self.stacked = QtWidgets.QStackedWidget()
-        self.stacked.addWidget(self.debug)
-        # End of Debug/... window stack
-
-        self.setCentralWidget(self.main_widget)
+        self.setCentralWidget(self.main_window)
 
         # Layout: extra items outside main layout
         self.menu_bar = MenuBar(self)
@@ -104,22 +67,14 @@ def __init__(self, parent):
         self.setStatusBar(self.status_bar)
 
         self.connect_signals()
-        self.debug_window = False
 
     def closeEvent(self,event):
         self.parent.close()
 
     def connect_signals(self):
         # Keyboard shortcuts
-        self.shortcut_debug = QtWidgets.QShortcut(QtGui.QKeySequence("Ctrl+D"), self)
-        self.shortcut_debug.activated.connect(self.toggle_debug_window)
         signals.restore_cursor.connect(self.restore_user_control)
 
-    def toggle_debug_window(self):
-        """Toggle the bottom debug window"""
-        self.debug_window = not self.debug_window
-        self.bottom_panel.setVisible(self.debug_window)
-
     def add_tab_to_panel(self, obj, label, side):
         panel = self.left_panel if side == 'left' else self.right_panel
         panel.add_tab(obj, label)

activity_browser/layouts/panels/__init__.py

@@ -2,4 +2,3 @@
 from .panel import ABTab
 from .left import LeftPanel
 from .right import RightPanel
-from .bottom import BottomPanel

activity_browser/layouts/panels/bottom.py

@@ -6,5 +6,4 @@
 from .project_manager import ProjectTab
 from .LCA_results_tab import LCAResultsTab
 from .parameters import ParametersTab
-from .debug import DebugTab
 from .plugin import PluginTab

activity_browser/layouts/tabs/__init__.py

@@ -18,6 +18,7 @@ def create_path(folder: str, filename: str) -> str:
     # add_db = create_path('metaprocess', 'add_database.png')
     # close_db = create_path('metaprocess', 'close_database.png')
     # cut = create_path('metaprocess', 'cut.png')
+    # debug = create_path('main', 'ladybird.png')
     # duplicate = create_path('metaprocess', 'duplicate.png')
     # graph_lmp = create_path('metaprocess', 'graph_linkedmetaprocess.png')
     # graph_mp = create_path('metaprocess', 'graph_metaprocess.png')
@@ -56,7 +57,6 @@ class Icons(object):
     filter = create_path('main', 'filter.png')
     filter_outline = create_path('main', 'filter_outline.png')
 
-
     # database
     import_db = create_path('main', 'import_database.png')
     duplicate_database = create_path('main', 'duplicate_database.png')
@@ -67,7 +67,6 @@ class Icons(object):
 
     # windows
     graph_explorer = create_path('main', 'graph_explorer.png')
-    debug = create_path('main', 'ladybird.png')
     issue = create_path('main', 'idea.png')
     settings = create_path('main', 'settings.png')
     history = create_path('main', 'history.png')

activity_browser/layouts/tabs/debug.py

@@ -35,19 +35,16 @@ def __init__(self, window):
 
         self.addMenu(self.file_menu)
         self.addMenu(self.view_menu)
-        self.addMenu(self.windows_menu)
         self.addMenu(self.tools_menu)
         self.addMenu(self.help_menu)
 
         self.setup_file_menu()
         self.setup_view_menu()
-        self.update_windows_menu()
         self.setup_tools_menu()
         self.setup_help_menu()
         self.connect_signals()
 
     def connect_signals(self):
-        signals.update_windows.connect(self.update_windows_menu)
         signals.project_selected.connect(self.biosphere_exists)
         signals.databases_changed.connect(self.biosphere_exists)
         self.update_biosphere_action.triggered.connect(signals.update_biosphere.emit)
@@ -84,17 +81,6 @@ def setup_view_menu(self) -> None:
             lambda: signals.toggle_show_or_hide_tab.emit("Welcome")
         )
 
-    def update_windows_menu(self):
-        """Clear and rebuild the menu for switching between tabs."""
-        self.windows_menu.clear()
-        for index in range(self.window.stacked.count()):  # iterate over widgets in QStackedWidget
-            widget = self.window.stacked.widget(index)
-            self.windows_menu.addAction(
-                widget.icon,
-                widget.name,
-                self.window.toggle_debug_window,
-            )
-
     def setup_tools_menu(self) -> None:
         """Build the tools menu for the menubar."""
         self.tools_menu.addAction(self.manage_plugins_action)

activity_browser/ui/icons.py

@@ -1,41 +1,5 @@
 # -*- coding: utf-8 -*-
 import uuid
-from io import StringIO
-
-from PySide2 import QtGui
-
-
-class StdRedirector(StringIO):
-    # From http://stackoverflow.com/questions/17132994/pyside-and-python-logging/17145093#17145093
-    def __init__(self, widget, out=None, color=None):
-        """(edit, out=None, color=None) -> can write stdout, stderr to a
-        QTextEdit.
-        edit = QTextEdit
-        out = alternate stream ( can be the original sys.stdout )
-        color = alternate color (i.e. color stderr a different color)
-        """
-        self.edit_widget = widget
-        self.out = out
-        self.color = color
-
-    def write(self, text):
-        # TODO: Doesn't seem to have any effect
-        if self.color:
-            original = self.edit_widget.textColor()
-            self.edit_widget.setTextColor(QtGui.QColor(self.color))
-
-        self.edit_widget.moveCursor(QtGui.QTextCursor.End)
-        self.edit_widget.insertPlainText(text)
-
-        if self.color:
-            self.edit_widget.setTextColor(original)
-
-        if self.out:
-            self.out.write(text)
-
-    def flush(self, *args, **kwargs):
-        pass
-
 
 def new_id():
     return uuid.uuid4().hex