Improvements to QT UI

5 files changed, 137 insertions, 42 deletions

diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 8ba768c..42c6d52 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -19,7 +19,7 @@ qt_add_executable(appnissyqt
 qt_add_qml_module(appnissyqt
         URI nissyqt
         VERSION 1.0
-        QML_FILES NissyMain.qml
+        QML_FILES Main.qml
 )
 
 target_link_libraries(appnissyqt
diff --git a/qt/NissyMain.qml b/qt/Main.qml
index 24aff43..a6e034a 100644
--- a/qt/NissyMain.qml
+++ b/qt/Main.qml
@@ -43,9 +43,11 @@ Window {
       id: mainArea
 
       property alias scramble: scrambleRow.scramble
+      property alias solver: solverCfg.solver
       property alias minmoves: solverCfg.minmoves
       property alias maxmoves: solverCfg.maxmoves
       property alias maxsolutions: solverCfg.maxsolutions
+      property alias optimal: solverCfg.optimal
       property alias sols: sols.text
       property alias solsHeader: solsHeader.text
 
@@ -59,7 +61,7 @@ Window {
       spacing: 10
 
       SplitView.minimumHeight: 180
-      SplitView.preferredHeight: 300
+      SplitView.preferredHeight: 500
 
       component Separator: Rectangle {
         height: 1
@@ -67,6 +69,50 @@ Window {
         color: "black"
       }
 
+      component OptionalValue: RowLayout {
+        property alias currentValue: valueRect.value
+        property alias from: spinBox.from
+        property alias to: spinBox.to
+        property alias defaultValue: spinBox.value
+        property alias defaultEnabled: sw.checked
+        property alias label: sw.text
+        property int defaultSavedValue: 1
+        property int savedValue: defaultSavedValue
+
+        Switch {
+          id: sw
+
+          checked: true
+
+          onToggled: () => {
+            if (checked) {
+              currentValue = savedValue
+            } else {
+              savedValue = currentValue
+              currentValue = spinBox.to
+            }
+          }
+        }
+
+        Rectangle {
+          id: valueRect
+
+          property alias enabled: sw.checked
+          property alias value: spinBox.value
+
+          width: 65
+          height: 20
+
+          SpinBox {
+            id: spinBox
+
+            width: parent.width
+            editable: true
+            enabled: parent.enabled
+          }
+        }
+      }
+
       ColumnLayout {
         id: scrambleRow
 
@@ -114,9 +160,36 @@ Window {
 
       ColumnLayout {
         id: solverCfg
+
         property alias minmoves: minMaxRow.min
         property alias maxmoves: minMaxRow.max
-        property alias maxsolutions: maxOptimal.maxsolutions
+        property alias maxsolutions: maxSols.currentValue
+        property alias optimal: optimal.currentValue
+        property alias solver: solverRow.solver
+
+        RowLayout {
+          id: solverRow
+
+          property alias solver: comboBox.currentValue
+
+          Label { text: "Solver" }
+          ComboBox {
+            id: comboBox
+
+            currentIndex: 3
+            textRole: "text"
+            valueRole: "name"
+            implicitContentWidthPolicy: ComboBox.WidestTextWhenCompleted
+
+            model: ListModel {
+              ListElement { text: "h48 h=0, k=4 (59 Mb)"; name: "h48h0k4" }
+              ListElement { text: "h48 h=1, k=2 (115 Mb)"; name: "h48h1k2" }
+              ListElement { text: "h48 h=2, k=2 (171 Mb)"; name: "h48h2k2" }
+              ListElement { text: "h48 h=3, k=2 (283 Mb)"; name: "h48h3k2" }
+              ListElement { text: "h48 h=7, k=2 (3.6 Gb)"; name: "h48h7k2" }
+            }
+          }
+        }
 
         RowLayout {
           id: minMaxRow
@@ -148,40 +221,38 @@ Window {
           }
         }
 
-        RowLayout {
-          id: maxOptimal
-
-          property alias maxsolutions: maxSolsRect.maxsolutions
-
-          Rectangle {
-            width: 220
-            height: 20
-            Label { text: "Maximum number of solutions:" }
-          }
-          Rectangle {
-            id: maxSolsRect
-
-            property int maxsolutions: parseInt(textField.text)
-
-            width: 35
-            height: 20
+        OptionalValue {
+          id: optimal
 
-            TextField {
-              id: textField
+          label: "Above optimal by at most"
+          from: 0
+          to: 20
+          defaultValue: 20
+          defaultEnabled: false
+          defaultSavedValue: 0
+        }
 
-              width: parent.width
-              text: "1"
-              validator: IntValidator{ bottom: 1; top: 999; }
+        OptionalValue {
+          id: maxSols
 
-              onAccepted: submitScramble()
-            }
-          }
+          label: "Limit number of solutions to"
+          from: 1
+          to: 999
+          defaultValue: 1
+          defaultEnabled: true
+          defaultSavedValue: 1
         }
       }
 
       Separator {}
 
-      Label { id: solsHeader }
+      StackLayout {
+        Layout.maximumHeight: 30
+        currentIndex: mainArea.solutionsLoading ? 0 : 1
+
+        BusyIndicator { running: mainArea.solutionsLoading }
+        Label { id: solsHeader }
+      }
 
       ScrollView {
         Layout.fillHeight: true
@@ -229,16 +300,16 @@ Window {
 
   function submitScramble() {
     mainArea.solutionsLoading = true;
-    mainArea.solsHeader = "Loading solutions..."
+    mainArea.solsHeader = ""
     mainArea.sols = ""
     logView.text = ""
     NissyAdapter.requestSolve(
         mainArea.scramble,
-        "h48h3k2",
+        mainArea.solver,
         mainArea.minmoves,
         mainArea.maxmoves,
         mainArea.maxsolutions,
-        -1
+        mainArea.optimal
     )
   }
 
@@ -251,7 +322,7 @@ Window {
     }
     function onSolverError(msg) {
       mainArea.solutionsLoading = false
-      mainArea.solusHeader = msg
+      mainArea.solsHeader = msg
       mainArea.sols = ""
     }
     function onAppendLog(msg) {
diff --git a/qt/adapter.cpp b/qt/adapter.cpp
index 3711fa4..cb690a4 100644
--- a/qt/adapter.cpp
+++ b/qt/adapter.cpp
@@ -9,20 +9,25 @@
 
 void logWrapper(const char *str, void *data)
 {
-        auto f = *reinterpret_cast<std::function<void(const char*)>*>(data);
-        f(str);
+        auto f = *reinterpret_cast<std::function<void(std::string)>*>(data);
+        f(std::string{str});
 }
 
 NissyAdapter::NissyAdapter()
 {
+        // TODO: this list must be kept in sync with UI code, it is a bit ugly
         std::vector<std::string> solverNames {
-                "h48h3k2"
+                "h48h0k4",
+                "h48h1k2",
+                "h48h2k2",
+                "h48h3k2",
+                "h48h7k2",
         };
 
         for (auto s : solverNames)
                 initSolver(s);
 
-        writeLog = [&](const char *str) {
+        writeLog = [&](std::string str) {
                 emit appendLog(QString::fromStdString(str));
         };
 
@@ -45,6 +50,8 @@ bool NissyAdapter::loadSolverData(nissy::solver& solver) {
 
         std::filesystem::path filePath("./tables/" + solver.id);
         if (!std::filesystem::exists(filePath)) {
+                logLine("Data file for solver " + solver.name + " not found, "
+                    "generating it...");
                 auto err = solver.generate_data();
                 if (!err.ok()) {
                         emit solverError(QString("Error generating data!"));
@@ -55,16 +62,23 @@ bool NissyAdapter::loadSolverData(nissy::solver& solver) {
                 ofs.write(reinterpret_cast<char *>(solver.data.data()),
                     solver.size);
                 ofs.close();
+                logLine("Data generated succesfully");
         } else {
+                logLine("Reading data for solver " + solver.name +
+                    " from file");
                 std::ifstream ifs(filePath, std::ios::binary);
                 solver.read_data(ifs);
                 ifs.close();
+                logLine("Data loaded");
         }
 
+        logLine("Checking data integrity "
+            "(this is done only once per solver per session)...");
         if (!solver.check_data().ok()) {
                 emit solverError(QString("Error reading data!"));
                 return false;
         }
+        logLine("Data checked");
 
         return true;
 }
@@ -102,7 +116,7 @@ Q_INVOKABLE void NissyAdapter::requestSolve(
         }
 
         SolveOptions opts{c, ss, (unsigned)minmoves, (unsigned)maxmoves,
-            (unsigned)maxsolutions, optimal};
+            (unsigned)maxsolutions, (unsigned)optimal};
         auto _ = QtConcurrent::run(&NissyAdapter::startSolve, this, opts);
         return;
 }
@@ -132,9 +146,16 @@ void NissyAdapter::startSolve(SolveOptions opts)
                 std::stringstream ss;
                 for (auto s : sols) {
                         auto n = nissy::count_moves(s).value;
-                        ss << s << "(" << n << ")" << std::endl; // TODO: remove last newline
+                        ss << s << " (" << n << ")" << std::endl; // TODO: remove last newline
                 }
                 emit solutionsReady(QString::fromStdString(hs.str()),
                    QString::fromStdString(ss.str()));
         }
 }
+
+void NissyAdapter::logLine(std::string str)
+{
+        std::stringstream ss;
+        ss << str << std::endl;
+        writeLog(ss.str());
+}
diff --git a/qt/adapter.h b/qt/adapter.h
index 856cdad..e961459 100644
--- a/qt/adapter.h
+++ b/qt/adapter.h
@@ -14,7 +14,7 @@ struct SolveOptions {
         unsigned minmoves;
         unsigned maxmoves;
         unsigned maxsolutions;
-        int optimal;
+        unsigned optimal;
 };
 
 class NissyAdapter : public QObject {
@@ -23,6 +23,8 @@ class NissyAdapter : public QObject {
         QML_ELEMENT
         
 public:
+        static constexpr int maxSolutionsHardLimit = 9999;
+
         NissyAdapter();
 
         Q_INVOKABLE bool isValidScramble(QString);
@@ -42,11 +44,12 @@ signals:
 
 private:
         std::vector<nissy::solver> solvers;
-        std::function<void(const char*)> writeLog;
+        std::function<void(std::string)> writeLog;
 
         void initSolver(const std::string&);
         void startSolve(SolveOptions);
         bool loadSolverData(nissy::solver&);
+        void logLine(std::string);
 };
 
 #endif
diff --git a/qt/main.cpp b/qt/main.cpp
index 658d448..a012642 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -10,7 +10,7 @@ int main(int argc, char *argv[])
         QObject::connect(&engine, &QQmlApplicationEngine::objectCreationFailed,
             &app, []() { QCoreApplication::exit(-1); }, Qt::QueuedConnection);
 
-        engine.loadFromModule("nissyqt", "NissyMain");
+        engine.loadFromModule("nissyqt", "Main");
 
         return app.exec();
 }