fixes in dsiDCC ser/deser

bokehCouchDBDCCTool.py

@@ -309,8 +309,8 @@ class SensorCalibrationData:
                                     open(FileName, "rb").read())
 
 if __name__=='__main__':
-    xlsFileName = 'sampledata/ERGEBNISS_sheets/20220708_8305_SN1864992_Auswertung.xlsx'
-    calPDFFileName = 'sampledata/ERGEBNISS_sheets/20220708_8305_SN1864992_CalSchein.pdf'
+    xlsFileName = '1_7calibrationanddccsampledata/ERGEBNISS_sheets/sinCal/20220708_8305_SN1864992_Auswertung.xlsx'
+    calPDFFileName = '1_7calibrationanddccsampledata/ERGEBNISS_sheets/sinCal/20220708_8305_SN1864992_CalSchein.pdf'
     #(xlsFileName, deviceType: str, serialNo: str, owner: str, operator: str, type: str, date=None):
     callData=SensorCalibrationData(xlsFileName,'Brueel & Kjaer 8305-001',"1502245","Customer Company","D. Nordmann","Acceleration sensor Transferfunction 1D",None)
     calDatadsiMultiVector=callData.toDsiMultiVector()
@@ -381,7 +381,7 @@ if __name__=='__main__':
     caldataDBEntry=callData.uploadDataAndAttachemntsToCouchDB(CDBA.db)
     print(caldataDBEntry)
     dccDict=caldataDBEntry.copy()
-    callData.uploadDUMYDCCXML('sampledata/dcc-vacuumlab-CDG.xml')
+    callData.uploadDUMYDCCXML('1_7calibrationanddccsampledata/dcc-vacuumlab-CDG.xml')
     callData.uploadAttachmentFile(calPDFFileName)
     # Check that the document exists in the database
     #if userDocument.exists():

pccDccTools.py

@@ -417,17 +417,19 @@ class dsiInterpolator:
 
 class dsiDCC:
 
-    def __init__(self,calDatamultVector:dsiMultiVector,deviceType:str,serialNo:str,owner:str,operator:str,type:str,date: datetime.datetime=None):
+    def __init__(self,calibrationData:dsiMultiVector,deviceType:str,serialNo:str,owner:str,operator:str,calibrationType:str,date: datetime.datetime=None):
         self.dataType = self.__class__.__name__
-        self.dsitoolsVersion=DSITOOLSVERSION
-        self.calibrationData=calDatamultVector
+        self.dsiToolsVersion=DSITOOLSVERSION
+        self.calibrationData=calibrationData
         self.deviceType=deviceType
         self.serialNo=serialNo
         self.owner=owner
         if date==None:
             self.date=datetime.datetime.now()
+        else:
+            self.date=date
         self.operator=operator
-        self.calibrationtype=type
+        self.calibrationType=calibrationType
         id_raw=self.date.isoformat()+'_'+str(self.deviceType)+'_'+str(self.serialNo)
         strReplacementMapping=[(' ','_'),('\t','_'),('\n','_'),('\r',' ')]
         for k,v in strReplacementMapping:
@@ -445,13 +447,20 @@ class dsiDCC:
     def fromdict(cls, dict:dict)->dsiDCC:
         if checkDSiToolsVersionCompatibility(dict['dsiToolsVersion'])==False:
             raise ValueError("Incompatible DSI Tools Versions JSONData/This Software"+str(dict['dsiToolsVersion'])+' / '+str(DSITOOLSVERSION))
-        dsiMultiVector=dsiMultiVector.fromDict(dict['calDatamultVector'])
-        date=datetime.datetime.fromisoformat(dict['data'])
-        instance=dsiDCC(dsiMultiVector,dict['deviceType'],dict['serialNo'],dict['owner'],dict['operator'],dict['type'],date)
+        loadedCalibrationData=dsiMultiVector.fromJson(dict['calibrationData'])
+        date=datetime.datetime.fromisoformat(dict['date'])
+        instance=dsiDCC(loadedCalibrationData,dict['deviceType'],dict['serialNo'],dict['owner'],dict['operator'],dict['calibrationType'],date)
         #TODO change interpolator handling
-        additionalkeys = dict.keys() - set(['deviceType','serialNo','owner','operator','type','date','calDatamultVector'])
+        additionalkeys = dict.keys() - set(['deviceType','serialNo','owner','operator','calibrationType','calibrationData','date'])
         for key in additionalkeys:
             instance.__dict__[key] = dict[key]
         return instance
 
+    @classmethod
+    def fromJson(cls,jsonString):
+        dict=json.loads(jsonString)
+        print(dict)
+        return cls.fromdict(dict)
+
+
 

pyDCCTestAndExamples.py

@@ -45,5 +45,5 @@ if __name__ == "__main__":
     tmp=testMultVector['Phase'].jsonDumps()
     multiVewctrorDump = testMultVector.jsonDumps()
     print(multiVewctrorDump)
-    reconstructedMultiVector=dsiMultiVector.fromjson(multiVewctrorDump)
+    reconstructedMultiVector=dsiMultiVector.fromJson(multiVewctrorDump)
     print(reconstructedMultiVector['Phase',1.25])