@@ -107,7 +107,7 @@ class monitor_set_name(metaclass=PyLocalPropertyMeta):
107107 @Attribute
108108 def allowed_values (self ):
109109 """Monitor set allowed values."""
110- return self .session . monitors .get_monitor_set_names ()
110+ return self .monitors .get_monitor_set_names ()
111111
112112
113113class XYPlotDefn (PlotDefn ):
@@ -138,7 +138,7 @@ class y_axis_function(metaclass=PyLocalPropertyMeta):
138138 @Attribute
139139 def allowed_values (self ):
140140 """Y axis function allowed values."""
141- return list (self .session . field_info . get_scalar_fields_info ())
141+ return list (self .field_data . scalar_fields ())
142142
143143 class x_axis_function (metaclass = PyLocalPropertyMeta ):
144144 """X Axis Function."""
@@ -158,7 +158,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
158158 @Attribute
159159 def allowed_values (self ):
160160 """Surface list allowed values."""
161- return list (self .session . field_info . get_surfaces_info ()) + list (
161+ return list (self .field_data . surfaces ()) + list (
162162 self .get_root ()._local_surfaces_provider ()
163163 )
164164
@@ -176,7 +176,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
176176 @Attribute
177177 def allowed_values (self ):
178178 """Surface list allowed values."""
179- return list (self .session . field_info . get_surfaces_info ()) + list (
179+ return list (self .field_data . surfaces ()) + list (
180180 self .get_root ()._local_surfaces_provider ()
181181 )
182182
@@ -209,7 +209,7 @@ class field(metaclass=PyLocalPropertyMeta):
209209 @Attribute
210210 def allowed_values (self ):
211211 """Field allowed values."""
212- return list (self .session . field_info . get_scalar_fields_info ())
212+ return list (self .field_data . scalar_fields ())
213213
214214 class surfaces (metaclass = PyLocalPropertyMeta ):
215215 """List of surfaces for pathlines."""
@@ -219,7 +219,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
219219 @Attribute
220220 def allowed_values (self ):
221221 """Surface list allowed values."""
222- return list (self .session . field_info . get_surfaces_info ()) + list (
222+ return list (self .field_data . surfaces ()) + list (
223223 self .get_root ()._local_surfaces_provider ()
224224 )
225225
@@ -286,9 +286,7 @@ class x(metaclass=PyLocalPropertyMeta):
286286 @Attribute
287287 def range (self ):
288288 """X value range."""
289- return self .session .field_info .get_scalar_field_range (
290- "x-coordinate" , True
291- )
289+ return self .field_data .scalar_fields .range ("x-coordinate" , True )
292290
293291 class y (metaclass = PyLocalPropertyMeta ):
294292 """Y value."""
@@ -298,9 +296,7 @@ class y(metaclass=PyLocalPropertyMeta):
298296 @Attribute
299297 def range (self ):
300298 """Y value range."""
301- return self .session .field_info .get_scalar_field_range (
302- "y-coordinate" , True
303- )
299+ return self .field_data .scalar_fields .range ("y-coordinate" , True )
304300
305301 class z (metaclass = PyLocalPropertyMeta ):
306302 """Z value."""
@@ -310,9 +306,7 @@ class z(metaclass=PyLocalPropertyMeta):
310306 @Attribute
311307 def range (self ):
312308 """Z value range."""
313- return self .session .field_info .get_scalar_field_range (
314- "z-coordinate" , True
315- )
309+ return self .field_data .scalar_fields .range ("z-coordinate" , True )
316310
317311 class normal (metaclass = PyLocalObjectMeta ):
318312 """Normal entry for point-and-normal surface."""
@@ -368,9 +362,7 @@ class z(metaclass=PyLocalPropertyMeta):
368362 @Attribute
369363 def range (self ):
370364 """Z value range."""
371- return self .session .field_info .get_scalar_field_range (
372- "z-coordinate" , True
373- )
365+ return self .field_data .scalar_fields .range ("z-coordinate" , True )
374366
375367 class yz_plane (metaclass = PyLocalObjectMeta ):
376368 """YZ Plane definition."""
@@ -388,9 +380,7 @@ class x(metaclass=PyLocalPropertyMeta):
388380 @Attribute
389381 def range (self ):
390382 """X value range."""
391- return self .session .field_info .get_scalar_field_range (
392- "x-coordinate" , True
393- )
383+ return self .field_data .scalar_fields .range ("x-coordinate" , True )
394384
395385 class zx_plane (metaclass = PyLocalObjectMeta ):
396386 """ZX Plane definition."""
@@ -408,9 +398,7 @@ class y(metaclass=PyLocalPropertyMeta):
408398 @Attribute
409399 def range (self ):
410400 """Y value range."""
411- return self .session .field_info .get_scalar_field_range (
412- "y-coordinate" , True
413- )
401+ return self .field_data .scalar_fields .range ("y-coordinate" , True )
414402
415403 class iso_surface (metaclass = PyLocalObjectMeta ):
416404 """Iso surface definition."""
@@ -428,7 +416,7 @@ class field(metaclass=PyLocalPropertyMeta):
428416 @Attribute
429417 def allowed_values (self ):
430418 """Field allowed values."""
431- return list (self .session . field_info . get_scalar_fields_info ())
419+ return list (self .field_data . scalar_fields ())
432420
433421 class rendering (metaclass = PyLocalPropertyMeta ):
434422 """Iso surface rendering."""
@@ -465,9 +453,7 @@ def range(self):
465453 """Iso value range."""
466454 field = self ._parent .field ()
467455 if field :
468- return self .session .field_info .get_scalar_field_range (
469- field , True
470- )
456+ return self .field_data .scalar_fields .range (field , True )
471457
472458
473459class ContourDefn (GraphicsDefn ):
@@ -483,7 +469,7 @@ class field(metaclass=PyLocalPropertyMeta):
483469 @Attribute
484470 def allowed_values (self ):
485471 """Field allowed values."""
486- return list (self .session . field_info . get_scalar_fields_info ())
472+ return list (self .field_data . scalar_fields ())
487473
488474 class surfaces (metaclass = PyLocalPropertyMeta ):
489475 """Contour surfaces."""
@@ -493,7 +479,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
493479 @Attribute
494480 def allowed_values (self ):
495481 """Surfaces list allowed values."""
496- return list (self .session . field_info . get_surfaces_info ()) + list (
482+ return list (self .field_data . surfaces ()) + list (
497483 self .get_root ()._local_surfaces_provider ()
498484 )
499485
@@ -607,8 +593,8 @@ def value(self):
607593 if getattr (self , "_value" , None ) is None :
608594 field = self .get_ancestors_by_type (ContourDefn ).field ()
609595 if field :
610- field_info = self .session . field_info
611- field_range = field_info . get_scalar_field_range (
596+ field_data = self .field_data
597+ field_range = field_data . scalar_fields . range (
612598 field ,
613599 self .get_ancestors_by_type (ContourDefn ).node_values (),
614600 )
@@ -636,8 +622,8 @@ def value(self):
636622 if getattr (self , "_value" , None ) is None :
637623 field = self .get_ancestors_by_type (ContourDefn ).field ()
638624 if field :
639- field_info = self .session . field_info
640- field_range = field_info . get_scalar_field_range (
625+ field_data = self .field_data
626+ field_range = field_data . scalar_fields . range (
641627 field ,
642628 self .get_ancestors_by_type (ContourDefn ).node_values (),
643629 )
@@ -663,7 +649,7 @@ class vectors_of(metaclass=PyLocalPropertyMeta):
663649 @Attribute
664650 def allowed_values (self ):
665651 """Vectors of allowed values."""
666- return list (self .session . field_info . get_vector_fields_info ())
652+ return list (self .field_data . vectors ())
667653
668654 class field (metaclass = PyLocalPropertyMeta ):
669655 """Vector color field."""
@@ -673,7 +659,7 @@ class field(metaclass=PyLocalPropertyMeta):
673659 @Attribute
674660 def allowed_values (self ):
675661 """Field allowed values."""
676- return list (self .session . field_info . get_scalar_fields_info ())
662+ return list (self .field_data . scalar_fields ())
677663
678664 class surfaces (metaclass = PyLocalPropertyMeta ):
679665 """List of surfaces for vector graphics."""
@@ -683,7 +669,7 @@ class surfaces(metaclass=PyLocalPropertyMeta):
683669 @Attribute
684670 def allowed_values (self ):
685671 """Surface list allowed values."""
686- return list (self .session . field_info . get_surfaces_info ()) + list (
672+ return list (self .field_data . surfaces ()) + list (
687673 self .get_root ()._local_surfaces_provider ()
688674 )
689675
@@ -750,8 +736,8 @@ class minimum(metaclass=PyLocalPropertyMeta):
750736 def value (self ):
751737 """Range minimum property setter."""
752738 if getattr (self , "_value" , None ) is None :
753- field_info = self .session . field_info
754- field_range = field_info . get_scalar_field_range (
739+ field_data = self .field_data
740+ field_range = field_data . scalar_fields . range (
755741 "velocity-magnitude" ,
756742 False ,
757743 )
@@ -771,8 +757,8 @@ class maximum(metaclass=PyLocalPropertyMeta):
771757 def value (self ):
772758 """Range maximum property setter."""
773759 if getattr (self , "_value" , None ) is None :
774- field_info = self .session . field_info
775- field_range = field_info . get_scalar_field_range (
760+ field_data = self .field_data
761+ field_range = field_data . scalar_fields . range (
776762 "velocity-magnitude" ,
777763 False ,
778764 )
0 commit comments