Skip to content
Snippets Groups Projects
Commit 3d273210 authored by Petter Källström's avatar Petter Källström
Browse files

Main_window now uses PlotWindow instead of Plot

parent 890bfd6a
No related branches found
No related tags found
1 merge request!203Simulation window
Pipeline #89926 passed
...@@ -33,10 +33,13 @@ from b_asic.GUI._preferences import GAP, GRID, MINBUTTONSIZE, PORTHEIGHT ...@@ -33,10 +33,13 @@ from b_asic.GUI._preferences import GAP, GRID, MINBUTTONSIZE, PORTHEIGHT
from b_asic.GUI.arrow import Arrow from b_asic.GUI.arrow import Arrow
from b_asic.GUI.drag_button import DragButton from b_asic.GUI.drag_button import DragButton
from b_asic.GUI.gui_interface import Ui_main_window from b_asic.GUI.gui_interface import Ui_main_window
from b_asic.GUI.plot_window import PlotWindow
from b_asic.GUI.port_button import PortButton from b_asic.GUI.port_button import PortButton
from b_asic.GUI.select_sfg_window import SelectSFGWindow from b_asic.GUI.select_sfg_window import SelectSFGWindow
from b_asic.GUI.show_pc_window import ShowPCWindow from b_asic.GUI.show_pc_window import ShowPCWindow
from b_asic.GUI.simulate_sfg_window import Plot, SimulateSFGWindow
# from b_asic.GUI.simulate_sfg_window import Plot, SimulateSFGWindow
from b_asic.GUI.simulate_sfg_window import SimulateSFGWindow
from b_asic.GUI.util_dialogs import FaqWindow, KeybindsWindow from b_asic.GUI.util_dialogs import FaqWindow, KeybindsWindow
from b_asic.GUI.utils import decorate_class, handle_error from b_asic.GUI.utils import decorate_class, handle_error
from b_asic.gui_utils.about_window import AboutWindow from b_asic.gui_utils.about_window import AboutWindow
...@@ -716,7 +719,8 @@ class MainWindow(QMainWindow): ...@@ -716,7 +719,8 @@ class MainWindow(QMainWindow):
self.logger.info( self.logger.info(
"To save the plot press 'Ctrl+S' when the plot is focused." "To save the plot press 'Ctrl+S' when the plot is focused."
) )
self.plot = Plot(simulation, sfg, self) # self.plot = Plot(simulation, sfg, self)
self.plot = PlotWindow(simulation.results)
self.plot.show() self.plot.show()
def simulate_sfg(self, event=None): def simulate_sfg(self, event=None):
......
# TODO's: # TODO's:
# * Solve the legend update. That isn't working at all. # * Solve the legend update. That isn't working at all.
# * Make it work with the main_window # * Zoom etc. Might need to change FigureCanvas. Or just something very little.
import re import re
import sys import sys
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment