Update dxf__omar3_2.py

dxf__omar3_2.py

@@ -446,12 +446,8 @@ def save_multiple_annotations_bax(annotations, output_path, column_order,pdfWidt
         Resource = SubElement(GlobalResources, 'Resource')
         SubElement(Resource, 'ID').text = scale
         SubElement(Resource, 'Raw').text = '789c85d04f0b82401005f0af3247bd34a35176b085503c55847f22a80e2a4b7858ad7537e8dba7951ea2a5e330efc783e7fb983eae1c373c6fb5e498e842f577bcc6d872a014b00407848d87e310dd6a5170193552e40a33abfb0540139ace5ccff316188243844962d98c9d3134b297eba2f4255626d1dee06d3e200a4149cd47989ae0c99dd32fb8ebe0a8f7265dea3fb5b9bc7095d5950a9aface655b3575bf070d8b30f604438f6873'
-    # pretty_xml = parseString(tostring(doc)).toprettyxml(indent="  ")
-    pretty_xml= tostring(doc, encoding="unicode", method="xml") #tostring(doc, encoding="utf-8", method="xml").decode("utf-8")
-        # Bax: send as plain string (no base64, no prettyxml to avoid linebreaks)
-    # xml = tostring(doc, encoding="utf-8", method="xml").decode("utf-8")
-    # print(f" Saved {len(annotations)} annotations to {output_path}")
-    return pretty_xml
+    bax_xml= tostring(doc, encoding="unicode", method="xml") #tostring(doc, encoding="utf-8", method="xml").decode("utf-8")
+    return bax_xml
 """PDF to image"""
 
 def pdftoimg(datadoc,pdf_content=0):
@@ -2528,7 +2524,7 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,pdfpath=0,pdfna
 # save_multiple_annotations_bax(
 #     bax_annotations, 'Area_Perimeter_OMAR_output.bax', column_order, pdfWidth, pdfHeight
 # )
-  pretty_xml=save_multiple_annotations_bax(
+  bax_xml=save_multiple_annotations_bax(
     annotations, 'FF-Ceiling.bax', column_order, pdfWidth, pdfHeight
   )
 
@@ -2589,7 +2585,7 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,pdfpath=0,pdfna
             list1.loc[len(list1)] =[annot.info['content'],annot.info['id'],annot.info['subject'],[x,y,z]]
   print('LISTTT',list1)
 #   print(pretty_xml,column_xml)
-  return doc2,image_new1, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas, pretty_xml, column_xml
+  return doc2,image_new1, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas, bax_xml, column_xml
 
   # doc.save('Testing(2.7).pdf')
   # return doc,image_new1#, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas