Begin GUI rework.

davidgiven · Jan 20, 2025 · 1a947ff · 1a947ff
1 parent 9a9a9e4
commit 1a947ff
Show file tree

Hide file tree

Showing 25 changed files with 1,197 additions and 32 deletions.
diff --git a/build.py b/build.py
@@ -99,7 +99,7 @@
     items={
         "fluxengine$(EXT)": "src+fluxengine",
         "fluxengine-gui$(EXT)": "src/gui",
-        "fluxengine-imager$(EXT)": "src/gui2+imager",
+        "frametest$(EXT)": "src/gui2+frametest",
         "brother120tool$(EXT)": "tools+brother120tool",
         "brother240tool$(EXT)": "tools+brother240tool",
         "upgrade-flux-file$(EXT)": "tools+upgrade-flux-file",

diff --git a/src/gui2/build.py b/src/gui2/build.py
@@ -18,7 +18,7 @@ def uic(self, name, src: Target = None, dest=None):
     )
 
 
-for n in ["userinterface", "driveConfigurationForm", "fluxConfigurationForm"]:
+for n in ["imager", "frame"]:
     uic(name=n + "_h", src="./" + n + ".ui", dest=n + ".h")
 
 simplerule(
@@ -29,35 +29,28 @@ def uic(self, name, src: Target = None, dest=None):
     label="RCC",
 )
 
-cxxlibrary(
-    name="userinterface",
-    srcs=[".+resources_cc"],
-    hdrs={
-        "userinterface.h": ".+userinterface_h",
-        "driveConfigurationForm.h": ".+driveConfigurationForm_h",
-        "fluxConfigurationForm.h": ".+fluxConfigurationForm_h",
-        "fluxvisualiserwidget.h": "./fluxvisualiserwidget.h",
-    },
-)
+# cxxlibrary(
+#    name="userinterface",
+#    srcs=[".+resources_cc"],
+#    hdrs={
+#        "userinterface.h": ".+userinterface_h",
+#        "driveConfigurationForm.h": ".+driveConfigurationForm_h",
+#        "fluxConfigurationForm.h": ".+fluxConfigurationForm_h",
+#        "fluxvisualiserwidget.h": "./fluxvisualiserwidget.h",
+#    },
+# )
 
 cxxlibrary(
-    name="guilib",
+    name="framelib",
     srcs=[
         "./main.cc",
         "./mainwindow.cc",
-        "./drivecomponent.cc",
-        "./formatcomponent.cc",
-        "./fluxcomponent.cc",
-        "./imagecomponent.cc",
-        "./datastore.cc",
-        "./scene.cc",
+        ".+resources_cc",
     ],
     hdrs={
         "globals.h": "./globals.h",
-        "drivecomponent.h": "./drivecomponent.h",
-        "formatcomponent.h": "./formatcomponent.h",
-        "datastore.h": "./datastore.h",
         "mainwindow.h": "./mainwindow.h",
+        "frame.h": ".+frame_h",
     },
     cflags=["-fPIC"],
     deps=[
@@ -67,31 +60,96 @@ def uic(self, name, src: Target = None, dest=None):
         "lib/external",
         "lib/algorithms",
         "lib/vfs",
-        ".+userinterface",
         ".+Qt5Concurrent",
         ".+Qt5Widgets",
         "dep/verdigris",
     ],
 )
 
+# cxxlibrary(
+#    name="guilib",
+#    srcs=[
+#        "./main.cc",
+#        "./mainwindow.cc",
+#        "./drivecomponent.cc",
+#        "./formatcomponent.cc",
+#        "./fluxcomponent.cc",
+#        "./imagecomponent.cc",
+#        "./datastore.cc",
+#        "./scene.cc",
+#    ],
+#    hdrs={
+#        "globals.h": "./globals.h",
+#        "drivecomponent.h": "./drivecomponent.h",
+#        "formatcomponent.h": "./formatcomponent.h",
+#        "datastore.h": "./datastore.h",
+#        "mainwindow.h": "./mainwindow.h",
+#    },
+#    cflags=["-fPIC"],
+#    deps=[
+#        "lib/config",
+#        "lib/core",
+#        "lib/data",
+#        "lib/external",
+#        "lib/algorithms",
+#        "lib/vfs",
+#        ".+userinterface",
+#        ".+Qt5Concurrent",
+#        ".+Qt5Widgets",
+#        "dep/verdigris",
+#    ],
+# )
+#
+# cxxprogram(
+#    name="imager",
+#    srcs=[
+#        "./mainwindow-imager.cc",
+#        "./fluxvisualiserwidget.cc",
+#        "./imagevisualiserwidget.cc",
+#    ],
+#    cflags=["-fPIC"],
+#    ldflags=["$(QT5_EXTRA_LIBS)"],
+#    deps=[
+#        "+fmt_lib",
+#        "+protobuf_lib",
+#        "+protocol",
+#        "+z_lib",
+#        ".+guilib",
+#        ".+Qt5Concurrent",
+#        ".+Qt5Widgets",
+#        ".+userinterface",
+#        "dep/adflib",
+#        "dep/fatfs",
+#        "dep/hfsutils",
+#        "dep/libusbp",
+#        "dep/verdigris",
+#        "extras+icons",
+#        "lib/config",
+#        "lib/core",
+#        "lib/data",
+#        "lib/external",
+#        "src/formats",
+#        "src/gui/drivetypes",
+#    ],
+# )
+
 cxxprogram(
-    name="imager",
+    name="frametest",
     srcs=[
-        "./mainwindow-imager.cc",
-        "./fluxvisualiserwidget.cc",
-        "./imagevisualiserwidget.cc",
+        "./frametest.cc",
+        ".+imager_h",
     ],
     cflags=["-fPIC"],
     ldflags=["$(QT5_EXTRA_LIBS)"],
     deps=[
+        ".+imager_h",
         "+fmt_lib",
         "+protobuf_lib",
         "+protocol",
         "+z_lib",
-        ".+guilib",
+        ".+framelib",
         ".+Qt5Concurrent",
         ".+Qt5Widgets",
-        ".+userinterface",
         "dep/adflib",
         "dep/fatfs",
         "dep/hfsutils",