zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-06 11:22:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solving compilation issues

Browse Source
This commit is contained in:
Anonymus Raccoon
2020-03-28 14:58:30 +01:00
parent 618c708df6
commit e5fbde350f
5 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Debugger/cgramDebug.cpp → sources/Debugger/CGramDebug.cpp
+14 -17
View File
@@ -2,7 +2,7 @@
// Created by cbihan on 3/27/20.
//
#include "cgramDebug.hpp"
#include "CGramDebug.hpp"
#include "../SNES.hpp"
#include <QColor>
#include "../Utility/Utility.hpp"
@@ -11,11 +11,11 @@
namespace ComSquare::Debugger
{
cgramDebug::cgramDebug(SNES &snes, ComSquare::PPU::PPU &ppu)
: _window(new ClosableWindow<cgramDebug>(*this, &cgramDebug::disableViewer)),
CGramDebug::CGramDebug(SNES &snes, ComSquare::PPU::PPU &ppu)
: _window(new ClosableWindow<CGramDebug>(*this, &CGramDebug::disableViewer)),
_snes(snes),
_ui(),
_model(),
_model(ppu),
_ppu(ppu)
{
this->_window->setContextMenuPolicy(Qt::NoContextMenu);
@@ -27,38 +27,40 @@ namespace ComSquare::Debugger
this->_window->show();
}
void cgramDebug::disableViewer()
void CGramDebug::disableViewer()
{
this->_snes.disableCgramDebugging();
}
void cgramDebug::focus()
void CGramDebug::focus()
{
this->_window->activateWindow();
}
bool cgramDebug::isDebugger()
bool CGramDebug::isDebugger()
{
return true;
}
uint16_t cgramDebug::read(uint8_t addr)
uint16_t CGramDebug::read(uint8_t addr)
{
return this->_ppu.cgramRead(addr);
}
}
int cgramModel::rowCount(const QModelIndex &) const
CGramModel::CGramModel(ComSquare::PPU::PPU &ppu) : _ppu(ppu) {}
int CGramModel::rowCount(const QModelIndex &) const
{
return this->rows;
}
int cgramModel::columnCount(const QModelIndex &) const
int CGramModel::columnCount(const QModelIndex &) const
{
return this->column;
}
QVariant cgramModel::data(const QModelIndex &index, int role) const
QVariant CGramModel::data(const QModelIndex &index, int role) const
{
if (role == Qt::TextAlignmentRole)
return Qt::AlignCenter;
@@ -67,9 +69,4 @@ QVariant cgramModel::data(const QModelIndex &index, int role) const
this->_ppu.cgramRead(0);
if (role != Qt::DisplayRole)
return QVariant();
}
void cgramModel::ppu(const ComSquare::PPU::PPU &ppu)
{
this->_ppu = ppu;
}
}
sources/Debugger/cgramDebug.hpp → sources/Debugger/CGramDebug.hpp
+12 -14
View File
@@ -59,7 +59,7 @@
//! @brief The qt model that bind the logs to the view.
class cgramModel : public QAbstractTableModel
class CGramModel : public QAbstractTableModel
{
Q_OBJECT
private:
@@ -70,13 +70,11 @@ public:
const int column = 16;
//! @brief The number of rows
const int rows = 16;
cgramModel() = default;
cgramModel(const cgramModel &) = delete;
const cgramModel &operator=(const cgramModel &) = delete;
~cgramModel() override = default;
explicit CGramModel(ComSquare::PPU::PPU &ppu);
CGramModel(const CGramModel &) = delete;
const CGramModel &operator=(const CGramModel &) = delete;
~CGramModel() override = default;
//! @brief set the reference to the ppu
void ppu(const ComSquare::PPU::PPU &ppu);
//! @brief The number of row the table has.
int rowCount(const QModelIndex &parent) const override;
//! @brief The number of column the table has.
@@ -89,26 +87,26 @@ public:
namespace ComSquare::Debugger
{
//! @brief window that allow the user to view all data going through the memory bus.
class cgramDebug {
class CGramDebug {
private:
//! @brief The QT window for this debugger.
ClosableWindow<cgramDebug> *_window;
ClosableWindow<CGramDebug> *_window;
//! @brief A reference to the snes (to disable the debugger).
SNES &_snes;
//! @brief A widget that contain the whole UI.
Ui::CgramView _ui;
//! @brief The Log visualizer model for QT.
cgramModel _model;
CGramModel _model;
//! @brief A reference to the ppu
ComSquare::PPU::PPU &_ppu;
public:
//! @brief Called when the window is closed. Turn off the debugger.
void disableViewer();
public:
explicit cgramDebug(SNES &snes, ComSquare::PPU::PPU &ppu);
cgramDebug(const cgramDebug &) = delete;
cgramDebug &operator=(const cgramDebug &) = delete;
~cgramDebug() = default;
explicit CGramDebug(SNES &snes, ComSquare::PPU::PPU &ppu);
CGramDebug(const CGramDebug &) = delete;
CGramDebug &operator=(const CGramDebug &) = delete;
~CGramDebug() = default;
//! @brief Read data at the CGRAM address send it to the debugger.
//! @param addr The address to read from.