diff options
| -rw-r--r-- | qtmips_gui/coreview.cpp | 6 | ||||
| -rw-r--r-- | qtmips_gui/coreview.h | 6 | ||||
| -rw-r--r-- | qtmips_gui/mainwindow.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/qtmips_gui/coreview.cpp b/qtmips_gui/coreview.cpp index d32f4aa..918b5bd 100644 --- a/qtmips_gui/coreview.cpp +++ b/qtmips_gui/coreview.cpp @@ -20,7 +20,7 @@ connect(machine->core(), SIGNAL(SIG), VAR, SLOT(instruction_update(const machine::Instruction&))); \ } while(false) -CoreViewScene::CoreViewScene(GraphicsView *view, machine::QtMipsMachine *machine) : QGraphicsScene(view) { +CoreViewScene::CoreViewScene(machine::QtMipsMachine *machine) : QGraphicsScene() { setSceneRect(0, 0, SC_WIDTH, SC_HEIGHT); // Elements // @@ -127,7 +127,7 @@ coreview::Signal *CoreViewScene::new_signal(const coreview::Connector *a, const return c; } -CoreViewSceneSimple::CoreViewSceneSimple(GraphicsView *view, machine::QtMipsMachine *machine) : CoreViewScene(view, machine) { +CoreViewSceneSimple::CoreViewSceneSimple(machine::QtMipsMachine *machine) : CoreViewScene(machine) { NEW_I(instr_prim, 230, 60, instruction_fetched(const machine::Instruction&)); if (machine->config().delay_slot()) { NEW(Latch, delay_slot_latch, 55, 470, machine, 25); @@ -193,7 +193,7 @@ CoreViewSceneSimple::CoreViewSceneSimple(GraphicsView *view, machine::QtMipsMach con->setAxes({CON_AXIS_Y(430), CON_AXIS_X(500), CON_AXIS_Y(210)}); } -CoreViewScenePipelined::CoreViewScenePipelined(GraphicsView *view, machine::QtMipsMachine *machine) : CoreViewScene(view, machine) { +CoreViewScenePipelined::CoreViewScenePipelined(machine::QtMipsMachine *machine) : CoreViewScene(machine) { NEW(Latch, latch_if_id, 158, 70, machine, 400); latch_if_id->setTitle("IF/ID"); NEW(Latch, latch_id_ex, 392, 70, machine, 400); diff --git a/qtmips_gui/coreview.h b/qtmips_gui/coreview.h index 8935d41..b2668c1 100644 --- a/qtmips_gui/coreview.h +++ b/qtmips_gui/coreview.h @@ -22,7 +22,7 @@ class CoreViewScene : public QGraphicsScene { Q_OBJECT public: - CoreViewScene(GraphicsView *view, machine::QtMipsMachine *machine); + CoreViewScene(machine::QtMipsMachine *machine); ~CoreViewScene(); signals: @@ -75,7 +75,7 @@ protected: class CoreViewSceneSimple : public CoreViewScene { public: - CoreViewSceneSimple(GraphicsView *view, machine::QtMipsMachine *machine); + CoreViewSceneSimple(machine::QtMipsMachine *machine); private: coreview::InstructionView *instr_prim, *instr_delay; @@ -84,7 +84,7 @@ private: class CoreViewScenePipelined : public CoreViewScene { public: - CoreViewScenePipelined(GraphicsView *view, machine::QtMipsMachine *machine); + CoreViewScenePipelined(machine::QtMipsMachine *machine); private: coreview::Latch *latch_if_id, *latch_id_ex, *latch_ex_mem, *latch_mem_wb; diff --git a/qtmips_gui/mainwindow.cpp b/qtmips_gui/mainwindow.cpp index 7a4a06c..d3434bc 100644 --- a/qtmips_gui/mainwindow.cpp +++ b/qtmips_gui/mainwindow.cpp @@ -90,9 +90,9 @@ void MainWindow::create_core(const machine::MachineConfig &config) { if (corescene != nullptr) delete corescene; if (config.pipelined()) { - corescene = new CoreViewScenePipelined(coreview, machine); + corescene = new CoreViewScenePipelined(machine); } else { - corescene = new CoreViewSceneSimple(coreview, machine); + corescene = new CoreViewSceneSimple(machine); } coreview->setScene(corescene); |