diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.vue | 24 | ||||
| -rw-r--r-- | src/components/TimeLine.vue | 16 | ||||
| -rw-r--r-- | src/lib.ts | 2 |
3 files changed, 23 insertions, 19 deletions
diff --git a/src/App.vue b/src/App.vue index ddc434f..31be46d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -141,7 +141,7 @@ function reduceEvents(){ idToEvent = eventsToKeep; } // For getting events from server -const EVENT_REQ_LIMIT = 500; +const EVENT_REQ_LIMIT = 300; let queriedRanges: DateRangeTree[] = SCALES.map(() => new DateRangeTree()); // For each scale, holds date ranges for which data has already been queried fromm the server let pendingReq = false; // Used to serialise event-req handling @@ -170,27 +170,31 @@ async function onEventDisplay( } queriedRanges[scaleIdx].add([firstDate, lastDate]); // Collect events - let added = false; + let eventAdded = false; for (let eventObj of responseObj.events){ let event = jsonToHistEvent(eventObj); let success = eventTree.value.insert(event); if (success){ - added = true; + eventAdded = true; idToEvent.set(event.id, event); } } // Collect unit counts const unitCounts = responseObj.unitCounts; - for (let [unitStr, count] of Object.entries(unitCounts)){ - let unit = parseInt(unitStr) - if (isNaN(unit)){ - console.log('ERROR: Invalid non-integer unit value in server response'); - break; + if (unitCounts == null){ + console.log('WARNING: Exceeded unit-count limit for server query'); + } else { + for (let [unitStr, count] of Object.entries(unitCounts)){ + let unit = parseInt(unitStr) + if (isNaN(unit)){ + console.log('WARNING: Invalid non-integer unit value in server response'); + break; + } + unitCountMaps.value[scaleIdx].set(unit, count) } - unitCountMaps.value[scaleIdx].set(unit, count) } // Notify components if new events were added - if (added){ + if (eventAdded){ eventTree.value = rbtree_shallow_copy(eventTree.value); // Note: triggerRef(eventTree) does not work here } // Check memory limit diff --git a/src/components/TimeLine.vue b/src/components/TimeLine.vue index 7b89194..d68cff0 100644 --- a/src/components/TimeLine.vue +++ b/src/components/TimeLine.vue @@ -15,6 +15,14 @@ <stop offset="95%" stop-color="gold"/> </linearGradient> </defs> + <!-- Event lines (dashed line indicates imprecise start date) --> + <line v-for="id in eventLines.keys()" :key="id" + x1="0" y1="0" :x2="eventLines.get(id)![2]" y2="0.01" + stroke="url('#eventLineGradient')" stroke-width="1px" + :stroke-dasharray="getEventPrecision(idToEvent.get(id)!) <= minorScale ? '' : '16,4'" + :style="eventLineStyles(id)" class="animate-fadein"/> + <!-- Note: With a fully vertical or horizontal line, nothing gets displayed --> + <!-- Note: Can't use :x2="1" with scaling in :style="", as it makes dashed-lines non-uniform --> <!-- Main line (unit horizontal line that gets transformed, with extra length to avoid gaps when panning) --> <line :stroke="store.color.alt" stroke-width="2px" x1="-1" y1="0" x2="2" y2="0" :style="mainlineStyles"/> <!-- Tick markers --> @@ -36,14 +44,6 @@ :fill="store.color.textDark" :style="tickLabelStyles(tick)" class="text-sm animate-fadein"> {{tick.date.toDisplayString()}} </text> - <!-- Event lines (dashed line indicates imprecise start date) --> - <line v-for="id in eventLines.keys()" :key="id" - x1="0" y1="0" :x2="eventLines.get(id)![2]" y2="0.01" - stroke="url('#eventLineGradient')" stroke-width="1px" - :stroke-dasharray="getEventPrecision(idToEvent.get(id)!) <= minorScale ? '' : '16,4'" - :style="eventLineStyles(id)" class="animate-fadein"/> - <!-- Note: With a fully vertical or horizontal line, nothing gets displayed --> - <!-- Note: Can't use :x2="1" with scaling in :style="", as it makes dashed-lines non-uniform --> </svg> <!-- Events --> <div v-for="id in idToPos.keys()" :key="id" class="absolute animate-fadein z-20" :style="eventStyles(id)"> @@ -308,7 +308,7 @@ export type HistEventJson = { } export type EventResponseJson = { events: HistEventJson[], - unitCounts: {[x: number]: number}, + unitCounts: {[x: number]: number} | null, } export function jsonToHistDate(json: HistDateJson){ if (json.gcal == null){ |