Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B-ASIC - Better ASIC Toolbox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Computer Engineering
B-ASIC - Better ASIC Toolbox
Commits
3d273210
Commit
3d273210
authored
2 years ago
by
Petter Källström
Browse files
Options
Downloads
Patches
Plain Diff
Main_window now uses PlotWindow instead of Plot
parent
890bfd6a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!203
Simulation window
Pipeline
#89926
passed
2 years ago
Stage: test
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
b_asic/GUI/main_window.py
+6
-2
6 additions, 2 deletions
b_asic/GUI/main_window.py
b_asic/GUI/plot_window.py
+1
-1
1 addition, 1 deletion
b_asic/GUI/plot_window.py
with
7 additions
and
3 deletions
b_asic/GUI/main_window.py
+
6
−
2
View file @
3d273210
...
@@ -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
):
...
...
This diff is collapsed.
Click to expand it.
b_asic/GUI/plot_window.py
+
1
−
1
View file @
3d273210
# 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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment