From 3ce0bbb92731f67aa09b20cd21208505daea5e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 15 Apr 2018 13:01:40 +0200 Subject: Rename CoreView to GraphicsView This generalizes CoreView to be used with other parts of the project too. --- qtmips_gui/coreview.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'qtmips_gui/coreview.h') diff --git a/qtmips_gui/coreview.h b/qtmips_gui/coreview.h index 9fdf0a3..8935d41 100644 --- a/qtmips_gui/coreview.h +++ b/qtmips_gui/coreview.h @@ -4,6 +4,7 @@ #include #include #include "qtmipsmachine.h" +#include "graphicsview.h" #include "coreview/connection.h" #include "coreview/programcounter.h" #include "coreview/multiplexer.h" @@ -18,22 +19,10 @@ #include "coreview/logicblock.h" #include "coreview/and.h" -class CoreView : public QGraphicsView { -public: - CoreView(QWidget *parent); - - void setScene(QGraphicsScene *scene); - -protected: - void resizeEvent(QResizeEvent *event); -private: - void update_scale(); -}; - class CoreViewScene : public QGraphicsScene { Q_OBJECT public: - CoreViewScene(CoreView *view, machine::QtMipsMachine *machine); + CoreViewScene(GraphicsView *view, machine::QtMipsMachine *machine); ~CoreViewScene(); signals: @@ -86,7 +75,7 @@ protected: class CoreViewSceneSimple : public CoreViewScene { public: - CoreViewSceneSimple(CoreView *view, machine::QtMipsMachine *machine); + CoreViewSceneSimple(GraphicsView *view, machine::QtMipsMachine *machine); private: coreview::InstructionView *instr_prim, *instr_delay; @@ -95,7 +84,7 @@ private: class CoreViewScenePipelined : public CoreViewScene { public: - CoreViewScenePipelined(CoreView *view, machine::QtMipsMachine *machine); + CoreViewScenePipelined(GraphicsView *view, machine::QtMipsMachine *machine); private: coreview::Latch *latch_if_id, *latch_id_ex, *latch_ex_mem, *latch_mem_wb; @@ -105,7 +94,6 @@ private: #else -class CoreView; class CoreViewScene; class CoreViewSceneSimple; class CoreViewScenePipelined; -- cgit v1.2.3