writing WIP

Author: joske

ArduinoFloppyReader/ArduinoFloppyReader/GarduinoReaderWriter.cpp

@@ -46,7 +46,7 @@ class MainWindow : public Gtk::ApplicationWindow
         Gtk::Label *partialCount = nullptr;
         builder->get_widget("partialCount", partialCount);
 
-        auto callback = [this, cylinderCount, sideLabel, goodCount, partialCount](const int currentTrack, const ArduinoFloppyReader::DiskSurface currentSide, const int retryCounter, const int sectorsFound, const int badSectorsFound) -> ArduinoFloppyReader::WriteResponse
+        auto readerCallback = [this, cylinderCount, sideLabel, goodCount, partialCount](const int currentTrack, const ArduinoFloppyReader::DiskSurface currentSide, const int retryCounter, const int sectorsFound, const int badSectorsFound) -> ArduinoFloppyReader::WriteResponse
         {
             std::string side = (currentSide == ArduinoFloppyReader::DiskSurface::dsUpper ? "Upper" : "Lower");
             std::cout << "currentTrack: " << currentTrack << " side: " << side << "retryCount: " << retryCounter << std::endl;
@@ -89,7 +89,7 @@ class MainWindow : public Gtk::ApplicationWindow
                                             });
         Gtk::RadioButton *trackButton = nullptr;
         builder->get_widget("radio80", trackButton);
-        copyButton->signal_clicked().connect([this, fileEntry, folderButton, typeSelector, trackButton, callback, portsCombo]()
+        copyButton->signal_clicked().connect([this, fileEntry, folderButton, typeSelector, trackButton, readerCallback, portsCombo]()
                                              {
                                                  Glib::ustring folder = folderButton->get_filename();
                                                  Glib::ustring filename = folder + "/" + fileEntry->get_buffer()->get_text();
@@ -100,15 +100,48 @@ class MainWindow : public Gtk::ApplicationWindow
                                                  ArduinoFloppyReader::ADFResult readerResult;
                                                  if (typeSelector->get_active_text() == "ADF")
                                                  {
-                                                     readerResult = writer.DiskToADF(std::wstring(filename.begin(), filename.end()), tracks80 ? 80 : 82, callback);
+                                                     readerResult = writer.DiskToADF(std::wstring(filename.begin(), filename.end()), tracks80 ? 80 : 82, readerCallback);
                                                  }
                                                  else
                                                  {
-                                                     readerResult = writer.DiskToSCP(std::wstring(filename.begin(), filename.end()), tracks80 ? 80 : 82, 3, callback);
+                                                     readerResult = writer.DiskToSCP(std::wstring(filename.begin(), filename.end()), tracks80 ? 80 : 82, 3, readerCallback);
                                                  }
                                                  // Handle the result
                                                  handleResult(writer, readerResult);
                                              });
+
+        auto writerCallback = [this](const int currentTrack, const ArduinoFloppyReader::DiskSurface currentSide, const bool isVerifyError) -> ArduinoFloppyReader::WriteResponse {
+            std::string side = (currentSide == ArduinoFloppyReader::DiskSurface::dsUpper ? "Upper" : "Lower");
+            std::cout << "writing: currentTrack: " << currentTrack << " side: " << side << std::endl;
+
+			// if (isVerifyError) {
+			// 	switch (MessageBox(L"Verify error writing track.", L"Disk Write Error", MB_ABORTRETRYIGNORE)) {
+			// 	case IDABORT: return ArduinoFloppyReader::WriteResponse::wrAbort;
+			// 	case IDRETRY: return ArduinoFloppyReader::WriteResponse::wrRetry;
+			// 	case IDIGNORE: return ArduinoFloppyReader::WriteResponse::wrSkipBadChecksums;
+			// 	}
+			// }
+			// Just continue
+			return ArduinoFloppyReader::WriteResponse::wrContinue;
+		};                                             
+        Gtk::Entry *writeFileEntry = nullptr;
+        builder->get_widget("writeFileEntry", writeFileEntry);
+        Gtk::FileChooserButton *writeFolderSelector = nullptr;
+        builder->get_widget("writeFolderSelector", writeFolderSelector);
+        Gtk::Button *writeButton = nullptr;
+        builder->get_widget("writeButton", writeButton);
+        writeButton->signal_clicked().connect([this, writeFileEntry, writeFolderSelector, writerCallback, portsCombo]()
+                                              {
+                                                  Glib::ustring folder = writeFolderSelector->get_filename();
+                                                  Glib::ustring filename = folder + "/" + writeFileEntry->get_buffer()->get_text();
+                                                  ArduinoFloppyReader::ADFWriter writer;
+                                                  Glib::ustring serial = portsCombo->get_active_text();
+                                                  writer.openDevice(std::wstring(serial.begin(), serial.end()));
+                                                  ArduinoFloppyReader::ADFResult readerResult;
+                                                  readerResult = writer.ADFToDisk(std::wstring(filename.begin(), filename.end()), false, false, writerCallback);
+                                                  // Handle the result
+                                                  handleResult(writer, readerResult);
+                                              });
     }
 
     virtual ~MainWindow() = default;
@@ -182,7 +215,7 @@ private
         }
         }
     }
-    
+
     bool showQuestion(bool isQuestion, const std::string question)
     {
         Gtk::ButtonsType buttons = Gtk::BUTTONS_OK_CANCEL;