From ab5ca2db8fc0b9caa7f880b46595bbefae801797 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Sun, 11 Aug 2024 08:33:25 +0200 Subject: [PATCH] replaced "cycles" with "MIPS" in DeveloperDialog --- src/common/DevSettingsHandler.cxx | 2 +- src/common/DevSettingsHandler.hxx | 2 +- src/gui/DeveloperDialog.cxx | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/DevSettingsHandler.cxx b/src/common/DevSettingsHandler.cxx index 020b2fc9d..d6c624858 100644 --- a/src/common/DevSettingsHandler.cxx +++ b/src/common/DevSettingsHandler.cxx @@ -62,7 +62,7 @@ void DevSettingsHandler::loadSettings(SettingsSet set) #endif // Thumb ARM emulation exception myThumbException[set] = devSettings ? settings.getBool("dev.thumb.trapfatal") : false; - myArmCycles[set] = devSettings ? settings.getInt("dev.arm.mips") : 250; // TODO: use constant + myArmSpeed[set] = devSettings ? settings.getInt("dev.arm.mips") : 250; // TODO: use constant // TIA tab myTIAType[set] = devSettings ? settings.getString("dev.tia.type") : "standard"; diff --git a/src/common/DevSettingsHandler.hxx b/src/common/DevSettingsHandler.hxx index f456e7520..b2c304d3d 100644 --- a/src/common/DevSettingsHandler.hxx +++ b/src/common/DevSettingsHandler.hxx @@ -67,7 +67,7 @@ class DevSettingsHandler std::array myWRPortBreak; #endif std::array myThumbException; - std::array myArmCycles; + std::array myArmSpeed; // TIA sets std::array myTIAType; std::array myPlInvPhase; diff --git a/src/gui/DeveloperDialog.cxx b/src/gui/DeveloperDialog.cxx index 4ab534395..4e411ccc1 100644 --- a/src/gui/DeveloperDialog.cxx +++ b/src/gui/DeveloperDialog.cxx @@ -225,7 +225,7 @@ void DeveloperDialog::addEmulationTab(const GUI::Font& font) myArmSpeedWidget = new SliderWidget(myTab, font, HBORDER + INDENT * 1, ypos - 1, fontWidth * 10, lineHeight, "Limit ARM speed ", - 0, kArmSpeedChanged, fontWidth * 10, " cycles"); + 0, kArmSpeedChanged, fontWidth * 9, " MIPS"); myArmSpeedWidget->setMinValue(50); // TODO: use constant myArmSpeedWidget->setMaxValue(250); // TODO: use constant myArmSpeedWidget->setTickmarkIntervals(4); @@ -743,7 +743,7 @@ void DeveloperDialog::getWidgetStates(SettingsSet set) #endif // Thumb ARM emulation exception myThumbException[set] = myThumbExceptionWidget->getState(); - myArmCycles[set] = myArmSpeedWidget->getValue(); + myArmSpeed[set] = myArmSpeedWidget->getValue(); // TIA tab myTIAType[set] = myTIATypeWidget->getSelectedTag().toString(); @@ -803,7 +803,7 @@ void DeveloperDialog::setWidgetStates(SettingsSet set) #endif // Thumb ARM emulation exception myThumbExceptionWidget->setState(myThumbException[set]); - myArmSpeedWidget->setValue(myArmCycles[set]); + myArmSpeedWidget->setValue(myArmSpeed[set]); handleConsole(); // TIA tab @@ -951,7 +951,7 @@ void DeveloperDialog::setDefaults() #endif // Thumb ARM emulation exception myThumbException[set] = devSettings; - myArmCycles[set] = devSettings ? 150 : 250; + myArmSpeed[set] = devSettings ? 150 : 250; setWidgetStates(set); break;