exceeddata-sdk-vdata 2.10.2__tar.gz → 2.10.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata_sdk_vdata
3
- Version: 2.10.2
3
+ Version: 2.10.3
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -32,6 +32,6 @@
32
32
 
33
33
  name = 'vdata'
34
34
 
35
- __version__ = "2.10.2"
35
+ __version__ = "2.10.3"
36
36
  __author__ = 'Nick Xie'
37
37
  __credits__ = 'Smart Software for Car Technologies Inc'
@@ -25,11 +25,21 @@ class VswToBlfConverter:
25
25
  self._seekables.append(VDataByteReader( data))
26
26
  self._outputFilename = outputFilename
27
27
  self._signals = signals
28
+ self._deletedKeyFormat = None
29
+
30
+ def setDeletedKeyFormat(self, deletedKeyFormat):
31
+ '''
32
+ :param deletedKeyFormat: deletedkey format for 64k page
33
+ :return:
34
+ '''
35
+ self._deletedKeyFormat = deletedKeyFormat
28
36
 
29
37
  def convert(self, colParserFun=colParser ):
30
38
  factory = VDataReaderFactory()
31
39
  factory.setDataReaders(self._seekables)
32
40
  factory.setSignals(signals=self._signals)
41
+ if self._deletedKeyFormat is not None:
42
+ factory.setDeletedKeyFormat(self._deletedKeyFormat)
33
43
  reader = factory.open()
34
44
  vdf = reader.df()
35
45
  #print(vdf.cols)
@@ -110,11 +120,21 @@ class VswToAscConverter:
110
120
  self._seekables.append(VDataByteReader( data))
111
121
  self._outputFilename = outputFilename
112
122
  self._signals = signals
123
+ self._deletedKeyFormat = None
124
+
125
+ def setDeletedKeyFormat(self, deletedKeyFormat):
126
+ '''
127
+ :param deletedKeyFormat: deletedkey format for 64k page
128
+ :return:
129
+ '''
130
+ self._deletedKeyFormat = deletedKeyFormat
113
131
 
114
132
  def convert(self, colParserFun=colParser):
115
133
  factory = VDataReaderFactory()
116
134
  factory.setDataReaders(self._seekables)
117
135
  factory.setSignals(signals=self._signals)
136
+ if self._deletedKeyFormat is not None:
137
+ factory.setDeletedKeyFormat(self._deletedKeyFormat)
118
138
  reader = factory.open()
119
139
  vdf = reader.df()
120
140
  #print(vdf.cols)
@@ -142,18 +162,18 @@ class VswToAscConverter:
142
162
  for i in range (1, len(row)):
143
163
  #store the signal byte array for not null column data.
144
164
  #如果信号非空,则生成相应的数据
145
- if row[i] != None and isinstance(row[i], (list)) and can_info[i-1][0]!=-1:
165
+ if row[i] is not None and isinstance(row[i], (list)) and can_info[i - 1][0]!=-1:
146
166
  msg = Message(timestamp=row[0]/1000.0, channel=can_info[i-1][0]-1,arbitration_id=can_info[i-1][1],data= row[i], is_fd=True, is_extended_id =can_info[i-1][2])
147
167
  #写入ASC文件
148
168
  writer.on_message_received(msg)
149
- elif row[i] != None and isinstance(row[i], (bytes, bytearray)) and can_info[i-1][0]!=-1:
169
+ elif row[i] is not None and isinstance(row[i], (bytes, bytearray)) and can_info[i - 1][0]!=-1:
150
170
  # if length > 64, skip
151
171
  if len(row[i]) > 64:
152
172
  continue
153
173
  msg = Message(timestamp=row[0]/1000.0, channel=can_info[i-1][0]-1,arbitration_id=can_info[i-1][1],data= row[i], is_fd=True, is_extended_id =can_info[i-1][2])
154
174
  #写入ASC文件
155
175
  writer.on_message_received(msg)
156
- elif row[i] != None and can_info[i-1][0]!=-1:
176
+ elif row[i] is not None and can_info[i - 1][0]!=-1:
157
177
  data=[1]
158
178
  data[0] =row[i]
159
179
  msg = Message(timestamp=row[0]/1000.0, channel=can_info[i-1][0] -1 ,arbitration_id=can_info[i-1][1],data= data, is_fd=True, is_extended_id = can_info[i-1][2])
@@ -31,7 +31,7 @@
31
31
  # of the copyright holder.
32
32
  #
33
33
  # Author: Nick Xie
34
- # Version: 2.10.2
34
+ # Version: 2.10.3
35
35
  #
36
36
  # Note: for specification flag compatibility, it is rare that vsw uses snappy.
37
37
  # Uncomment the following if used and python-snappy is installed.
@@ -618,7 +618,7 @@ class VDataFormulaBlob:
618
618
  self._signalDecoder = None
619
619
 
620
620
  def apply(self, val):
621
- if(self._signalDecoder != None):
621
+ if self._signalDecoder is not None:
622
622
  return self._signalDecoder.decode(val)
623
623
  else:
624
624
  return val
@@ -2354,20 +2354,20 @@ class VDataSeriesDecodeBuilder(object):
2354
2354
  _subtype = (sub >> 4) & 0x0F
2355
2355
  _encoder = sub & 0x0F
2356
2356
  _offset = 32
2357
-
2357
+
2358
2358
  element_exist_array = []
2359
2359
 
2360
- if (_version > 27 ):
2361
- #for nullable element array, load null element map.
2362
- _byte_length = 2 if _length<=16 else (_length+7)//8
2363
- _offset = 32 + _byte_length *8
2364
- _bitmap = btreader.read(_offset)
2365
- for i in range(_length):
2366
- element_exist_array.append(True)
2367
- byte_index = i // 8
2368
- bit_index = 7- i % 8
2360
+ if (_version == 28):
2361
+ # for nullable element array, load null element map.
2362
+ _byte_length = 2 if _length <= 16 else (_length + 7) // 8
2363
+ _bitmap = btreader.read(_byte_length)
2364
+ _offset = 32 + _byte_length * 8
2369
2365
 
2370
- element_exist_array.append( (((_bitmap[byte_index]>> bit_index) & 0x01) == 1 ))
2366
+ for i in range(_length):
2367
+ byte_index = i // 8
2368
+ bit_index = 7 - i % 8
2369
+ val = ((_bitmap[byte_index] >> bit_index) & 0x01) == 1
2370
+ element_exist_array.append(val)
2371
2371
 
2372
2372
  else :
2373
2373
  for i in range(_length):
@@ -3724,6 +3724,8 @@ class VDataDecoder:
3724
3724
  self._buckets = None
3725
3725
  self._keys = None
3726
3726
  self._signalDecoders={}
3727
+ self._deletedKeyFormat = "DELETED_KEY_%07X"
3728
+ self._keyDescFormat = "0x%08X"
3727
3729
 
3728
3730
  def __repr__(self):
3729
3731
  if self._meta is None:
@@ -3761,6 +3763,12 @@ class VDataDecoder:
3761
3763
  def setSignalDecoders(self, signalDecoders):
3762
3764
  self._signalDecoders = signalDecoders
3763
3765
 
3766
+ def setDeletedKeyFormat(self, deletedKeyFormat):
3767
+ self._deletedKeyFormat = deletedKeyFormat
3768
+
3769
+ def setKeyDescFormat(self, keyDescFormat):
3770
+ self._keyDescFormat = keyDescFormat
3771
+
3764
3772
  def initialize(self):
3765
3773
  hasSignalFilter = len(self._signals) > 0 or len(self._prefixes) > 0
3766
3774
  formulas = {}
@@ -3785,13 +3793,13 @@ class VDataDecoder:
3785
3793
  logger.debug("file query end time: " + str(self._meta.queryEndTime()))
3786
3794
 
3787
3795
  if self._meta.getPageSize() != 0x8000:
3788
- self.readKeys()
3796
+ self.readKeys(self._deletedKeyFormat)
3789
3797
  else:
3790
3798
  self.readStfKeys()
3791
3799
 
3792
3800
  for name, key in self._keys.items():
3793
3801
  formulas[key._seriesid] = key._formula
3794
- if (self._signalDecoders !=None) & (name in self._signalDecoders):
3802
+ if (self._signalDecoders is not None) & (name in self._signalDecoders):
3795
3803
  if (isinstance(key._formula , VDataFormulaBlob)):
3796
3804
  de = self._signalDecoders[name]
3797
3805
  key._formula.setSignalDeocder(de)
@@ -3987,7 +3995,7 @@ class VDataDecoder:
3987
3995
  # Set the query range for each series of the bucket
3988
3996
  VDataBucketUtils.updateBucketQueryRange(self._buckets, self._meta, self._signalQueueMode, self._queryFilter, self._queryStartTime, self._queryEndTime)
3989
3997
 
3990
- def readKeys(self):
3998
+ def readKeys(self, deletedKeyFormat):
3991
3999
  compressMethod = self._meta._compressMethod
3992
4000
 
3993
4001
  (keysCount, length) = _struct.unpack('<ii', self._reader.read(8))
@@ -4008,7 +4016,7 @@ class VDataDecoder:
4008
4016
  b = datareader.read(1)
4009
4017
 
4010
4018
  if len(keydesc) == 0:
4011
- keydesc = f"{keyid:X}"
4019
+ keydesc = deletedKeyFormat % keyid
4012
4020
  formula = fmbulider.build(keydesc, self._insensitiveCase)
4013
4021
  sname = self.getUniqueName(self._keys, formula._name)
4014
4022
  if (sname != formula._name):
@@ -4030,7 +4038,7 @@ class VDataDecoder:
4030
4038
  for i in range (keysCount):
4031
4039
  decode.next()
4032
4040
  self._keyIds[i] = decode.get()
4033
- sname ="0x%08X"%self._keyIds[i]
4041
+ sname = self._keyDescFormat % self._keyIds[i]
4034
4042
  self._keys[sname] = VDataSeriesSpec(sname, self._keyIds[i] , VDataFormulaNone(sname), '')
4035
4043
 
4036
4044
 
@@ -4789,6 +4797,8 @@ class VDataReaderFactory:
4789
4797
  self._columnExpandMode = None
4790
4798
  self._signalQueueMode = None
4791
4799
  self._signalDecoders = {}
4800
+ self._deletedKeyFormat = "DELETED_KEY_%07X"
4801
+ self._keyDescFormat = "0x%08X"
4792
4802
 
4793
4803
  def setDataReaders(self, readers):
4794
4804
  '''
@@ -4896,6 +4906,19 @@ class VDataReaderFactory:
4896
4906
  '''
4897
4907
  self._signalDecoders = signalDecoders
4898
4908
 
4909
+ def setDeletedKeyFormat(self, deletedKeyFormat):
4910
+ '''
4911
+ :param deletedKeyFormat: deletedkey format for 64k page
4912
+ :return:
4913
+ '''
4914
+ self._deletedKeyFormat = deletedKeyFormat
4915
+
4916
+ def setKeyDescFormat(self, keyDescFormat):
4917
+ """
4918
+ :param keyDescFormat: key desc format for 32k page
4919
+ """
4920
+ self._keyDescFormat = keyDescFormat
4921
+
4899
4922
  def open(self):
4900
4923
  '''
4901
4924
  Create the data reader.
@@ -4903,7 +4926,7 @@ class VDataReaderFactory:
4903
4926
  Returns:
4904
4927
  VDataReader
4905
4928
  '''
4906
- return VDataReader(self._readers, self._signals, self._insensitiveCase, self._queryFilter, self._queryStartTime, self._queryEndTime, self._readLivingData, self._columnExpandMode, self._signalQueueMode, self._signalDecoders)
4929
+ return VDataReader(self._readers, self._signals, self._insensitiveCase, self._queryFilter, self._queryStartTime, self._queryEndTime, self._readLivingData, self._columnExpandMode, self._signalQueueMode, self._signalDecoders, self._deletedKeyFormat, self._keyDescFormat)
4907
4930
 
4908
4931
  class VDataReader:
4909
4932
  '''
@@ -4914,7 +4937,7 @@ class VDataReader:
4914
4937
  >>> frame = reader.df()
4915
4938
  '''
4916
4939
 
4917
- def __init__(self, readers, signals=None, insensitiveCase=False, queryFilter=True, queryStartTime=0, queryEndTime=0, readLivingData=True, columnExpandMode=None, signalQueueMode=None, signalDecoders={}):
4940
+ def __init__(self, readers, signals=None, insensitiveCase=False, queryFilter=True, queryStartTime=0, queryEndTime=0, readLivingData=True, columnExpandMode=None, signalQueueMode=None, signalDecoders={}, deletedKeyFormat="DELETED_KEY_%07X", keyDescFormat = "0x%08X"):
4918
4941
  '''
4919
4942
  The constructor for data reader. Deprecated since 2.7.1. Use VDataReaderFactory instead.
4920
4943
 
@@ -4939,6 +4962,8 @@ class VDataReader:
4939
4962
  self._livingDataBuffer = 1000 #1000ms buffer
4940
4963
  self._signalDecoders = signalDecoders
4941
4964
  self.metas =[]
4965
+ self._deletedKeyFormat = deletedKeyFormat
4966
+ self._keyDescFormat = keyDescFormat
4942
4967
  buckets = []
4943
4968
 
4944
4969
  livingData = readLivingData
@@ -4959,6 +4984,8 @@ class VDataReader:
4959
4984
  decoder.setColumnExpandMode(self._columnExpandMode)
4960
4985
  decoder.setSignalQueueMode(self._signalQueueMode)
4961
4986
  decoder.setSignalDecoders(signalDecoders)
4987
+ decoder.setDeletedKeyFormat(self._deletedKeyFormat)
4988
+ decoder.setKeyDescFormat(self._keyDescFormat)
4962
4989
  decoder.initialize()
4963
4990
  VDataDecodeUtils.sortAddDecoder(self._decoders, decoder)
4964
4991
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.10.2
3
+ Version: 2.10.3
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -33,7 +33,7 @@
33
33
  from setuptools import setup
34
34
 
35
35
  setup(name='exceeddata_sdk_vdata',
36
- version='2.10.2',
36
+ version='2.10.3',
37
37
  description='ExceedData vData SDK for Python',
38
38
  url='http://www.smartsct.com',
39
39
  author='Nick Xie',