Skip to content

Commit 0d14c97

Browse files
committed
fix(dataclass): use latest trame-dataclass implementation
1 parent f308d67 commit 0d14c97

File tree

2 files changed

+24
-25
lines changed

2 files changed

+24
-25
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies = [
2727
"trame-rca[turbo]>=2.3.1",
2828
"pyproj>=3.6.1",
2929
"netCDF4>=1.6.5",
30-
"trame-dataclass >=2.0.1",
30+
"trame-dataclass >=2.0.2",
3131
"trame-components",
3232
"trame-tauri>=0.6.2",
3333
"Pillow",

src/e3sm_quickview/view_manager.py

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import math
22

33
from paraview import simple
4-
from trame.app import TrameComponent
4+
from trame.app import TrameComponent, dataclass
55
from trame.decorators import controller
66
from trame.ui.html import DivLayout
77
from trame.widgets import client, html, rca
88
from trame.widgets import vuetify3 as v3
9-
from trame_dataclass.core import StateDataModel
109
from vtkmodules.vtkRenderingCore import vtkActor, vtkPolyDataMapper
1110

1211
from e3sm_quickview.components import view as tview
@@ -46,27 +45,27 @@ def lut_name(element):
4645
return element.get("name").lower()
4746

4847

49-
class ViewConfiguration(StateDataModel):
50-
variable: str
51-
preset: str = "BuGnYl"
52-
invert: bool = False
53-
color_blind: bool = False
54-
use_log_scale: bool = False
55-
color_value_min: str = "0"
56-
color_value_max: str = "1"
57-
color_value_min_valid: bool = True
58-
color_value_max_valid: bool = True
59-
color_range: list[float] = (0, 1)
60-
override_range: bool = False
61-
order: int = 0
62-
size: int = 6
63-
offset: int = 0
64-
break_row: bool = False
65-
menu: bool = False
66-
swap_group: list[str]
67-
search: str | None
68-
n_colors: int = 255
69-
lut_img: str
48+
class ViewConfiguration(dataclass.StateDataModel):
49+
variable: str = dataclass.Sync(str)
50+
preset: str = dataclass.Sync(str, "BuGnYl")
51+
invert: bool = dataclass.Sync(bool, False)
52+
color_blind: bool = dataclass.Sync(bool, False)
53+
use_log_scale: bool = dataclass.Sync(bool, False)
54+
color_value_min: str = dataclass.Sync(str, "0")
55+
color_value_max: str = dataclass.Sync(str, "1")
56+
color_value_min_valid: bool = dataclass.Sync(bool, True)
57+
color_value_max_valid: bool = dataclass.Sync(bool, True)
58+
color_range: list[float] = dataclass.Sync(tuple[float, float], (0, 1))
59+
override_range: bool = dataclass.Sync(bool, False)
60+
order: int = dataclass.Sync(int, 0)
61+
size: int = dataclass.Sync(int, 6)
62+
offset: int = dataclass.Sync(int, 0)
63+
break_row: bool = dataclass.Sync(bool, False)
64+
menu: bool = dataclass.Sync(bool, False)
65+
swap_group: list[str] = dataclass.Sync(list[str], list)
66+
search: str | None = dataclass.Sync(str)
67+
n_colors: int = dataclass.Sync(int, 255)
68+
lut_img: str = dataclass.Sync(str)
7069

7170

7271
class VariableView(TrameComponent):
@@ -183,7 +182,7 @@ def color_range_str_to_float(self, color_value_min, color_value_max):
183182
self.config.color_value_max_valid = False
184183

185184
if self.config.color_value_min_valid and self.config.color_value_max_valid:
186-
self.config.color_range = [min_value, max_value]
185+
self.config.color_range = (min_value, max_value)
187186

188187
@property
189188
def data_array(self):

0 commit comments

Comments
 (0)