Changeset dd56945
- Timestamp:
- 10/30/18 14:31:57 (6 years ago)
- Branches:
- master, pympi
- Children:
- c8c291b
- Parents:
- 22c1c0a
- git-author:
- Hal Finkel <hfinkel@…> (10/30/18 14:31:57)
- git-committer:
- Hal Finkel <hfinkel@…> (10/30/18 14:31:57)
- Location:
- python
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
python/genericio.py
rbe75350 rdd56945 57 57 libpygio.get_variable_field_count.argtypes=[ct.c_char_p,ct.c_char_p] 58 58 59 libpygio.read_gio_uint16.restype=None 60 libpygio.read_gio_uint16.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_uint16),ct.c_int] 61 59 62 libpygio.read_gio_int32.restype=None 60 63 libpygio.read_gio_int32.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_int),ct.c_int] … … 83 86 return 84 87 elif(var_type==9): 85 print("variable type not known (not int32/int64/float/double)")88 print("variable type not known (not uint16/int32/int64/float/double)") 86 89 elif(var_type==0): 87 90 #float … … 104 107 libpygio.read_gio_int64(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_int64)),field_count) 105 108 return result 109 elif(var_type==4): 110 #uint16 111 result = np.ndarray((var_size,field_count),dtype=np.uint16) 112 libpygio.read_gio_uint16(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_uint16)),field_count) 113 return result 106 114 107 115 def gio_has_variable(file_name,var_name): -
python/lib/gio.cxx
r9796d0a rdd56945 49 49 read_gio<double>(file_name,var_name,data,field_count); 50 50 } 51 void read_gio_uint16(char* file_name, char* var_name, uint16_t* data, int field_count){ 52 read_gio<uint16_t>(file_name,var_name,data,field_count); 53 } 51 54 void read_gio_int32(char* file_name, char* var_name, int* data, int field_count){ 52 55 read_gio<int>(file_name,var_name,data,field_count); … … 81 84 else if(vinfo.IsFloat && vinfo.ElementSize == 8) 82 85 return double_type; 86 else if(!vinfo.IsFloat && vinfo.ElementSize == 2) 87 return uint16_type; 83 88 else if(!vinfo.IsFloat && vinfo.ElementSize == 4) 84 89 return int32_type; -
python/lib/gio.h
r9796d0a rdd56945 73 73 extern "C" void read_gio_float (char* file_name, char* var_name, float* data, int field_count); 74 74 extern "C" void read_gio_double(char* file_name, char* var_name, double* data, int field_count); 75 extern "C" void read_gio_uint16 (char* file_name, char* var_name, uint16_t* data, int field_count); 75 76 extern "C" void read_gio_int32 (char* file_name, char* var_name, int* data, int field_count); 76 77 extern "C" void read_gio_int64 (char* file_name, char* var_name, int64_t* data, int field_count); … … 80 81 int32_type=2, 81 82 int64_type=3, 83 uint16_type=4, 82 84 type_not_found=9, 83 85 var_not_found=10
Note: See TracChangeset
for help on using the changeset viewer.