doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved the handling of read-only registers in the register inspection window

Browse Source
This commit is contained in:
Nav
2021-09-23 21:20:19 +01:00
parent 10b879a964
commit 267e59fcce
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/TargetRegisterInspectorWindow.cpp
View File

@@ -47,8 +47,8 @@ TargetRegisterInspectorWindow::TargetRegisterInspectorWindow(
)
);
auto windowStylesheet = QFile(QString::fromStdString(
Paths::compiledResourcesPath()
auto windowStylesheet = QFile(
QString::fromStdString(Paths::compiledResourcesPath()
+ "/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/Stylesheets/TargetRegisterInspectorWindow.qss"
)
);
@@ -63,8 +63,11 @@ TargetRegisterInspectorWindow::TargetRegisterInspectorWindow(
auto windowSize = QSize(
840,
static_cast<int>(440 + ((BitsetWidget::HEIGHT + 20)
* std::ceil(static_cast<float>(this->registerValue.size()) / 2)))
static_cast<int>(
440
+ ((BitsetWidget::HEIGHT + 20) * std::ceil(static_cast<float>(this->registerValue.size()) / 2))
+ (!this->registerDescriptor.writable ? 50 : 0)
)
);
auto containerMargins = QMargins(15, 30, 15, 10);
@@ -122,6 +125,13 @@ TargetRegisterInspectorWindow::TargetRegisterInspectorWindow(
);
this->registerValueTextInput->setFixedWidth(BitsetWidget::WIDTH * 2);
if (!this->registerDescriptor.writable) {
this->registerValueTextInput->setDisabled(true);
this->applyButton->setVisible(false);
auto readOnlyIndicatorLabel = this->registerValueContainer->findChild<QLabel*>("read-only-indicator-label");
readOnlyIndicatorLabel->show();
}
auto registerBitsetWidgetLayout = this->registerValueBitsetWidgetContainer->findChild<QVBoxLayout*>(
"register-value-bitset-widget-layout"
@@ -250,10 +260,13 @@ void TargetRegisterInspectorWindow::onTargetStateChanged(TargetState newState) {
this->refreshValueButton->setDisabled(true);
} else if (this->targetState != TargetState::STOPPED && this->registerValueContainer->isEnabled()) {
this->registerValueTextInput->setDisabled(false);
this->registerValueBitsetWidgetContainer->setDisabled(false);
this->applyButton->setDisabled(false);
this->refreshValueButton->setDisabled(false);
if (this->registerDescriptor.writable) {
this->registerValueTextInput->setDisabled(false);
this->applyButton->setDisabled(false);
}
}
this->targetState = newState;

18
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/UiFiles/TargetRegisterInspectorWindow.ui
View File

@@ -136,7 +136,23 @@
<property name="spacing">
<number>20</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="QLabel" name="read-only-indicator-label">
<property name="visible">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="alignment">
<enum>Qt::AlignLeft</enum>
</property>
<property name="text">
<string>This register is configured as read-only - it cannot be manipulated via
Insight.</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignLeft">
<widget class="QLineEdit" name="register-value-text-input"/>
</item>