ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

further Developer settings dialog improvements

This commit is contained in:
thrust26 2017-11-25 11:12:17 +01:00
parent e6b36356a3
commit 7c46f031f3
3 changed files with 179 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emucore/Settings.cxx
View File

@ -157,7 +157,7 @@ Settings::Settings(OSystem& osystem)
setInternal("plr.console", "2600"); // 7800 setInternal("plr.console", "2600"); // 7800
setInternal("plr.rewind", false); setInternal("plr.rewind", false);
setInternal("plr.rewind.size", 100); setInternal("plr.rewind.size", 100);
setInternal("plr.rewind.interval", 4); // = 1 frame setInternal("plr.rewind.interval", 4); // = 1 second
setInternal("plr.rewind.horizon", 5); // = ~10 minutes setInternal("plr.rewind.horizon", 5); // = ~10 minutes
// developer settings // developer settings
@ -172,7 +172,7 @@ Settings::Settings(OSystem& osystem)
setInternal("dev.debugcolors", "false"); setInternal("dev.debugcolors", "false");
setInternal("dev.tiadriven", "true"); setInternal("dev.tiadriven", "true");
setInternal("dev.console", "2600"); // 7800 setInternal("dev.console", "2600"); // 7800
setInternal("dev.rewind", false); setInternal("dev.rewind", true);
setInternal("dev.rewind.size", 100); setInternal("dev.rewind.size", 100);
setInternal("dev.rewind.interval", 2); // = 1 frame setInternal("dev.rewind.interval", 2); // = 1 frame
setInternal("dev.rewind.horizon", 3); // = ~10 seconds setInternal("dev.rewind.horizon", 3); // = ~10 seconds
@ -316,7 +316,7 @@ void Settings::validate()
if(i < 0 || i > 5) setInternal("tv.filter", "0"); if(i < 0 || i > 5) setInternal("tv.filter", "0");
i = getInt("dev.tv.jitter_recovery"); i = getInt("dev.tv.jitter_recovery");
if(i < 1 || i > 20) setInternal("dev.tv.jitter_recovery", "10"); if(i < 1 || i > 20) setInternal("dev.tv.jitter_recovery", "2");
i = getInt("dev.rewind.size"); i = getInt("dev.rewind.size");
if (i < 100 ||i > 1000) setInternal("dev.rewind.size", 100); if (i < 100 ||i > 1000) setInternal("dev.rewind.size", 100);
@ -334,10 +334,10 @@ void Settings::validate()
if(i < 100 || i > 1000) setInternal("plr.rewind.size", 100); if(i < 100 || i > 1000) setInternal("plr.rewind.size", 100);
i = getInt("plr.rewind.interval"); i = getInt("plr.rewind.interval");
if(i < 0 || i > 5) setInternal("plr.rewind.interval", 2); if(i < 0 || i > 5) setInternal("plr.rewind.interval", 4);
i = getInt("plr.rewind.horizon"); i = getInt("plr.rewind.horizon");
if(i < 0 || i > 6) setInternal("plr.rewind.horizon", 3); if(i < 0 || i > 6) setInternal("plr.rewind.horizon", 5);
#ifdef SOUND_SUPPORT #ifdef SOUND_SUPPORT
i = getInt("volume"); i = getInt("volume");

250
src/gui/DeveloperDialog.cxx
View File

@ -51,7 +51,7 @@ DeveloperDialog::DeveloperDialog(OSystem& osystem, DialogContainer& parent,
int xpos, ypos, tabID; int xpos, ypos, tabID;
// Set real dimensions // Set real dimensions
_w = std::min(51 * fontWidth + 10, max_w); _w = std::min(52 * fontWidth + 10, max_w);
_h = std::min(15 * (lineHeight + 4) + 14, max_h); _h = std::min(15 * (lineHeight + 4) + 14, max_h);
// The tab widget // The tab widget
@ -72,7 +72,7 @@ DeveloperDialog::DeveloperDialog(OSystem& osystem, DialogContainer& parent,
void DeveloperDialog::addEmulationTab(const GUI::Font& font) void DeveloperDialog::addEmulationTab(const GUI::Font& font)
{ {
const int HBORDER = 10; const int HBORDER = 10;
const int INDENT = 16; const int INDENT = 16+4;
const int VBORDER = 8; const int VBORDER = 8;
const int VGAP = 4; const int VGAP = 4;
int ypos = VBORDER; int ypos = VBORDER;
@ -83,13 +83,15 @@ void DeveloperDialog::addEmulationTab(const GUI::Font& font)
int tabID = myTab->addTab(" Emulation "); int tabID = myTab->addTab(" Emulation ");
// settings set // settings set
mySettingsGroup = new RadioButtonGroup(); mySettingsGroup0 = new RadioButtonGroup();
new RadioButtonWidget(myTab, font, HBORDER, ypos + 1, "Player settings", mySettingsGroup, kPlrSettings); RadioButtonWidget* r = new RadioButtonWidget(myTab, font, HBORDER, ypos + 1, "Player settings", mySettingsGroup0, kPlrSettings);
wid.push_back(r);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
new RadioButtonWidget(myTab, font, HBORDER, ypos, "Developer settings", mySettingsGroup, kDevSettings); r = new RadioButtonWidget(myTab, font, HBORDER, ypos + 1, "Developer settings", mySettingsGroup0, kDevSettings);
wid.push_back(r);
ypos += lineHeight + VGAP * 2; ypos += lineHeight + VGAP * 2;
myFrameStatsWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT * 1, ypos, "Frame statistics"); myFrameStatsWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT * 1, ypos + 1, "Frame statistics");
wid.push_back(myFrameStatsWidget); wid.push_back(myFrameStatsWidget);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
@ -105,7 +107,7 @@ void DeveloperDialog::addEmulationTab(const GUI::Font& font)
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Randomize items // Randomize items
myLoadingROMLabel = new StaticTextWidget(myTab, font, HBORDER + INDENT*1, ypos, "When loading a ROM:", kTextAlignLeft); myLoadingROMLabel = new StaticTextWidget(myTab, font, HBORDER + INDENT*1, ypos + 1, "When loading a ROM:", kTextAlignLeft);
wid.push_back(myLoadingROMLabel); wid.push_back(myLoadingROMLabel);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
@ -128,7 +130,7 @@ void DeveloperDialog::addEmulationTab(const GUI::Font& font)
const char* const cpuregs[] = { "SP", "A", "X", "Y", "PS" }; const char* const cpuregs[] = { "SP", "A", "X", "Y", "PS" };
for(int i = 0; i < 5; ++i) for(int i = 0; i < 5; ++i)
{ {
myRandomizeCPUWidget[i] = new CheckboxWidget(myTab, font, xpos, ypos + 2, myRandomizeCPUWidget[i] = new CheckboxWidget(myTab, font, xpos, ypos + 1,
cpuregs[i], kRandCPUID); cpuregs[i], kRandCPUID);
wid.push_back(myRandomizeCPUWidget[i]); wid.push_back(myRandomizeCPUWidget[i]);
xpos += CheckboxWidget::boxSize() + font.getStringWidth("XX") + 20; xpos += CheckboxWidget::boxSize() + font.getStringWidth("XX") + 20;
@ -173,7 +175,7 @@ void DeveloperDialog::addEmulationTab(const GUI::Font& font)
void DeveloperDialog::addStatesTab(const GUI::Font& font) void DeveloperDialog::addStatesTab(const GUI::Font& font)
{ {
const int HBORDER = 10; const int HBORDER = 10;
const int INDENT = 16; const int INDENT = 16+4;
const int VBORDER = 8; const int VBORDER = 8;
const int VGAP = 4; const int VGAP = 4;
int ypos = VBORDER; int ypos = VBORDER;
@ -182,35 +184,44 @@ void DeveloperDialog::addStatesTab(const GUI::Font& font)
WidgetArray wid; WidgetArray wid;
int tabID = myTab->addTab("States"); int tabID = myTab->addTab("States");
myContinuousRewind = new CheckboxWidget(myTab, font, HBORDER, ypos + 1, "Continuous rewind", kRewind); // settings set
wid.push_back(myContinuousRewind); mySettingsGroup1 = new RadioButtonGroup();
RadioButtonWidget* r = new RadioButtonWidget(myTab, font, HBORDER, ypos + 1, "Player settings", mySettingsGroup1, kPlrSettings);
wid.push_back(r);
ypos += lineHeight + VGAP;
r = new RadioButtonWidget(myTab, font, HBORDER, ypos + 1, "Developer settings", mySettingsGroup1, kDevSettings);
wid.push_back(r);
ypos += lineHeight + VGAP * 2;
myContinuousRewindWidget = new CheckboxWidget(myTab, font, HBORDER + INDENT, ypos + 1, "Continuous rewind", kRewind);
wid.push_back(myContinuousRewindWidget);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
int sWidth = font.getMaxCharWidth() * 8; int sWidth = font.getMaxCharWidth() * 8;
myStateSize = new SliderWidget(myTab, font, HBORDER + INDENT, ypos - 1, sWidth, lineHeight, myStateSizeWidget = new SliderWidget(myTab, font, HBORDER + INDENT * 2, ypos - 1, sWidth, lineHeight,
"Buffer size (*) ", 0, kSizeChanged); "Buffer size (*) ", 0, kSizeChanged);
myStateSize->setMinValue(100); myStateSizeWidget->setMinValue(100);
myStateSize->setMaxValue(1000); myStateSizeWidget->setMaxValue(1000);
myStateSize->setStepValue(100); myStateSizeWidget->setStepValue(100);
wid.push_back(myStateSize); wid.push_back(myStateSizeWidget);
myStateSizeLabel = new StaticTextWidget(myTab, font, myStateSize->getRight() + 4, myStateSize->getTop() + 2, "100 "); myStateSizeLabelWidget = new StaticTextWidget(myTab, font, myStateSizeWidget->getRight() + 4, myStateSizeWidget->getTop() + 2, "100 ");
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
myStateInterval = new SliderWidget(myTab, font, HBORDER + INDENT, ypos - 1, sWidth, lineHeight, myStateIntervalWidget = new SliderWidget(myTab, font, HBORDER + INDENT * 2, ypos - 1, sWidth, lineHeight,
"Interval ", 0, kIntervalChanged); "Interval ", 0, kIntervalChanged);
myStateInterval->setMinValue(0); myStateIntervalWidget->setMinValue(0);
myStateInterval->setMaxValue(NUM_INTERVALS - 1); myStateIntervalWidget->setMaxValue(NUM_INTERVALS - 1);
wid.push_back(myStateInterval); wid.push_back(myStateIntervalWidget);
myStateIntervalLabel = new StaticTextWidget(myTab, font, myStateInterval->getRight() + 4, myStateInterval->getTop() + 2, "50 scanlines"); myStateIntervalLabelWidget = new StaticTextWidget(myTab, font, myStateIntervalWidget->getRight() + 4, myStateIntervalWidget->getTop() + 2, "50 scanlines");
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
myStateHorizon = new SliderWidget(myTab, font, HBORDER + INDENT, ypos - 1, sWidth, lineHeight, myStateHorizonWidget = new SliderWidget(myTab, font, HBORDER + INDENT * 2, ypos - 1, sWidth, lineHeight,
"Horizon ", 0, kHorizonChanged); "Horizon ", 0, kHorizonChanged);
myStateHorizon->setMinValue(0); myStateHorizonWidget->setMinValue(0);
myStateHorizon->setMaxValue(NUM_HORIZONS - 1); myStateHorizonWidget->setMaxValue(NUM_HORIZONS - 1);
wid.push_back(myStateHorizon); wid.push_back(myStateHorizonWidget);
myStateHorizonLabel = new StaticTextWidget(myTab, font, myStateHorizon->getRight() + 4, myStateHorizon->getTop() + 2, "~60 minutes"); myStateHorizonLabelWidget = new StaticTextWidget(myTab, font, myStateHorizonWidget->getRight() + 4, myStateHorizonWidget->getTop() + 2, "~60 minutes");
// Add message concerning usage // Add message concerning usage
const GUI::Font& infofont = instance().frameBuffer().infoFont(); const GUI::Font& infofont = instance().frameBuffer().infoFont();
@ -342,7 +353,7 @@ void DeveloperDialog::addDefaultOKCancelButtons(const GUI::Font& font)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::copySettingsToSet(SettingsSet set) void DeveloperDialog::loadSettings(SettingsSet set)
{ {
string prefix = set == SettingsSet::player ? "plr." : "dev."; string prefix = set == SettingsSet::player ? "plr." : "dev.";
@ -361,10 +372,16 @@ void DeveloperDialog::copySettingsToSet(SettingsSet set)
myTVJitterRec[set] = instance().settings().getInt(prefix + "tv.jitter_recovery"); myTVJitterRec[set] = instance().settings().getInt(prefix + "tv.jitter_recovery");
// Undriven TIA pins // Undriven TIA pins
myUndrivenPins[set] = instance().settings().getBool(prefix + "tiadriven"); myUndrivenPins[set] = instance().settings().getBool(prefix + "tiadriven");
// States
myContinuousRewind[set] = instance().settings().getBool(prefix + "rewind");
myStateSize[set] = instance().settings().getInt(prefix + "rewind.size");
myStateInterval[set] = instance().settings().getInt(prefix + "rewind.interval");
myStateHorizon[set] = instance().settings().getInt(prefix + "rewind.horizon");
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::copySetToSettings(SettingsSet set) void DeveloperDialog::saveSettings(SettingsSet set)
{ {
string prefix = set == SettingsSet::player ? "plr." : "dev."; string prefix = set == SettingsSet::player ? "plr." : "dev.";
@ -381,12 +398,18 @@ void DeveloperDialog::copySetToSettings(SettingsSet set)
// Jitter // Jitter
instance().settings().setValue(prefix + "tv.jitter", myTVJitter[set]); instance().settings().setValue(prefix + "tv.jitter", myTVJitter[set]);
instance().settings().setValue(prefix + "tv.jitter_recovery", myTVJitterRec[set]); instance().settings().setValue(prefix + "tv.jitter_recovery", myTVJitterRec[set]);
// Undriven TIA pins
instance().settings().setValue(prefix + "tiadriven", myUndrivenPins[set]); instance().settings().setValue(prefix + "tiadriven", myUndrivenPins[set]);
// States
instance().settings().setValue(prefix + "rewind", myContinuousRewind[set]);
instance().settings().setValue(prefix + "rewind.size", myStateSize[set]);
instance().settings().setValue(prefix + "rewind.interval", myStateInterval[set]);
instance().settings().setValue(prefix + "rewind.horizon", myStateHorizon[set]);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::copyStateToSet(SettingsSet set) void DeveloperDialog::getWidgetStates(SettingsSet set)
{ {
myFrameStats[set] = myFrameStatsWidget->getState(); myFrameStats[set] = myFrameStatsWidget->getState();
myConsole[set] = myConsoleWidget->getSelected() == 1; myConsole[set] = myConsoleWidget->getSelected() == 1;
@ -408,10 +431,16 @@ void DeveloperDialog::copyStateToSet(SettingsSet set)
myTVJitterRec[set] = myTVJitterRecWidget->getValue(); myTVJitterRec[set] = myTVJitterRecWidget->getValue();
// Undriven TIA pins // Undriven TIA pins
myUndrivenPins[set] = myUndrivenPinsWidget->getState(); myUndrivenPins[set] = myUndrivenPinsWidget->getState();
// States
myContinuousRewind[set] = myContinuousRewindWidget->getState();
myStateSize[set] = myStateSizeWidget->getValue();
myStateInterval[set] = myStateIntervalWidget->getValue();
myStateHorizon[set] = myStateHorizonWidget->getValue();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::copySetToState(SettingsSet set) void DeveloperDialog::setWidgetStates(SettingsSet set)
{ {
myFrameStatsWidget->setState(myFrameStats[set]); myFrameStatsWidget->setState(myFrameStats[set]);
myConsoleWidget->setSelectedIndex(myConsole[set]); myConsoleWidget->setSelectedIndex(myConsole[set]);
@ -436,29 +465,32 @@ void DeveloperDialog::copySetToState(SettingsSet set)
handleConsole(); handleConsole();
handleTVJitterChange(myTVJitterWidget->getState()); handleTVJitterChange(myTVJitterWidget->getState());
handleDebugColors(); handleDebugColors();
// States
myContinuousRewindWidget->setState(myContinuousRewind[set]);
myStateSizeWidget->setValue(myStateSize[set]);
myStateIntervalWidget->setValue(myStateInterval[set]);
myStateHorizonWidget->setValue(myStateHorizon[set]);
handleRewind();
handleSize();
handleInterval();
handleHorizon();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::loadConfig() void DeveloperDialog::loadConfig()
{ {
bool devSettings = instance().settings().getBool("dev.settings"); bool devSettings = instance().settings().getBool("dev.settings");
mySettingsGroup->setSelected(devSettings ? 1 : 0); mySettings = devSettings;
mySettingsGroup0->setSelected(devSettings ? 1 : 0);
mySettingsGroup1->setSelected(devSettings ? 1 : 0);
// load both setting sets... // load both setting sets...
copySettingsToSet(SettingsSet::player); loadSettings(SettingsSet::player);
copySettingsToSet(SettingsSet::developer); loadSettings(SettingsSet::developer);
// ...and select the current one // ...and select the current one
copySetToState((SettingsSet)mySettingsGroup->getSelected()); setWidgetStates((SettingsSet)mySettingsGroup0->getSelected());
myContinuousRewind->setState(instance().settings().getBool(devSettings ? "dev.rewind" : "plr.rewind"));
myStateSize->setValue(instance().settings().getInt(devSettings ? "dev.rewind.size": "plr.rewind.size"));
myStateInterval->setValue(instance().settings().getInt(devSettings ? "dev.rewind.interval" : "plr.rewind.interval"));
myStateHorizon->setValue(instance().settings().getInt(devSettings ? "dev.rewind.horizon" : "plr.rewind.horizon"));
handleRewind();
handleSize();
handleInterval();
handleHorizon();
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
uInt32 w, h; uInt32 w, h;
@ -490,12 +522,14 @@ void DeveloperDialog::loadConfig()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::saveConfig() void DeveloperDialog::saveConfig()
{ {
instance().settings().setValue("dev.settings", mySettingsGroup->getSelected() == SettingsSet::developer); instance().settings().setValue("dev.settings", mySettingsGroup0->getSelected() == SettingsSet::developer);
copyStateToSet((SettingsSet)mySettingsGroup->getSelected()); // copy current widget status into set...
copySetToSettings(SettingsSet::player); getWidgetStates((SettingsSet)mySettingsGroup0->getSelected());
copySetToSettings(SettingsSet::developer); // ...and save both sets
saveSettings(SettingsSet::player);
saveSettings(SettingsSet::developer);
//activate the current ones // activate the current settings
instance().frameBuffer().showFrameStats(myFrameStatsWidget->getState()); instance().frameBuffer().showFrameStats(myFrameStatsWidget->getState());
// jitter // jitter
if(instance().hasConsole()) if(instance().hasConsole())
@ -511,20 +545,16 @@ void DeveloperDialog::saveConfig()
// Finally, issue a complete framebuffer re-initialization // Finally, issue a complete framebuffer re-initialization
//instance().createFrameBuffer(); //instance().createFrameBuffer();
instance().settings().setValue("dev.rewind", myContinuousRewind->getState());
instance().settings().setValue("dev.rewind.size", myStateSize->getValue());
instance().settings().setValue("dev.rewind.interval", myStateInterval->getValue());
instance().settings().setValue("dev.rewind.horizon", myStateHorizon->getValue());
// TODO: update RewindManager // TODO: update RewindManager
// define interval growth factor // define interval growth factor
uInt32 size = myStateSize->getValue(); uInt32 size = myStateSizeWidget->getValue();
uInt64 horizon = HORIZON_CYCLES[myStateHorizon->getValue()]; uInt64 horizon = HORIZON_CYCLES[myStateHorizonWidget->getValue()];
double factor, minFactor = 1, maxFactor = 2; double factor, minFactor = 1, maxFactor = 2;
while(true) while(true)
{ {
double interval = INTERVAL_CYCLES[myStateInterval->getValue()]; double interval = INTERVAL_CYCLES[myStateIntervalWidget->getValue()];
double cycleSum = 0.0; double cycleSum = 0.0;
// calculate next factor // calculate next factor
factor = (minFactor + maxFactor) / 2; factor = (minFactor + maxFactor) / 2;
@ -565,13 +595,12 @@ void DeveloperDialog::saveConfig()
void DeveloperDialog::setDefaults() void DeveloperDialog::setDefaults()
{ {
bool devSettings = mySettingsGroup0->getSelected() == 1;
SettingsSet set = (SettingsSet)mySettingsGroup0->getSelected();
switch(myTab->getActiveTab()) switch(myTab->getActiveTab())
{ {
case 0: case 0: // Emulation
{
bool devSettings = mySettingsGroup->getSelected() == 1;
SettingsSet set = (SettingsSet)mySettingsGroup->getSelected();
myFrameStats[set] = devSettings ? true : false; myFrameStats[set] = devSettings ? true : false;
myConsole[set] = 0; myConsole[set] = 0;
// Randomization // Randomization
@ -588,18 +617,16 @@ void DeveloperDialog::setDefaults()
// Undriven TIA pins // Undriven TIA pins
myUndrivenPins[set] = devSettings ? true : false; myUndrivenPins[set] = devSettings ? true : false;
copySetToState(set); setWidgetStates(set);
break; break;
}
case 1: // States case 1: // States
myContinuousRewind->setState(false); myContinuousRewind[set] = devSettings ? true : false;
myStateSize->setValue(100); myStateSize[set] = 100;
myStateInterval->setValue(2); myStateInterval[set] = devSettings ? 2 : 4;
myStateHorizon->setValue(3); myStateHorizon[set] = devSettings ? 3 : 5;
handleRewind();
handleSize(); setWidgetStates(set);
handleInterval();
handleHorizon();
break; break;
case 2: // Debugger options case 2: // Debugger options
@ -704,9 +731,14 @@ void DeveloperDialog::handleCommand(CommandSender* sender, int cmd, int data, in
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::handleSettings(bool devSettings) void DeveloperDialog::handleSettings(bool devSettings)
{ {
mySettingsGroup->setSelected(devSettings ? 1 : 0); if (mySettings != devSettings)
copyStateToSet(devSettings ? SettingsSet::player : SettingsSet::developer); {
copySetToState(devSettings ? SettingsSet::developer : SettingsSet::player); mySettings = devSettings; // block redundant events first!
mySettingsGroup0->setSelected(devSettings ? 1 : 0);
mySettingsGroup1->setSelected(devSettings ? 1 : 0);
getWidgetStates(devSettings ? SettingsSet::player : SettingsSet::developer);
setWidgetStates(devSettings ? SettingsSet::developer : SettingsSet::player);
}
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -740,28 +772,28 @@ void DeveloperDialog::handleConsole()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::handleRewind() void DeveloperDialog::handleRewind()
{ {
bool enable = myContinuousRewind->getState(); bool enable = myContinuousRewindWidget->getState();
myStateSize->setEnabled(enable); myStateSizeWidget->setEnabled(enable);
myStateSizeLabel->setEnabled(enable); myStateSizeLabelWidget->setEnabled(enable);
myStateInterval->setEnabled(enable); myStateIntervalWidget->setEnabled(enable);
myStateIntervalLabel->setEnabled(enable); myStateIntervalLabelWidget->setEnabled(enable);
myStateHorizon->setEnabled(enable); myStateHorizonWidget->setEnabled(enable);
myStateHorizonLabel->setEnabled(enable); myStateHorizonLabelWidget->setEnabled(enable);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::handleSize() void DeveloperDialog::handleSize()
{ {
bool found = false; bool found = false;
uInt64 size = myStateSize->getValue(); uInt64 size = myStateSizeWidget->getValue();
uInt64 interval = myStateInterval->getValue(); uInt64 interval = myStateIntervalWidget->getValue();
uInt64 horizon = myStateHorizon->getValue(); uInt64 horizon = myStateHorizonWidget->getValue();
Int32 i; Int32 i;
myStateSizeLabel->setValue(size); myStateSizeLabelWidget->setValue(size);
// adapt horizon and interval // adapt horizon and interval
do do
{ {
@ -777,22 +809,22 @@ void DeveloperDialog::handleSize()
interval--; interval--;
} while(!found); } while(!found);
myStateHorizon->setValue(i); myStateHorizonWidget->setValue(i);
myStateHorizonLabel->setLabel(HORIZONS[i]); myStateHorizonLabelWidget->setLabel(HORIZONS[i]);
myStateInterval->setValue(interval); myStateIntervalWidget->setValue(interval);
myStateIntervalLabel->setLabel(INTERVALS[interval]); myStateIntervalLabelWidget->setLabel(INTERVALS[interval]);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::handleInterval() void DeveloperDialog::handleInterval()
{ {
bool found = false; bool found = false;
uInt64 size = myStateSize->getValue(); uInt64 size = myStateSizeWidget->getValue();
uInt64 interval = myStateInterval->getValue(); uInt64 interval = myStateIntervalWidget->getValue();
uInt64 horizon = myStateHorizon->getValue(); uInt64 horizon = myStateHorizonWidget->getValue();
Int32 i; Int32 i;
myStateIntervalLabel->setLabel(INTERVALS[interval]); myStateIntervalLabelWidget->setLabel(INTERVALS[interval]);
// adapt horizon and size // adapt horizon and size
do do
{ {
@ -805,25 +837,25 @@ void DeveloperDialog::handleInterval()
} }
} }
if(!found) if(!found)
size -= myStateSize->getStepValue(); size -= myStateSizeWidget->getStepValue();
} while(!found); } while(!found);
myStateHorizon->setValue(i); myStateHorizonWidget->setValue(i);
myStateHorizonLabel->setLabel(HORIZONS[i]); myStateHorizonLabelWidget->setLabel(HORIZONS[i]);
myStateSize->setValue(size); myStateSizeWidget->setValue(size);
myStateSizeLabel->setValue(myStateSize->getValue()); myStateSizeLabelWidget->setValue(myStateSizeWidget->getValue());
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void DeveloperDialog::handleHorizon() void DeveloperDialog::handleHorizon()
{ {
bool found = false; bool found = false;
uInt64 size = myStateSize->getValue(); uInt64 size = myStateSizeWidget->getValue();
uInt64 interval = myStateInterval->getValue(); uInt64 interval = myStateIntervalWidget->getValue();
uInt64 horizon = myStateHorizon->getValue(); uInt64 horizon = myStateHorizonWidget->getValue();
Int32 i; Int32 i;
myStateHorizonLabel->setLabel(HORIZONS[horizon]); myStateHorizonLabelWidget->setLabel(HORIZONS[horizon]);
// adapt interval and size // adapt interval and size
do do
{ {
@ -836,13 +868,13 @@ void DeveloperDialog::handleHorizon()
} }
} }
if(!found) if(!found)
size -= myStateSize->getStepValue(); size -= myStateSizeWidget->getStepValue();
} while(!found); } while(!found);
myStateInterval->setValue(i); myStateIntervalWidget->setValue(i);
myStateIntervalLabel->setLabel(INTERVALS[i]); myStateIntervalLabelWidget->setLabel(INTERVALS[i]);
myStateSize->setValue(size); myStateSizeWidget->setValue(size);
myStateSizeLabel->setValue(myStateSize->getValue()); myStateSizeLabelWidget->setValue(myStateSizeWidget->getValue());
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

42
src/gui/DeveloperDialog.hxx
View File

@ -91,8 +91,8 @@ class DeveloperDialog : public Dialog
76 * 262 * 60 * 60, 76 * 262 * 60 * 60 * 10, (uInt64)76 * 262 * 60 * 60 * 60 }; 76 * 262 * 60 * 60, 76 * 262 * 60 * 60 * 10, (uInt64)76 * 262 * 60 * 60 * 60 };
TabWidget* myTab; TabWidget* myTab;
// Emulator // Emulator widgets
RadioButtonGroup* mySettingsGroup; RadioButtonGroup* mySettingsGroup0;
CheckboxWidget* myFrameStatsWidget; CheckboxWidget* myFrameStatsWidget;
PopUpWidget* myConsoleWidget; PopUpWidget* myConsoleWidget;
StaticTextWidget* myLoadingROMLabel; StaticTextWidget* myLoadingROMLabel;
@ -106,17 +106,18 @@ class DeveloperDialog : public Dialog
StaticTextWidget* myTVJitterRecLabelWidget; StaticTextWidget* myTVJitterRecLabelWidget;
CheckboxWidget* myDebugColorsWidget; CheckboxWidget* myDebugColorsWidget;
CheckboxWidget* myUndrivenPinsWidget; CheckboxWidget* myUndrivenPinsWidget;
// States // States widgets
CheckboxWidget* myContinuousRewind; RadioButtonGroup* mySettingsGroup1;
SliderWidget* myStateSize; CheckboxWidget* myContinuousRewindWidget;
StaticTextWidget* myStateSizeLabel; SliderWidget* myStateSizeWidget;
SliderWidget* myStateInterval; StaticTextWidget* myStateSizeLabelWidget;
StaticTextWidget* myStateIntervalLabel; SliderWidget* myStateIntervalWidget;
SliderWidget* myStateHorizon; StaticTextWidget* myStateIntervalLabelWidget;
StaticTextWidget* myStateHorizonLabel; SliderWidget* myStateHorizonWidget;
StaticTextWidget* myStateHorizonLabelWidget;
#ifdef DEBUGGER_SUPPORT #ifdef DEBUGGER_SUPPORT
// Debugger UI // Debugger UI widgets
SliderWidget* myDebuggerWidthSlider; SliderWidget* myDebuggerWidthSlider;
StaticTextWidget* myDebuggerWidthLabel; StaticTextWidget* myDebuggerWidthLabel;
SliderWidget* myDebuggerHeightSlider; SliderWidget* myDebuggerHeightSlider;
@ -127,7 +128,8 @@ class DeveloperDialog : public Dialog
// Maximum width and height for this dialog // Maximum width and height for this dialog
int myMaxWidth, myMaxHeight; int myMaxWidth, myMaxHeight;
bool mySettings;
// Emulator sets
bool myFrameStats[2]; bool myFrameStats[2];
int myConsole[2]; int myConsole[2];
bool myRandomBank[2]; bool myRandomBank[2];
@ -138,6 +140,14 @@ class DeveloperDialog : public Dialog
int myTVJitterRec[2]; int myTVJitterRec[2];
bool myDebugColors[2]; bool myDebugColors[2];
bool myUndrivenPins[2]; bool myUndrivenPins[2];
// States sets
bool myContinuousRewind[2];
int myStateSize[2];
//StaticTextWidget* myStateSizeLabelWidget;
int myStateInterval[2];
//StaticTextWidget* myStateIntervalLabelWidget;
int myStateHorizon[2];
//StaticTextWidget* myStateHorizonLabelWidget;*/
private: private:
void addEmulationTab(const GUI::Font& font); void addEmulationTab(const GUI::Font& font);
@ -146,10 +156,10 @@ class DeveloperDialog : public Dialog
// Add Defaults, OK and Cancel buttons // Add Defaults, OK and Cancel buttons
void addDefaultOKCancelButtons(const GUI::Font& font); void addDefaultOKCancelButtons(const GUI::Font& font);
void copySettingsToSet(SettingsSet set); void loadSettings(SettingsSet set);
void copySetToSettings(SettingsSet set); void saveSettings(SettingsSet set);
void copyStateToSet(SettingsSet set); void getWidgetStates(SettingsSet set);
void copySetToState(SettingsSet set); void setWidgetStates(SettingsSet set);
void handleSettings(bool devSettings); void handleSettings(bool devSettings);
void handleTVJitterChange(bool enable); void handleTVJitterChange(bool enable);