From 993c8553903448c8ac3cc202c45f35a6950279b2 Mon Sep 17 00:00:00 2001 From: Abhishek Yenpure Date: Wed, 13 Aug 2025 10:09:58 -0700 Subject: [PATCH 1/4] feat: Adding loading bar to splash screen --- src-tauri/tauri.conf.json | 2 +- src-tauri/www/splashscreen.html | 131 ++++++++++++++++++++++++++++++-- 2 files changed, 127 insertions(+), 6 deletions(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 2728d74..d5e715b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -47,7 +47,7 @@ "exceptionDomain": "", "frameworks": [], "providerShortName": null, - "signingIdentity": null + "signingIdentity": "-" }, "resources": ["server"], "shortDescription": "", diff --git a/src-tauri/www/splashscreen.html b/src-tauri/www/splashscreen.html index 7333a8a..829aaae 100644 --- a/src-tauri/www/splashscreen.html +++ b/src-tauri/www/splashscreen.html @@ -5,22 +5,143 @@ -
+
+
+
+
+ Loading QuickView +
+
+
+
+
+
From 8024f9d8a134b7c6743a0ce529dfada9b7efe928 Mon Sep 17 00:00:00 2001 From: Abhishek Yenpure Date: Wed, 13 Aug 2025 10:13:50 -0700 Subject: [PATCH 2/4] fix: update UI when changing data files --- quickview/interface.py | 2 ++ quickview/pipeline.py | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/quickview/interface.py b/quickview/interface.py index c3cd8a3..9f5ecc7 100644 --- a/quickview/interface.py +++ b/quickview/interface.py @@ -357,9 +357,11 @@ def load_state(self, state_file): def load_data(self): with self.state as state: # Update returns True/False for validity + # force_reload=True since user explicitly clicked Load Files button is_valid = self.source.Update( data_file=self.state.data_file, conn_file=self.state.conn_file, + force_reload=True, ) state.pipeline_valid = is_valid diff --git a/quickview/pipeline.py b/quickview/pipeline.py index 2f6374e..aa0997a 100644 --- a/quickview/pipeline.py +++ b/quickview/pipeline.py @@ -180,8 +180,13 @@ def UpdatePipeline(self): self.views["continents"] = OutputPort(cont_proj, 0) self.views["grid_lines"] = OutputPort(grid_proj, 0) - def Update(self, data_file, conn_file, midpoint=0, interface=0): - if self.data_file == data_file and self.conn_file == conn_file: + def Update(self, data_file, conn_file, midpoint=0, interface=0, force_reload=False): + # Check if we need to reload + if ( + not force_reload + and self.data_file == data_file + and self.conn_file == conn_file + ): return self.valid self.data_file = data_file From d58a9300bfbbbdc975ab9c5d0be089e4ff63fbd1 Mon Sep 17 00:00:00 2001 From: Abhishek Yenpure Date: Wed, 13 Aug 2025 11:09:08 -0700 Subject: [PATCH 3/4] fix: Adding changes to update UI after file changes --- quickview/pipeline.py | 1 + quickview/plugins/eam_reader.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/quickview/pipeline.py b/quickview/pipeline.py index aa0997a..d7ebece 100644 --- a/quickview/pipeline.py +++ b/quickview/pipeline.py @@ -233,6 +233,7 @@ def Update(self, data_file, conn_file, midpoint=0, interface=0, force_reload=Fal np.asarray(self.data.GetProperty("InterfaceVariablesInfo"))[::2] ) + tk = GetTimeKeeper() self.timestamps = np.array(tk.TimestepValues).tolist() tk.Time = tk.TimestepValues[0] diff --git a/quickview/plugins/eam_reader.py b/quickview/plugins/eam_reader.py index c2c13c8..2af7155 100644 --- a/quickview/plugins/eam_reader.py +++ b/quickview/plugins/eam_reader.py @@ -453,6 +453,12 @@ def _populate_variable_metadata(self): if self._DataFileName is None: return vardata = self._get_var_dataset() + + # Clear existing selection arrays BEFORE adding new ones + self._surface_selection.RemoveAllArrays() + self._midpoint_selection.RemoveAllArrays() + self._interface_selection.RemoveAllArrays() + for name, info in vardata.variables.items(): dims = set(info.dimensions) if not (dims == dims1 or dims == dims2 or dims == dims3m or dims == dims3i): @@ -471,15 +477,13 @@ def _populate_variable_metadata(self): elif varmeta.type == VarType._3Di: self._interface_vars.append(varmeta) self._interface_selection.AddArray(name) - try: - fillval = info.getncattr("_FillValue") - varmeta.fillval = fillval - except Exception: - pass + self._surface_selection.DisableAllArrays() self._interface_selection.DisableAllArrays() self._midpoint_selection.DisableAllArrays() + # Clear old timestamps before adding new ones + self._timeSteps.clear() timesteps = vardata["time"][:].data.flatten() self._timeSteps.extend(timesteps) From e7d4d07dcfe2ef7087f3ada0066575c69453cf4f Mon Sep 17 00:00:00 2001 From: Abhishek Yenpure Date: Wed, 13 Aug 2025 11:10:00 -0700 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=200.1.9=20=E2=86=92=200.1.1?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- pyproject.toml | 2 +- quickview/__init__.py | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ea978ab..7238623 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.9 +current_version = 0.1.10 commit = True tag = True diff --git a/pyproject.toml b/pyproject.toml index f834a61..329bf32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "quickview" -version = "0.1.9" +version = "0.1.10" description = "An application to explore/analyze data for atmosphere component for E3SM" authors = [ {name = "Kitware Inc."}, diff --git a/quickview/__init__.py b/quickview/__init__.py index 9b9f9f9..14d8a4f 100644 --- a/quickview/__init__.py +++ b/quickview/__init__.py @@ -1,5 +1,5 @@ """QuickView: Visual Analysis for E3SM Atmosphere Data.""" -__version__ = "0.1.9" +__version__ = "0.1.10" __author__ = "Kitware Inc." __license__ = "Apache-2.0" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index f53c1f7..3a94b68 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "app" -version = "0.1.9" +version = "0.1.10" description = "QuickView: Visual Analyis for E3SM Atmosphere Data" authors = ["Kitware"] license = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index d5e715b..74611ac 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "QuickView", - "version": "0.1.9" + "version": "0.1.10" }, "tauri": { "allowlist": {