salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix state machine when errors are reported from the worker thread.

Browse Source
This commit is contained in:
David Given
2022-09-02 23:54:45 +02:00
parent e49fcd12fa
commit f436d6e48c
3 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/layout.cpp
View File

@@ -234,14 +234,14 @@ MainWindowGen::MainWindowGen( wxWindow* parent, wxWindowID id, const wxString& t
wxGridSizer* gSizer9;
gSizer9 = new wxGridSizer( 1, 0, 0, 0 );
readButton = new wxButton( idlePanel, wxID_ANY, wxT("Read disk to file"), wxDefaultPosition, wxDefaultSize, 0 );
readButton = new wxButton( idlePanel, wxID_ANY, wxT("Read disk"), wxDefaultPosition, wxDefaultSize, 0 );
readButton->SetBitmap( wxArtProvider::GetBitmap( wxART_FILE_OPEN, wxART_TOOLBAR ) );
readButton->SetToolTip( wxT("Read and decode, producing a disk image from a real disk or flux file.") );
gSizer9->Add( readButton, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );
writeButton = new wxButton( idlePanel, wxID_ANY, wxT("Write file to disk"), wxDefaultPosition, wxDefaultSize, 0 );
writeButton = new wxButton( idlePanel, wxID_ANY, wxT("Write disk"), wxDefaultPosition, wxDefaultSize, 0 );
writeButton->SetBitmap( wxArtProvider::GetBitmap( wxART_FILE_SAVE, wxART_TOOLBAR ) );
writeButton->SetBitmapDisabled( wxArtProvider::GetBitmap( wxART_FILE_SAVE, wxART_BUTTON ) );

4
src/gui/layout.fbp
View File

@@ -1825,7 +1825,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Read disk to file</property>
<property name="label">Read disk</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>
@@ -1898,7 +1898,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Write file to disk</property>
<property name="label">Write disk</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>

55
src/gui/mainwindow.cc
View File

@@ -64,11 +64,6 @@ public:
}
UpdateDevices();
if (deviceCombo->GetCount() > 0)
deviceCombo->SetValue(deviceCombo->GetString(0));
if (MainWindow::formatChoice->GetCount() > 0)
formatChoice->SetSelection(defaultFormat);
Bind(UPDATE_STATE_EVENT,
[this](wxCommandEvent&)
@@ -83,27 +78,18 @@ public:
diskImageRadioButton->Bind(
wxEVT_RADIOBUTTON, &MainWindow::OnConfigRadioButtonClicked, this);
driveChoice->Bind(wxEVT_COMMAND_CHOICE_SELECTED,
&MainWindow::OnControlsChanged,
this);
deviceCombo->Bind(wxEVT_COMMAND_CHOICE_SELECTED,
&MainWindow::OnControlsChanged,
this);
highDensityToggle->Bind(wxEVT_COMMAND_CHOICE_SELECTED,
&MainWindow::OnControlsChanged,
this);
driveChoice->Bind(wxEVT_CHOICE, &MainWindow::OnControlsChanged, this);
deviceCombo->Bind(wxEVT_TEXT, &MainWindow::OnControlsChanged, this);
highDensityToggle->Bind(
wxEVT_RADIOBUTTON, &MainWindow::OnControlsChanged, this);
fluxImagePicker->Bind(wxEVT_COMMAND_CHOICE_SELECTED,
&MainWindow::OnControlsChanged,
this);
fluxImagePicker->Bind(
wxEVT_FILEPICKER_CHANGED, &MainWindow::OnControlsChanged, this);
diskImagePicker->Bind(wxEVT_COMMAND_CHOICE_SELECTED,
&MainWindow::OnControlsChanged,
this);
diskImagePicker->Bind(
wxEVT_FILEPICKER_CHANGED, &MainWindow::OnControlsChanged, this);
formatChoice->Bind(wxEVT_COMMAND_CHOICE_SELECTED,
&MainWindow::OnControlsChanged,
this);
formatChoice->Bind(wxEVT_CHOICE, &MainWindow::OnControlsChanged, this);
readButton->Bind(wxEVT_BUTTON, &MainWindow::OnReadButton, this);
writeButton->Bind(wxEVT_BUTTON, &MainWindow::OnWriteButton, this);
@@ -186,6 +172,7 @@ public:
UpdateState();
ShowConfig();
_errorState = STATE_READING_FAILED;
runOnWorkerThread(
[this]()
{
@@ -238,6 +225,8 @@ public:
_state = STATE_WRITING_WORKING;
UpdateState();
ShowConfig();
_errorState = STATE_WRITING_FAILED;
runOnWorkerThread(
[this]()
{
@@ -301,6 +290,8 @@ public:
ShowConfig();
auto image = _currentDisk->image;
_errorState = _state;
runOnWorkerThread(
[image, this]()
{
@@ -334,6 +325,8 @@ public:
config.mutable_flux_sink(), filename.ToStdString());
ShowConfig();
_errorState = _state;
runOnWorkerThread(
[this]()
{
@@ -471,6 +464,8 @@ public:
[&](const ErrorLogMessage& m)
{
wxMessageBox(m.message, "Error", wxOK | wxICON_ERROR);
_state = _errorState;
UpdateState();
},
/* Indicates that we're starting a write operation. */
@@ -510,6 +505,11 @@ public:
void LoadConfig()
{
/* Prevent saving the config half-way through reloading it when the
* widget states all change. */
_dontSaveConfig = true;
/* Radio button config. */
wxString s = std::to_string(SELECTEDSOURCE_REAL);
@@ -531,8 +531,6 @@ public:
break;
}
wxCommandEvent dummyEvent;
/* Real disk block. */
s = "";
@@ -580,11 +578,16 @@ public:
/* Triggers SaveConfig */
_dontSaveConfig = false;
wxCommandEvent dummyEvent;
OnConfigRadioButtonClicked(dummyEvent);
}
void SaveConfig()
{
if (_dontSaveConfig)
return;
_config.Write(
CONFIG_SELECTEDSOURCE, wxString(std::to_string(_selectedSource)));
@@ -699,7 +702,9 @@ private:
_formats;
std::vector<std::unique_ptr<const CandidateDevice>> _devices;
int _state;
int _errorState;
int _selectedSource;
bool _dontSaveConfig = false;
std::shared_ptr<const DiskFlux> _currentDisk;
};