@trebco/treb 28.10.5 → 28.11.1

package/dist/treb.d.ts

@@ -1,4 +1,4 @@
-/*! API v28.10. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
+/*! API v28.11. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
 
 /**
  * add our tag to the map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebco/treb",
-  "version": "28.10.5",
+  "version": "28.11.1",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {

package/treb-charts/src/chart-utils.ts

@@ -310,7 +310,7 @@ export const TransformSeriesData = (raw_data?: UnionValue, default_x?: UnionValu
 };
 
 /** get a unified scale, and formats */
-export const CommonData = (series: SeriesType[], y_floor?: number, y_ceiling?: number) => {
+export const CommonData = (series: SeriesType[], y_floor?: number, y_ceiling?: number, x_floor?: number, x_ceiling?: number) => {
 
   let x_format = '';
   let y_format = '';
@@ -362,7 +362,14 @@ export const CommonData = (series: SeriesType[], y_floor?: number, y_ceiling?: n
       }
     }
   }
-  
+
+  if (typeof x_floor !== 'undefined') {
+    x_min = Math.min(x_min, x_floor);
+  }
+  if (typeof x_ceiling !== 'undefined') {
+    x_min = Math.max(x_min, x_ceiling);
+  }
+
   if (typeof y_floor !== 'undefined') {
     y_min = Math.min(y_min, y_floor);
   }
@@ -438,7 +445,21 @@ const ApplyLabels = (series_list: SeriesType[], pattern: string, category_labels
 export const CreateBubbleChart = (args: UnionValue[]): ChartData => {
 
   const series: SeriesType[] = TransformSeriesData(args[0]);
-  const common = CommonData(series);
+
+  let y_floor: number|undefined = undefined;
+  let x_floor: number|undefined = undefined;
+  
+  for (const entry of series) {
+
+    if (typeof entry.x.range?.min === 'number' && entry.x.range.min > 0 && entry.x.range.min < 50) {
+      x_floor = 0;
+    }
+    if (typeof entry.y.range?.min === 'number' && entry.y.range.min > 0 && entry.y.range.min < 50) {
+      y_floor = 0;
+    }
+  }
+
+  const common = CommonData(series, y_floor, undefined, x_floor);
   const title = args[1]?.toString() || undefined;
   const options = args[2]?.toString() || undefined;
 

package/treb-charts/src/default-chart-renderer.ts

@@ -196,6 +196,8 @@ export class DefaultChartRenderer implements ChartRendererType {
 
     // now do type-specific rendering
 
+    let zeros: number[]|undefined = [];
+
     switch (chart_data.type) {
     case 'scatter':
       this.renderer.RenderPoints(area, chart_data.x, chart_data.y, 'mc mc-correlation series-1');
@@ -203,10 +205,17 @@ export class DefaultChartRenderer implements ChartRendererType {
 
     case 'bubble':
 
+      if (chart_data.x_scale.min <= 0 && chart_data.x_scale.max >= 0) {
+        zeros[0] = Math.round(Math.abs(chart_data.x_scale.min / chart_data.x_scale.step));
+      }      
+      if (chart_data.y_scale.min <= 0 && chart_data.y_scale.max >= 0) {
+        zeros[1] = Math.round(Math.abs(chart_data.y_scale.max / chart_data.y_scale.step));
+      }
+
       this.renderer.RenderGrid(area, 
         chart_data.y_scale.count, 
         chart_data.x_scale.count + 1, // (sigh)
-        'chart-grid');
+        'chart-grid', zeros);
 
       for (const [index, series] of chart_data.series.entries()) {
         const series_index = (typeof series.index === 'number') ? series.index : index + 1;

package/treb-charts/src/renderer.ts

@@ -968,23 +968,54 @@ export class ChartRenderer {
 
   }
 
-  public RenderGrid(area: Area, y_count: number, x_count = 0, classes?: string | string[]): void {
+  public RenderGrid(area: Area, y_count: number, x_count = 0, classes?: string | string[], zeros?: number[]): void {
 
     const d: string[] = [];
+    const d2: string[] = [];
 
     let step = area.height / y_count;
     for (let i = 0; i <= y_count; i++) {
+
       const y = Math.round(area.top + step * i) - 0.5;
-      d.push(`M${area.left} ${y} L${area.right} ${y}`);
+
+      if (zeros && zeros[1] === i) {
+        d2.push(`M${area.left} ${y} L${area.right} ${y}`);
+      }
+      else {
+        d.push(`M${area.left} ${y} L${area.right} ${y}`);
+      }
     }
 
     step = area.width / (x_count - 1);
     for (let i = 0; i < x_count; i++) {
+
       const x = Math.round(area.left + step * i) - 0.5;
-      d.push(`M${x} ${area.top} L${x} ${area.bottom}`);
+
+      if (zeros && zeros[0] === i) {
+        d2.push(`M${x} ${area.top} L${x} ${area.bottom}`);
+      }
+      else {
+        d.push(`M${x} ${area.top} L${x} ${area.bottom}`);
+      }
     }
 
     this.group.appendChild(SVGNode('path', {d, class: classes}));
+    if (d2.length) {
+
+      if (classes) {
+        if (!Array.isArray(classes)) {
+          classes = classes + ' zero';
+        }
+        else {
+          classes.push('zero');
+        }
+      }
+      else {
+        classes = 'zero';
+      }
+
+      this.group.appendChild(SVGNode('path', {d: d2, class: classes}));
+    }
 
   }
 

package/treb-charts/style/charts.scss

@@ -104,6 +104,11 @@
   /* grid */
   .chart-grid, .chart-ticks {
     stroke: var(--treb-chart-grid-color, #ddd);
+
+    &.zero {
+      stroke: var(--treb-chart-grid-zero-color, var(--treb-chart-grid-color, #999));
+    }
+
   }
 
   /* mouse elements */

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}'
+        }
+      }
+    }
+  }
+
+}