File tree Expand file tree Collapse file tree 6 files changed +15
-7
lines changed Expand file tree Collapse file tree 6 files changed +15
-7
lines changed Original file line number Diff line number Diff line change @@ -1758,6 +1758,7 @@ def virtualfile_from_stringio(
1758
1758
def virtualfile_in (
1759
1759
self ,
1760
1760
check_kind = None ,
1761
+ kind = None ,
1761
1762
data = None ,
1762
1763
x = None ,
1763
1764
y = None ,
@@ -1847,7 +1848,9 @@ def virtualfile_in(
1847
1848
)
1848
1849
mincols = 3
1849
1850
1850
- kind = data_kind (data , required = required , check_kind = check_kind )
1851
+ # Determine the data kind if not given.
1852
+ if kind is None :
1853
+ kind = data_kind (data , required = required , check_kind = check_kind )
1851
1854
_validate_data_input (
1852
1855
data = data ,
1853
1856
x = x ,
Original file line number Diff line number Diff line change @@ -128,7 +128,7 @@ def grdcut(
128
128
129
129
with Session () as lib :
130
130
with (
131
- lib .virtualfile_in (data = grid ) as vingrd ,
131
+ lib .virtualfile_in (data = grid , kind = inkind ) as vingrd ,
132
132
lib .virtualfile_out (kind = outkind , fname = outgrid ) as voutgrd ,
133
133
):
134
134
kwargs ["G" ] = voutgrd
Original file line number Diff line number Diff line change @@ -95,5 +95,5 @@ def legend(
95
95
raise GMTInvalidInput (msg )
96
96
97
97
with Session () as lib :
98
- with lib .virtualfile_in (data = spec , required = False ) as vintbl :
98
+ with lib .virtualfile_in (data = spec , required = False , kind = kind ) as vintbl :
99
99
lib .call_module (module = "legend" , args = build_arg_list (kwargs , infile = vintbl ))
Original file line number Diff line number Diff line change @@ -234,6 +234,7 @@ def plot( # noqa: PLR0912
234
234
235
235
kind = data_kind (data , check_kind = "vector" )
236
236
if kind == "empty" : # Data is given via a series of vectors.
237
+ kind = "vectors"
237
238
data = {"x" : x , "y" : y }
238
239
# Parameters for vector styles
239
240
if (
@@ -280,5 +281,5 @@ def plot( # noqa: PLR0912
280
281
kwargs ["S" ] = "s0.2c"
281
282
282
283
with Session () as lib :
283
- with lib .virtualfile_in (data = data ) as vintbl :
284
+ with lib .virtualfile_in (data = data , kind = kind ) as vintbl :
284
285
lib .call_module (module = "plot" , args = build_arg_list (kwargs , infile = vintbl ))
Original file line number Diff line number Diff line change @@ -212,6 +212,7 @@ def plot3d( # noqa: PLR0912
212
212
213
213
kind = data_kind (data , check_kind = "vector" )
214
214
if kind == "empty" : # Data is given via a series of vectors.
215
+ kind = "vectors"
215
216
data = {"x" : x , "y" : y , "z" : z }
216
217
# Parameters for vector styles
217
218
if (
@@ -259,5 +260,5 @@ def plot3d( # noqa: PLR0912
259
260
kwargs ["S" ] = "u0.2c"
260
261
261
262
with Session () as lib :
262
- with lib .virtualfile_in (data = data , mincols = 3 ) as vintbl :
263
+ with lib .virtualfile_in (data = data , mincols = 3 , kind = kind ) as vintbl :
263
264
lib .call_module (module = "plot3d" , args = build_arg_list (kwargs , infile = vintbl ))
Original file line number Diff line number Diff line change 42
42
w = "wrap" ,
43
43
)
44
44
@kwargs_to_strings (R = "sequence" , c = "sequence_comma" , p = "sequence" )
45
- def text_ ( # noqa: PLR0912
45
+ def text_ ( # noqa: PLR0912, PLR0915
46
46
self ,
47
47
textfiles : PathLike | TableLike | None = None ,
48
48
x = None ,
@@ -225,6 +225,7 @@ def text_( # noqa: PLR0912
225
225
confdict = {}
226
226
data = None
227
227
if kind == "empty" :
228
+ kind = "vectors"
228
229
data = {"x" : x , "y" : y }
229
230
230
231
for arg , flag , name in array_args :
@@ -261,7 +262,9 @@ def text_( # noqa: PLR0912
261
262
262
263
with Session () as lib :
263
264
with lib .virtualfile_in (
264
- data = textfiles or data , required = data_is_required
265
+ data = textfiles or data ,
266
+ required = data_is_required ,
267
+ kind = kind ,
265
268
) as vintbl :
266
269
lib .call_module (
267
270
module = "text" ,
You can’t perform that action at this time.
0 commit comments