@trebco/treb 28.10.5 → 28.13.2

package/treb-export/src/drawing2/bubble-chart-template.ts

@@ -0,0 +1,553 @@
+/*
+ * This file is part of TREB.
+ *
+ * TREB is free software: you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation, either version 3 of the License, or (at your option) any 
+ * later version.
+ *
+ * TREB is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along 
+ * with TREB. If not, see <https://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2022-2024 trebco, llc. 
+ * info@treb.app
+ * 
+ */
+
+export const bubble_json = 
+{
+    'c:title': {},
+    'c:autoTitleDeleted': {
+      a$: {
+        'val': '0'
+      }
+    },
+    'c:plotArea': {
+      'c:layout': {},
+      'c:bubbleChart': {
+        'c:varyColors': {
+          a$: {
+            'val': '0'
+          }
+        },
+        'c:ser': [],
+        'c:dLbls': {
+          'c:showLegendKey': {
+            a$: {
+              'val': '0'
+            }
+          },
+          'c:showVal': {
+            a$: {
+              'val': '0'
+            }
+          },
+          'c:showCatName': {
+            a$: {
+              'val': '0'
+            }
+          },
+          'c:showSerName': {
+            a$: {
+              'val': '0'
+            }
+          },
+          'c:showPercent': {
+            a$: {
+              'val': '0'
+            }
+          },
+          'c:showBubbleSize': {
+            a$: {
+              'val': '0'
+            }
+          }
+        },
+        'c:axId': [
+          {
+            a$: {
+              'val': '2028657983'
+            }
+          },
+          {
+            a$: {
+              'val': '2023395087'
+            }
+          }
+        ]
+      },
+      'c:valAx': [
+        {
+          'c:axId': {
+            a$: {
+              'val': '2028657983'
+            }
+          },
+          'c:scaling': {
+            'c:orientation': {
+              a$: {
+                'val': 'minMax'
+              }
+            }
+          },
+          'c:delete': {
+            a$: {
+              'val': '0'
+            }
+          },
+          'c:axPos': {
+            a$: {
+              'val': 'b'
+            }
+          },
+          'c:majorGridlines': {
+            'c:spPr': {
+              'a:ln': {
+                a$: {
+                  'w': '9525',
+                  'cap': 'flat',
+                  'cmpd': 'sng',
+                  'algn': 'ctr'
+                },
+                'a:solidFill': {
+                  'a:schemeClr': {
+                    a$: {
+                      'val': 'tx1'
+                    },
+                    'a:lumMod': {
+                      a$: {
+                        'val': '15000'
+                      }
+                    },
+                    'a:lumOff': {
+                      a$: {
+                        'val': '85000'
+                      }
+                    }
+                  }
+                },
+                'a:round': {}
+              },
+              'a:effectLst': {}
+            }
+          },
+          'c:majorTickMark': {
+            a$: {
+              'val': 'none'
+            }
+          },
+          'c:minorTickMark': {
+            a$: {
+              'val': 'none'
+            }
+          },
+          'c:tickLblPos': {
+            a$: {
+              'val': 'nextTo'
+            }
+          },
+          'c:spPr': {
+            'a:noFill': {},
+            'a:ln': {
+              a$: {
+                'w': '9525',
+                'cap': 'flat',
+                'cmpd': 'sng',
+                'algn': 'ctr'
+              },
+              'a:solidFill': {
+                'a:schemeClr': {
+                  a$: {
+                    'val': 'tx1'
+                  },
+                  'a:lumMod': {
+                    a$: {
+                      'val': '25000'
+                    }
+                  },
+                  'a:lumOff': {
+                    a$: {
+                      'val': '75000'
+                    }
+                  }
+                }
+              },
+              'a:round': {}
+            },
+            'a:effectLst': {}
+          },
+          'c:txPr': {
+            'a:bodyPr': {
+              a$: {
+                'rot': '-60000000',
+                'spcFirstLastPara': '1',
+                'vertOverflow': 'ellipsis',
+                'vert': 'horz',
+                'wrap': 'square',
+                'anchor': 'ctr',
+                'anchorCtr': '1'
+              }
+            },
+            'a:lstStyle': {},
+            'a:p': {
+              'a:pPr': {
+                'a:defRPr': {
+                  a$: {
+                    'sz': '900',
+                    'b': '0',
+                    'i': '0',
+                    'u': 'none',
+                    'strike': 'noStrike',
+                    'kern': '1200',
+                    'baseline': '0'
+                  },
+                  'a:solidFill': {
+                    'a:schemeClr': {
+                      a$: {
+                        'val': 'tx1'
+                      },
+                      'a:lumMod': {
+                        a$: {
+                          'val': '65000'
+                        }
+                      },
+                      'a:lumOff': {
+                        a$: {
+                          'val': '35000'
+                        }
+                      }
+                    }
+                  },
+                  'a:latin': {
+                    a$: {
+                      'typeface': '+mn-lt'
+                    }
+                  },
+                  'a:ea': {
+                    a$: {
+                      'typeface': '+mn-ea'
+                    }
+                  },
+                  'a:cs': {
+                    a$: {
+                      'typeface': '+mn-cs'
+                    }
+                  }
+                }
+              },
+              'a:endParaRPr': {
+                a$: {
+                  'lang': 'en-US'
+                }
+              }
+            }
+          },
+          'c:crossAx': {
+            a$: {
+              'val': '2023395087'
+            }
+          },
+          'c:crosses': {
+            a$: {
+              'val': 'autoZero'
+            }
+          },
+          'c:crossBetween': {
+            a$: {
+              'val': 'midCat'
+            }
+          }
+        },
+        {
+          'c:axId': {
+            a$: {
+              'val': '2023395087'
+            }
+          },
+          'c:scaling': {
+            'c:orientation': {
+              a$: {
+                'val': 'minMax'
+              }
+            }
+          },
+          'c:delete': {
+            a$: {
+              'val': '0'
+            }
+          },
+          'c:axPos': {
+            a$: {
+              'val': 'l'
+            }
+          },
+          'c:majorGridlines': {
+            'c:spPr': {
+              'a:ln': {
+                a$: {
+                  'w': '9525',
+                  'cap': 'flat',
+                  'cmpd': 'sng',
+                  'algn': 'ctr'
+                },
+                'a:solidFill': {
+                  'a:schemeClr': {
+                    a$: {
+                      'val': 'tx1'
+                    },
+                    'a:lumMod': {
+                      a$: {
+                        'val': '15000'
+                      }
+                    },
+                    'a:lumOff': {
+                      a$: {
+                        'val': '85000'
+                      }
+                    }
+                  }
+                },
+                'a:round': {}
+              },
+              'a:effectLst': {}
+            }
+          },
+          'c:numFmt': {
+            a$: {
+              'formatCode': '0.00',
+              'sourceLinked': '1'
+            }
+          },
+          'c:majorTickMark': {
+            a$: {
+              'val': 'none'
+            }
+          },
+          'c:minorTickMark': {
+            a$: {
+              'val': 'none'
+            }
+          },
+          'c:tickLblPos': {
+            a$: {
+              'val': 'nextTo'
+            }
+          },
+          'c:spPr': {
+            'a:noFill': {},
+            'a:ln': {
+              a$: {
+                'w': '9525',
+                'cap': 'flat',
+                'cmpd': 'sng',
+                'algn': 'ctr'
+              },
+              'a:solidFill': {
+                'a:schemeClr': {
+                  a$: {
+                    'val': 'tx1'
+                  },
+                  'a:lumMod': {
+                    a$: {
+                      'val': '25000'
+                    }
+                  },
+                  'a:lumOff': {
+                    a$: {
+                      'val': '75000'
+                    }
+                  }
+                }
+              },
+              'a:round': {}
+            },
+            'a:effectLst': {}
+          },
+          'c:txPr': {
+            'a:bodyPr': {
+              a$: {
+                'rot': '-60000000',
+                'spcFirstLastPara': '1',
+                'vertOverflow': 'ellipsis',
+                'vert': 'horz',
+                'wrap': 'square',
+                'anchor': 'ctr',
+                'anchorCtr': '1'
+              }
+            },
+            'a:lstStyle': {},
+            'a:p': {
+              'a:pPr': {
+                'a:defRPr': {
+                  a$: {
+                    'sz': '900',
+                    'b': '0',
+                    'i': '0',
+                    'u': 'none',
+                    'strike': 'noStrike',
+                    'kern': '1200',
+                    'baseline': '0'
+                  },
+                  'a:solidFill': {
+                    'a:schemeClr': {
+                      a$: {
+                        'val': 'tx1'
+                      },
+                      'a:lumMod': {
+                        a$: {
+                          'val': '65000'
+                        }
+                      },
+                      'a:lumOff': {
+                        a$: {
+                          'val': '35000'
+                        }
+                      }
+                    }
+                  },
+                  'a:latin': {
+                    a$: {
+                      'typeface': '+mn-lt'
+                    }
+                  },
+                  'a:ea': {
+                    a$: {
+                      'typeface': '+mn-ea'
+                    }
+                  },
+                  'a:cs': {
+                    a$: {
+                      'typeface': '+mn-cs'
+                    }
+                  }
+                }
+              },
+              'a:endParaRPr': {
+                a$: {
+                  'lang': 'en-US'
+                }
+              }
+            }
+          },
+          'c:crossAx': {
+            a$: {
+              'val': '2028657983'
+            }
+          },
+          'c:crosses': {
+            a$: {
+              'val': 'autoZero'
+            }
+          },
+          'c:crossBetween': {
+            a$: {
+              'val': 'midCat'
+            }
+          }
+        }
+      ],
+      'c:spPr': {
+        'a:noFill': {},
+        'a:ln': {
+          'a:noFill': {}
+        },
+        'a:effectLst': {}
+      }
+    },
+    'c:plotVisOnly': {
+      a$: {
+        'val': '1'
+      }
+    },
+    'c:dispBlanksAs': {
+      a$: {
+        'val': 'gap'
+      }
+    },
+    'c:extLst': {
+      'c:ext': {
+        a$: {
+          'uri': '{56B9EC1D-385E-4148-901F-78D8002777C0}',
+          'xmlns:c16r3': 'http://schemas.microsoft.com/office/drawing/2017/03/chart'
+        },
+        'c16r3:dataDisplayOptions16': {
+          'c16r3:dispNaAsBlank': {
+            a$: {
+              'val': '1'
+            }
+          }
+        }
+      }
+    },
+    'c:showDLblsOverMax': {
+      a$: {
+        'val': '0'
+      }
+    }
+};
+
+export const bubble_series = {
+
+  'c:spPr': {
+    'a:solidFill': {
+      'a:schemeClr': {
+        a$: {
+          val: 'accent1',
+        },
+        'a:alpha': {
+          a$: {
+            val: '75000',
+          },
+        },
+      },
+    },
+    'a:ln': {
+      'a:noFill': {},
+    },
+    'a:effectLst': {},
+  },
+
+  'c:xVal': {
+    'c:numRef': {
+      'c:f': '',
+    }
+  },
+
+  'c:yVal': {
+    'c:numRef': {
+      'c:f': '',
+    }
+  },
+
+  'c:bubbleSize': {
+    'c:numRef': {
+      'c:f': '',
+    }
+  },
+
+  'c:bubble3D': {
+    a$: {
+      val: '0',
+    }
+  },
+
+  'c:extLst': {
+    'c:ext': {
+      a$: {
+        'uri': '{C3380CC4-5D6E-409C-BE32-E72D297353CC}',
+        'xmlns:c16': 'http://schemas.microsoft.com/office/drawing/2014/chart'
+      },
+      'c16:uniqueId': {
+        a$: {
+          'val': '{00000000-03D7-43A5-9DAB-5775FFEF9C03}'
+        }
+      }
+    }
+  }
+
+}

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

@@ -27,6 +27,7 @@ import { static_title, ref_title, chart_template } from './chart-template-compon
 import { column_json, column_series } from './column-chart-template2';
 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';
 
@@ -44,11 +45,12 @@ import { Localization } from 'treb-base-types';
 import type { RelationshipMap } from '../relationship';
 
 export interface ChartOptions {
-  type: 'donut'|'column'|'bar'|'scatter'|'scatter2';
+  type: 'donut'|'column'|'bar'|'scatter'|'scatter2' | 'bubble';
   title?: UnitLiteral | UnitAddress;
   data: UnitRange[];
   labels?: UnitRange;
   labels2?: UnitRange[];
+  labels3?: UnitRange[];
   names?: ExpressionUnit[];
   smooth?: boolean;
 }
@@ -110,6 +112,9 @@ export class Chart {
       case 'scatter2':
         return this.CreateScatterChart();
 
+      case 'bubble':
+        return this.CreateBubbleChart();
+        
       case 'donut':
         return this.CreateDonutChart();
 
@@ -121,6 +126,84 @@ export class Chart {
 
   }
 
+  public CreateBubbleChart() {
+
+    const template = JSON.parse(JSON.stringify(chart_template)); 
+    const chartspace = template['c:chartSpace'];
+    const bubble = JSON.parse(JSON.stringify(bubble_json)); 
+
+    chartspace['c:chart'] = bubble;
+
+    this.UpdateChartTitle(chartspace['c:chart']);
+
+    const cser = chartspace['c:chart']['c:plotArea']['c:bubbleChart']['c:ser']; // this.FindNode('c:ser', template);
+
+    let legend = false;
+
+    for (let i = 0; i < this.options.data.length; i++) {
+
+      const series = JSON.parse(JSON.stringify(bubble_series));
+
+      series['c:idx'] = { a$: { val: i.toString() }};
+      series['c:order'] = { a$: { val: i.toString() }};
+
+      if (this.options.names && this.options.names[i]) {
+
+        const name = this.options.names[i];
+        switch (name.type) {
+          case 'literal':
+            series['c:tx'] = {
+              'c:v': name.value.toString(),
+            };
+            legend = true;
+            break;
+
+          case 'range':
+          case 'address':
+            series['c:tx'] = {
+              'c:strRef': {
+                'c:f': name.label,
+              }
+            };
+            legend = true;
+            break;
+        }
+      }
+
+      // "accent7" will break 
+
+      if (i < 6) {
+        series['c:spPr']['a:solidFill']['a:schemeClr'].a$['val'] = `accent${i+1}`;
+      }
+
+      series['c:yVal']['c:numRef']['c:f'] = this.options.data[i]?.label;
+
+      if (this.options.labels2 && this.options.labels2[i]) {
+        series['c:xVal']['c:numRef']['c:f'] = this.options.labels2[i]?.label;
+      }
+
+      if (this.options.labels3 && this.options.labels3[i]) {
+        series['c:bubbleSize']['c:numRef']['c:f'] = this.options.labels3[i]?.label;
+      }
+
+      // console.info("SER", JSON.stringify(series, undefined, 2));
+
+      cser.push(series);
+
+    }
+
+    if (legend) {
+      chartspace['c:chart']['c:legend'] = {
+        'c:legendPos': { a$: {val: 'b'}, },
+        'c:overlay': { a$: {val: '0'}, },
+      };
+    }
+
+    return template;
+
+  }
+
+
   public CreateScatterChart() {
     
     const template = JSON.parse(JSON.stringify(chart_template)); 

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

@@ -57,6 +57,7 @@ const ImportSheet = (data: any) => {
         results.sheets.push(result);
       }
     }
+
     ctx.postMessage({ status: 'complete', results });
 
   }