Skip to content
Snippets Groups Projects
Commit 7b088056 authored by Marco Matthies's avatar Marco Matthies
Browse files

Move population graph to main window next to map

parent f72f4f2a
No related branches found
No related tags found
No related merge requests found
...@@ -49,10 +49,6 @@ ApplicationWindow { ...@@ -49,10 +49,6 @@ ApplicationWindow {
} }
Menu { Menu {
title: "&Data" title: "&Data"
Action {
text: "Show &Population Graph"
onTriggered: { populationGraph.visible = true }
}
Action { Action {
text: "Save &Simulation Output" text: "Save &Simulation Output"
onTriggered: { Julia.saveoutput() } onTriggered: { Julia.saveoutput() }
...@@ -78,10 +74,19 @@ ApplicationWindow { ...@@ -78,10 +74,19 @@ ApplicationWindow {
// visualise the model map and the locations of animals // visualise the model map and the locations of animals
MakieViewport { MakieViewport {
id: mapviewport id: mapviewport
anchors.fill: parent width: parent.width / 2
height: parent.height
renderFunction: render_map_callback renderFunction: render_map_callback
} }
MakieViewport {
id: plotviewport
x: parent.width / 2
width: parent.width / 2
height: parent.height
renderFunction: render_plot_callback
}
// the main control bar, with pause/step/run buttons, the progress // the main control bar, with pause/step/run buttons, the progress
// bar and a speed slider // bar and a speed slider
footer: ToolBar { footer: ToolBar {
...@@ -166,20 +171,6 @@ Distributed under the MIT license." ...@@ -166,20 +171,6 @@ Distributed under the MIT license."
onAccepted: { Julia.savesimulation(selectedFile.toString()) } onAccepted: { Julia.savesimulation(selectedFile.toString()) }
} }
Window {
id: populationGraph
title: "Population Graph"
width: 512
height: 512
visible: false
MakieViewport {
id: plotviewport
anchors.fill: parent
renderFunction: render_plot_callback
}
}
Popup { Popup {
id: splashPopup id: splashPopup
parent: Overlay.overlay parent: Overlay.overlay
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment