adding ui details (and great visuals fixes)

This commit is contained in:
Clément Le Bihan
2021-05-27 23:00:36 +02:00
parent e666aca28e
commit a81cf8ece0
3 changed files with 110 additions and 11 deletions
+38 -1
View File
@@ -38,8 +38,13 @@ namespace ComSquare::Debugger
QMainWindow::connect(this->_ui.NbColumns, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int nb) -> void { this->setNbColumns(nb); });
QMainWindow::connect(this->_ui.ByteSize, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int nb) -> void { this->setRenderSize(nb); });
QMainWindow::connect(this->_ui.Address, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int nb) -> void { this->setRamOffset(nb); });
QMainWindow::connect(this->_ui.PaletteIndex, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int nb) -> void { this->setPaletteIndex(nb); });
QMainWindow::connect(this->_ui.BppFormat, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) -> void { this->_bppChangeUIHandler(index); });
// used to setup ui restrictions
this->setBpp(this->getBpp());
this->_window->show();
QEvent::registerEventType();
this->internalUpdate();
}
void TileViewer::disableViewer()
@@ -65,11 +70,30 @@ namespace ComSquare::Debugger
void TileViewer::setPaletteIndex(int paletteIndex)
{
this->_tileRenderer.setPaletteIndex(paletteIndex);
this->internalUpdate();
}
void TileViewer::setBpp(int bpp)
{
this->_ui.PaletteIndex->setDisabled(bpp > 4);
switch (bpp) {
case 8:
this->_ui.PaletteIndex->setValue(0);
break;
case 4:
this->_ui.PaletteIndex->setMaximum(15);
if (this->_ui.PaletteIndex->value() > 15) {
this->_ui.PaletteIndex->setValue(15);
}
break;
case 2:
default:
bpp = 2;
this->_ui.PaletteIndex->setMaximum(63);
break;
}
this->_tileRenderer.setBpp(bpp);
this->internalUpdate();
}
void TileViewer::setNbColumns(int nbColumns)
@@ -108,5 +132,18 @@ namespace ComSquare::Debugger
void TileViewer::setRamOffset(int offset)
{
this->_tileRenderer.setRamOffset(offset);
this->internalUpdate();
}
void TileViewer::_bppChangeUIHandler(int index)
{
switch (index) {
case 0: return this->setBpp(2);
case 1: return this->setBpp(4);
case 2: return this->setBpp(8);
default:
break;
}
// TODO error handling
}
}
@@ -38,6 +38,8 @@ namespace ComSquare::Debugger
//std::unique_ptr<Renderer::QtSFML> _sfWidget;
//! @brief The tile renderer
TileRenderer _tileRenderer;
//! @brief Change the bpp from the index given by the ui (QT combo box)
void _bppChangeUIHandler(int index);
public:
//! @brief Called when the window is closed. Turn off the debugger.
void disableViewer();
+70 -10
View File
@@ -38,7 +38,26 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="Address"/>
<widget class="QSpinBox" name="Address">
<property name="prefix">
<string notr="true">0x</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>999999</number>
</property>
<property name="singleStep">
<number>4096</number>
</property>
<property name="stepType">
<enum>QAbstractSpinBox::DefaultStepType</enum>
</property>
<property name="displayIntegerBase">
<number>16</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
@@ -52,26 +71,50 @@
<property name="enabled">
<bool>true</bool>
</property>
<property name="suffix">
<string/>
</property>
<property name="prefix">
<string notr="true">0x</string>
</property>
<property name="minimum">
<number>100</number>
<number>0</number>
</property>
<property name="maximum">
<number>10000</number>
<number>999999999</number>
</property>
<property name="singleStep">
<number>4096</number>
</property>
<property name="stepType">
<enum>QAbstractSpinBox::DefaultStepType</enum>
</property>
<property name="value">
<number>5000</number>
<number>20480</number>
</property>
<property name="displayIntegerBase">
<number>16</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_2">
<property name="cursor">
<cursorShape>ArrowCursor</cursorShape>
</property>
<property name="text">
<string>Columns</string>
</property>
<property name="buddy">
<cstring></cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="NbColumns">
<property name="readOnly">
<bool>false</bool>
</property>
<property name="specialValueText">
<string/>
</property>
@@ -81,16 +124,19 @@
<property name="value">
<number>16</number>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Format</string>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QSpinBox" name="PaletteIndex">
<property name="maximum">
<number>255</number>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="BppFormat">
<property name="currentText">
<string>2 bpp</string>
@@ -121,6 +167,20 @@
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Palette Index</string>
</property>
</widget>
</item>
</layout>
</item>
<item>