@trebco/treb 29.4.1 → 29.5.1

package/treb-export/src/drawing2/chart2.ts

@@ -19,8 +19,6 @@
  * 
  */
 
-// import * as ElementTree from 'elementtree';
-// import { Element, ElementTree as Tree } from 'elementtree';
 import type { UnitAddress, UnitRange, UnitLiteral, ExpressionUnit } from 'treb-parser';
 
 import { static_title, ref_title, chart_template } from './chart-template-components2';
@@ -29,18 +27,6 @@ import { donut_json } from './donut-chart-template2';
 import { scatter_json, scatter_series } from './scatter-chart-template2';
 import { bubble_json, bubble_series } from './bubble-chart-template';
 
-import { XMLUtils } from '../xml-utils';
-
-/*
-import { donut_json } from './donut-chart-template';
-import { static_title, ref_title, chart_template } from './chart-template-components';
-import { column_json, column_series } from './column-chart-template';
-import { scatter_json, scatter_series } from './scatter-chart-template';
-import { scatter_series as scatter2_series } from './scatter2-chart-template';
-*/
-
-// import { v4 as uuidv4 } from 'uuid';
-
 import { Localization } from 'treb-base-types';
 import type { RelationshipMap } from '../relationship';
 
@@ -73,31 +59,27 @@ export class Chart {
       type: 'literal', value: '',
     };
 
-    // const CC = this.FindNode('c:chart', obj);
-    // if (CC) {
-      if (unit && unit.type === 'literal') {
-        const title = JSON.parse(JSON.stringify(static_title));
-        //const AP = this.FindNode('a:p', title);
-        const AP = title['c:tx']['c:rich']['a:p'];
-
-        AP['a:r'] = {
-          'a:rPr': {
-            a$: {
-              lang: Localization.locale,
-            },
+    if (unit && unit.type === 'literal') {
+      const title = JSON.parse(JSON.stringify(static_title));
+      const AP = title['c:tx']['c:rich']['a:p'];
+
+      AP['a:r'] = {
+        'a:rPr': {
+          a$: {
+            lang: Localization.locale,
           },
-          'a:t': unit.value,
-        };
-        chartnode['c:title'] = title;
-      }
-      else if (unit) {
-        const title = JSON.parse(JSON.stringify(ref_title));
-        //const CF = title['c:tx']['c:strRef']['c:f'];
-        //CF.t$ = unit.label;
-        title['c:tx']['c:strRef']['c:f'] = unit.label;
-        chartnode['c:title'] = title;
-      }
-    //}
+        },
+        'a:t': unit.value,
+      };
+      chartnode['c:title'] = title;
+    }
+    else if (unit) {
+      const title = JSON.parse(JSON.stringify(ref_title));
+      //const CF = title['c:tx']['c:strRef']['c:f'];
+      //CF.t$ = unit.label;
+      title['c:tx']['c:strRef']['c:f'] = unit.label;
+      chartnode['c:title'] = title;
+    }
 
   }
 

package/treb-export/src/drawing2/drawing2.ts

@@ -25,6 +25,7 @@ import type { ChartOptions} from './chart2';
 import { Chart} from './chart2';
 import type { RelationshipMap} from '../relationship';
 import { AddRel } from '../relationship';
+import type { DOMContent } from '../xml-utils';
 
 const pixel_offset = 9525;
 
@@ -194,65 +195,6 @@ export class Drawing {
               },
             },
 
-            /* 
-      <xdr:nvPicPr>
-        <xdr:cNvPr id="3" name="Graphic 2">
-          <a:extLst>
-            <a:ext uri="{FF2B5EF4-FFF2-40B4-BE49-F238E27FC236}">
-              <a16:creationId xmlns:a16="http://schemas.microsoft.com/office/drawing/2014/main" id="{9BA0B4E8-3DD4-4297-8733-48C3F5D063BA}"/>
-            </a:ext>
-          </a:extLst>
-        </xdr:cNvPr>
-        <xdr:cNvPicPr>
-          <a:picLocks noChangeAspect="1"/>
-        </xdr:cNvPicPr>
-      </xdr:nvPicPr>
-      
-      <xdr:blipFill>
-
-            [ this one is svg]
-
-        <a:blip xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:embed="rId1">
-          <a:extLst>
-            <a:ext uri="{28A0092B-C50C-407E-A947-70E740481C1C}">
-              <a14:useLocalDpi xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main" val="0"/>
-            </a:ext>
-            <a:ext uri="{96DAC541-7B7A-43D3-8B79-37D633B846F1}">
-              <asvg:svgBlip xmlns:asvg="http://schemas.microsoft.com/office/drawing/2016/SVG/main" r:embed="rId2"/>
-            </a:ext>
-          </a:extLst>
-        </a:blip>
-
-            [alt]
-
-        <a:blip xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:embed="rId3">
-          <a:extLst>
-            <a:ext uri="{28A0092B-C50C-407E-A947-70E740481C1C}">
-              <a14:useLocalDpi xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main" val="0"/>
-            </a:ext>
-          </a:extLst>
-        </a:blip>
-
-
-        <a:stretch>
-          <a:fillRect/>
-        </a:stretch>
-      </xdr:blipFill>
-
-      <xdr:spPr>
-        <a:xfrm>
-          <a:off x="0" y="0"/>
-          <a:ext cx="4057650" cy="6172200"/>
-        </a:xfrm>
-        <a:prstGeom prst="rect">
-          <a:avLst/>
-        </a:prstGeom>
-      </xdr:spPr>
-
-
-            */
-
-
           },
           'xdr:clientData': {},
         };
@@ -268,16 +210,6 @@ export class Drawing {
             'xdr:nvGraphicFramePr': {
               'xdr:cNvPr': {
                 a$: { id: chart.chart.index + 1, name: `Chart ${chart.chart.index}`, },
-                /*
-                'a:extLst': {
-                  'a:ext': {
-                    a$: { uri: '{FF2B5EF4-FFF2-40B4-BE49-F238E27FC236}' },
-                    'a16:creationId': {
-                      a$: { 'xmlns:a16': 'http://schemas.microsoft.com/office/drawing/2014/main' },
-                    },
-                  },
-                },
-                */
               },
               'xdr:cNvGraphicFramePr': {},
             },
@@ -303,7 +235,7 @@ export class Drawing {
         return block;
       });
 
-    const dom: any = {
+    const dom: DOMContent = {
       'xdr:wsDr': {
         a$: {
           'xmlns:xdr': 'http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing',
@@ -317,41 +249,4 @@ export class Drawing {
 
   }
 
-  /*
-  public GetDrawingXML() {
-    const components: string[] = [`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<xdr:wsDr xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">`];
-
-    for (let i = 0; i < this.charts.length; i++) {
-
-      const index = i + 1;
-      const anchor = this.charts[i].anchor;
-
-      components.push(
-        `<xdr:twoCellAnchor><xdr:from><xdr:col>${anchor.from.column}</xdr:col><xdr:colOff>${(anchor.from.column_offset || 0) * pixel_offset}</xdr:colOff>`
-        + `<xdr:row>${anchor.from.row}</xdr:row><xdr:rowOff>${(anchor.from.row_offset || 0) * pixel_offset}</xdr:rowOff></xdr:from>`
-        + `<xdr:to><xdr:col>${anchor.to.column}</xdr:col><xdr:colOff>${(anchor.to.column_offset || 0) * pixel_offset}</xdr:colOff>`
-        + `<xdr:row>${anchor.to.row}</xdr:row><xdr:rowOff>${(anchor.to.row_offset || 0) * pixel_offset}</xdr:rowOff></xdr:to>`
-        + `<xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="${index + 1}" name="Chart ${index}"><a:extLst><a:ext uri="{FF2B5EF4-FFF2-40B4-BE49-F238E27FC236}"><a16:creationId xmlns:a16="http://schemas.microsoft.com/office/drawing/2014/main" id="{9948BDEE-44B2-4E72-83C8-2C9C56F04EAA}"/></a:ext></a:extLst></xdr:cNvPr><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="rId${index}"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor>`
-      );
-
-    }
-    components.push(`</xdr:wsDr>`);
-    return components.join('');
-  }
-
-  public GetDrawingRels() {
-    const components: string[] = [ `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">`];
-
-    for (let i = 0; i < this.charts.length; i++) {
-      const index = i + 1;
-      const chart = this.charts[i].chart;
-      components.push(
-        `<Relationship Id="rId${index}" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart" Target="../charts/chart${chart.index}.xml"/>`);
-    }
-
-    components.push(`</Relationships>`);
-    return components.join('');
-  }
-  */
-
 }

package/treb-export/src/export-worker/export-worker.ts

@@ -22,7 +22,7 @@
 import type { ImportedSheetData } from 'treb-base-types';
 import type { SerializedModel } from 'treb-data-model';
 
-import { Exporter } from '../export2';
+import { Exporter } from '../export';
 import { Importer } from '../import2';
 
 const ctx: Worker = self as unknown as Worker;