add default T1w image to load

niivue · May 13, 2024 · 26abdbc · 26abdbc
1 parent 8d6bc92
commit 26abdbc
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/NiiVue/NiiVue.xcodeproj/project.pbxproj b/NiiVue/NiiVue.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		3485664D2B5426A4008EF4DD /* dist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3485664C2B5426A4008EF4DD /* dist */; };
 		3487D3492BC85E5B007C6D7C /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3487D3482BC85E5B007C6D7C /* ContentView.swift */; };
 		3487D34F2BCFD932007C6D7C /* SharedData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3487D34E2BCFD932007C6D7C /* SharedData.swift */; };
+		34C48D4F2BF297FD00486C4E /* samples in CopyFiles */ = {isa = PBXBuildFile; fileRef = 34C48D4E2BF297FD00486C4E /* samples */; };
 		34CD17F62B45C5400015EF4C /* NiiVueApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CD17F52B45C5400015EF4C /* NiiVueApp.swift */; };
 		34CD17FA2B45C5410015EF4C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34CD17F92B45C5410015EF4C /* Assets.xcassets */; };
 		34CD17FD2B45C5410015EF4C /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 34CD17FC2B45C5410015EF4C /* Preview Assets.xcassets */; };
@@ -42,6 +43,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
+				34C48D4F2BF297FD00486C4E /* samples in CopyFiles */,
 				3485664D2B5426A4008EF4DD /* dist in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -55,6 +57,7 @@
 		3487D34C2BCB2146007C6D7C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		3487D34D2BCB2250007C6D7C /* NiiVue.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NiiVue.entitlements; sourceTree = "<group>"; };
 		3487D34E2BCFD932007C6D7C /* SharedData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedData.swift; sourceTree = "<group>"; };
+		34C48D4E2BF297FD00486C4E /* samples */ = {isa = PBXFileReference; lastKnownFileType = folder; name = samples; path = NiiVue/samples; sourceTree = "<group>"; };
 		34CD17F22B45C5400015EF4C /* NiiVue.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NiiVue.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		34CD17F52B45C5400015EF4C /* NiiVueApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NiiVueApp.swift; sourceTree = "<group>"; };
 		34CD17F92B45C5410015EF4C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -94,6 +97,7 @@
 		34CD17E92B45C5400015EF4C = {
 			isa = PBXGroup;
 			children = (
+				34C48D4E2BF297FD00486C4E /* samples */,
 				3485664C2B5426A4008EF4DD /* dist */,
 				34CD17F42B45C5400015EF4C /* NiiVue */,
 				34CD18052B45C5420015EF4C /* NiiVueTests */,
@@ -464,7 +468,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = NiiVue/NiiVue.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"NiiVue/Preview Content\"";
 				DEVELOPMENT_TEAM = VJ2G5D3BY7;
 				ENABLE_PREVIEWS = YES;
@@ -499,7 +503,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = NiiVue/NiiVue.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"NiiVue/Preview Content\"";
 				DEVELOPMENT_TEAM = VJ2G5D3BY7;
 				ENABLE_PREVIEWS = YES;

diff --git a/...codeproj/project.xcworkspace/xcuserdata/taylor.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/taylor.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/NiiVue/NiiVue/ContentView.swift b/NiiVue/NiiVue/ContentView.swift
@@ -282,8 +282,13 @@ struct ContentView: View {
         "locationChange": {location in
 //            sharedData.location = location
             print(location)
+        },
+        "finishedLoading": {message in
+            print("finished loading message: ")
+            print(message)
         }
     ])
+    @State private var isWebviewLoading = false // TODO: implement this!
     @State private var documentPickerPresented = false
     @State private var settingsSheetPresented = false
     @State private var pickedDocumentURL: URL?
@@ -642,6 +647,21 @@ struct ContentView: View {
             WebView(manager: webViewManager)
                 .onAppear {
                     webViewManager.load()
+                    // load the demo image after a small delay since we need the
+                    // web page to be ready prior to loading
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 4) {
+                        // this is a stupid necessity when describing file paths
+                        var url: URL = Bundle.main.url(forResource: "T1w_DEMO.nii", withExtension: "gz", subdirectory: "samples")!
+                        // updating pickedDocumentURL will automatically set the name in the top left corner of the UI
+                        pickedDocumentURL = url
+                        //print("\(String(describing: pickedDocumentURL!.lastPathComponent))")
+                        if let encodedString = encodeFileToBase64(url: url) {
+                            // setting base64EncodedString will trigger the
+                            // loading of a new image in NiiVue
+                            base64EncodedString = encodedString
+                        }
+                    }
+
                 } // onAppear
                 .background(Color.black)
                 .padding()

diff --git a/NiiVue/NiiVue/samples/T1w_DEMO.nii.gz b/NiiVue/NiiVue/samples/T1w_DEMO.nii.gz
diff --git a/NiiVue/React/src/App.tsx b/NiiVue/React/src/App.tsx
@@ -55,7 +55,8 @@ function App() {
   const canvasRef = React.useRef<HTMLCanvasElement>(null);
   const nvRef = React.useRef<Niivue>(new Niivue(
     {
-      logLevel: 'debug'
+      logLevel: 'debug',
+      loadingText: 'Loading...',
     }
   ));
   const nv = nvRef.current;