From debc81a11a461b4a19f3c33eb5c68c7ba105b201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20S=C3=A1nchez-Gallego?= Date: Mon, 14 Feb 2022 23:32:14 -0700 Subject: [PATCH] Remove most plotting windows --- TUI/LoadStdModules.py | 28 ++++++++++++++-------------- TUI/Main.py | 18 +++++++++--------- TUI/Version.py | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/TUI/LoadStdModules.py b/TUI/LoadStdModules.py index 0908c4e..0a715ec 100755 --- a/TUI/LoadStdModules.py +++ b/TUI/LoadStdModules.py @@ -7,16 +7,16 @@ import TUI.TUIMenu.PythonWindow import TUI.TUIMenu.UsersWindow import TUI.Inst.APOGEE.APOGEEWindow -import TUI.Inst.APOGEEQL.APOGEEQLWindow +# import TUI.Inst.APOGEEQL.APOGEEQLWindow import TUI.Inst.BOSS.BOSSWindow import TUI.Inst.Guide.FocusPlotWindow -import TUI.Inst.Guide.GuideWindow +# import TUI.Inst.Guide.GuideWindow import TUI.Inst.GuideMonitor.BOSSMonitorWindow -import TUI.Inst.GuideMonitor.FluxMonitorWindow -import TUI.Inst.GuideMonitor.FocusMonitorWindow -import TUI.Inst.GuideMonitor.GuideMonitorWindow -import TUI.Inst.GuideMonitor.ScaleMonitorWindow -import TUI.Inst.GuideMonitor.SeeingMonitorWindow +# import TUI.Inst.GuideMonitor.FluxMonitorWindow +# import TUI.Inst.GuideMonitor.FocusMonitorWindow +# import TUI.Inst.GuideMonitor.GuideMonitorWindow +# import TUI.Inst.GuideMonitor.ScaleMonitorWindow +# import TUI.Inst.GuideMonitor.SeeingMonitorWindow import TUI.Misc.Alerts.AlertsWindow import TUI.Misc.Interlocks.InterlocksWindow import TUI.Misc.MCP.MCPWindow @@ -43,16 +43,16 @@ def loadAll(): TUI.TUIMenu.PythonWindow.addWindow(tlSet) TUI.TUIMenu.UsersWindow.addWindow(tlSet) TUI.Inst.APOGEE.APOGEEWindow.addWindow(tlSet) - TUI.Inst.APOGEEQL.APOGEEQLWindow.addWindow(tlSet) + # TUI.Inst.APOGEEQL.APOGEEQLWindow.addWindow(tlSet) TUI.Inst.BOSS.BOSSWindow.addWindow(tlSet) TUI.Inst.Guide.FocusPlotWindow.addWindow(tlSet) - TUI.Inst.Guide.GuideWindow.addWindow(tlSet) + # TUI.Inst.Guide.GuideWindow.addWindow(tlSet) TUI.Inst.GuideMonitor.BOSSMonitorWindow.addWindow(tlSet) - TUI.Inst.GuideMonitor.FluxMonitorWindow.addWindow(tlSet) - TUI.Inst.GuideMonitor.FocusMonitorWindow.addWindow(tlSet) - TUI.Inst.GuideMonitor.GuideMonitorWindow.addWindow(tlSet) - TUI.Inst.GuideMonitor.ScaleMonitorWindow.addWindow(tlSet) - TUI.Inst.GuideMonitor.SeeingMonitorWindow.addWindow(tlSet) + # TUI.Inst.GuideMonitor.FluxMonitorWindow.addWindow(tlSet) + # TUI.Inst.GuideMonitor.FocusMonitorWindow.addWindow(tlSet) + # TUI.Inst.GuideMonitor.GuideMonitorWindow.addWindow(tlSet) + # TUI.Inst.GuideMonitor.ScaleMonitorWindow.addWindow(tlSet) + # TUI.Inst.GuideMonitor.SeeingMonitorWindow.addWindow(tlSet) TUI.Misc.Alerts.AlertsWindow.addWindow(tlSet) TUI.Misc.Interlocks.InterlocksWindow.addWindow(tlSet) TUI.Misc.MCP.MCPWindow.addWindow(tlSet) diff --git a/TUI/Main.py b/TUI/Main.py index 32d5245..733c66f 100755 --- a/TUI/Main.py +++ b/TUI/Main.py @@ -72,7 +72,7 @@ import numpy numpy.seterr(all="ignore") # suppress "Warning: invalid value encountered in divide" import matplotlib -matplotlib.use("TkAgg") +matplotlib.use("Agg") # controls the background of the axis label regions (which default to gray) matplotlib.rc("figure", facecolor="white") matplotlib.rc("axes", titlesize="medium") # default is large, which is too big @@ -105,21 +105,21 @@ def runTUI(): tkRoot.tk.call("console", "hide") except Tkinter.TclError: pass - + # create and obtain the TUI model tuiModel = TUI.Models.getModel("tui") - + # set up background tasks backgroundHandler = TUI.BackgroundTasks.BackgroundKwds() # get locations to look for windows addPathList = TUI.TUIPaths.getAddPaths() - + # add additional paths to sys.path sys.path += addPathList - + TUI.LoadStdModules.loadAll() - + # load additional windows modules for winPath in addPathList: TUI.WindowModuleUtil.loadWindows( @@ -130,10 +130,10 @@ def runTUI(): # load scripts TUI.Base.ScriptLoader.reopenScriptWindows() - + # add the main menu TUI.MenuBar.MenuBar() - + tuiModel.logMsg( "%s %s: ready to connect" % (TUI.Version.ApplicationName, TUI.Version.VersionName) ) @@ -141,7 +141,7 @@ def runTUI(): platformStr = getPlatform() sys.stdout.write("%s %s running on %s started %s\n" % \ (TUI.Version.ApplicationName, TUI.Version.VersionName, platformStr, startTimeStr)) - + tuiModel.reactor.run() if __name__ == "__main__": diff --git a/TUI/Version.py b/TUI/Version.py index 5feccd0..91e7f6a 100644 --- a/TUI/Version.py +++ b/TUI/Version.py @@ -1,3 +1,3 @@ -VersionStr = "1.7.16 2022-01-06" +VersionStr = "1.7.17b0 2022-02-14" VersionName, VersionDate = VersionStr.split() ApplicationName = "STUI"