File/Export/Solver Set Bytes. Close #114.

README.md

@@ -27,7 +27,8 @@ is a Zilog Z8 ROM from a music synthesize module.
 ## Release Changelog
 
 `master` -- Gatorom's solver-set option now uses descriptive
-fiilenames.
+fiilenames.  GUI can now export a set of solved results with
+File/Export/SolverSetBytes.
 
 2024-07-14 -- Fixes crash when deleting a double-selected item.  Delete
 and backspace now delete objects like `D`.  Multiple disassemblers.

gatomain.cpp

@@ -425,18 +425,15 @@ int main(int argc, char *argv[]) {
 
             GatoSolver solver(gr, grader);
             for(solver.init(); !solver.finished(); solver.next()){
-                int state=solver.state;
-                //QString statestring=QString::asprintf("%04x", state);  //Older behavior, with hash.
                 QString statestring=gr->descriptiveFilename();
 
                 //We aren't interested in zero scores or empty results.
                 if(solver.grade()>0 && gr->preview().length()>0){
                     std::cout<<solver.grade()<<"   \t"
                               <<gr->preview().toStdString()<<"\t"
                               <<parser.value(solvesetOption).toStdString()<<statestring.toStdString()<<".bin\n";
-                    //All outputs go when we're dumping the set.
-                    if(parser.isSet(solvesetOption)){
 
+                    if(solver.grade()>90 && parser.isSet(solvesetOption)){
                         QFile outfile(parser.value(solvesetOption)+statestring+".bin");
                         outfile.open(QIODevice::WriteOnly);
                         outfile.write(gr->decoded);

maskromtool.cpp

@@ -1811,21 +1811,34 @@ void MaskRomTool::on_actionRedo_triggered(){
     redo();
 }
 
-
+//Shows the ASCII strings dialog.
 void MaskRomTool::on_stringsButton_triggered(){
     gatorom();
     stringsDialog.show();
 }
 
+//Shows the solver dialog.
 void MaskRomTool::on_actionSolver_triggered(){
     gatorom();
     solverDialog.show();
 }
 
 
+void MaskRomTool::on_exportSolverSetBytes_triggered(){
+    //QFileDialog::getSaveFileName(this,tr("Save JSON"), tr("bits.json"));
+    QString filename = QFileDialog::getExistingDirectory(this,tr("Export Directory"));
+    filename += "/solver";
+
+    if(!filename.isEmpty())
+        solverDialog.solve(filename);
+}
+
+
+
 void MaskRomTool::on_actionDisassembly_triggered(){
     gatorom();
     disDialog.show();
 }
 
 
+

maskromtool.h

@@ -283,6 +283,8 @@ private slots:
 
     void on_crosshaircolorButton_triggered();
 
+    void on_exportSolverSetBytes_triggered();
+
 private:
     Ui::MaskRomTool *ui;
     qreal thresholdR, thresholdG, thresholdB;

maskromtool.ui

@@ -62,6 +62,7 @@
      <addaction name="exportHistogram"/>
      <addaction name="separator"/>
      <addaction name="exportROMBytes"/>
+     <addaction name="exportSolverSetBytes"/>
     </widget>
     <widget class="QMenu" name="menuImport">
      <property name="title">
@@ -510,6 +511,11 @@
     <string>Crosshair Color</string>
    </property>
   </action>
+  <action name="exportSolverSetBytes">
+   <property name="text">
+    <string>Solver Set Bytes</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

romsolverdialog.cpp

@@ -36,17 +36,10 @@ void RomSolverDialog::on_editYara_textChanged(){
     yararule=ui->editYara->toPlainText();
 }
 
-
-/* This runs through the potential solutions, using the GUI
- * settings.
+/* Returns a new GatoGrader based upon the GUI settings.
  */
-void RomSolverDialog::on_butSolve_clicked(){
+GatoGrader* RomSolverDialog::grader(){
     GatoGrader *grader=0;
-    GatoROM *gr=&(mrt->gr);
-    QString oldstate=gr->description();
-
-    mrt->solutionsDialog.clearSolutions();
-    mrt->solutionsDialog.show();
 
     int index=ui->tabWidget->currentIndex();
     switch(index){
@@ -71,16 +64,42 @@ void RomSolverDialog::on_butSolve_clicked(){
         break;
     default:
         qDebug()<<"Unknown solver tab"<<index;
-        return;
+        break;
     }
 
+    return grader;
+}
+
+/* This generates the GUI solutions and populates the solution set.
+ * If "solveset" is not empty, each solution will be exported as
+ * well.
+ */
+void RomSolverDialog::solve(QString solveset){
+    GatoGrader *grader=0;
+    GatoROM *gr=&(mrt->gr);
+    QString oldstate=gr->description();
+
+    mrt->solutionsDialog.clearSolutions();
+    mrt->solutionsDialog.show();
+
+    grader=this->grader();
+    if(!grader) return;
+
     GatoSolver solver(gr, grader);
     for(solver.init(); !solver.finished(); solver.next()){
         int grade=solver.grade();
-        QString statestring=gr->description();
+        QString statestring=gr->descriptiveFilename();
 
         if(grade>=90){
             mrt->solutionsDialog.registerSolution(grade, statestring);
+
+            //When called from File/Export/SolveSetBINs
+            if(solveset.length()>0){
+                QFile outfile(solveset+statestring+".bin");
+                outfile.open(QIODevice::WriteOnly);
+                outfile.write(gr->decoded);
+                outfile.close();
+            }
         }
     }
 
@@ -95,10 +114,16 @@ void RomSolverDialog::on_butSolve_clicked(){
     mrt->gr.configFromDescription(oldstate);
     mrt->decodeDialog.update();
 
-
     if(grader)
         delete grader;
 }
 
+/* This runs through the potential solutions, using the GUI
+ * settings.
+ */
+void RomSolverDialog::on_butSolve_clicked(){
+    solve();
+}
+
 
 

romsolverdialog.h

@@ -5,6 +5,7 @@
 #include <QTemporaryFile>
 
 class MaskRomTool;
+class GatoGrader;
 
 
 namespace Ui {
@@ -21,10 +22,11 @@ class RomSolverDialog : public QDialog
     void setMaskRomTool(MaskRomTool *mrt);
     void setYaraRule(QString rule);
     QString yararule;
+    GatoGrader* grader();
+    void solve(QString solveset="");
 
 private slots:
     void on_butSolve_clicked();
-
     void on_editYara_textChanged();
 
 private: