Skip to content

Feature: Cumulative toggle #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theowoo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feature: Cumulative toggle #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions exampleVault/movies.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ views:
min-y-override: ""
max-y-override: ""
label-property: note.original_title
cumulative-y: false
- type: chart-bar
name: Release year
filters:
Expand All @@ -22,3 +23,17 @@ views:
- formula.One
x: formula.Release Year
show-labels: false
cumulative-y: false
- type: chart-line
name: Cumulative length vs Release year
order:
- votes
- duration
- avg_vote
sort:
- property: formula.Release Year
direction: ASC
x: formula.Release Year
cumulative-y: true
sync-y-axes: false
multi-chart-mode: Separate by property
30 changes: 27 additions & 3 deletions packages/obsidian/src/ChartView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const CHART_SETTINGS = {
SHOW_LABELS: 'show-labels',
MULTI_CHART: 'multi-chart-mode',
SYNC_Y_AXES: 'sync-y-axes',
CUMULATIVE_Y: 'cumulative-y',
MIN_Y_OVERRIDE: 'min-y-override',
MAX_Y_OVERRIDE: 'max-y-override',
LABEL_PROP: 'label-property',
Expand Down Expand Up @@ -123,7 +124,8 @@ export class ChartView extends BasesView {

const data: ProcessedData[] = [];
const groupBySet = this.data.groupedData.map(g => g.key?.toString()).filter(k => k != null);

const cumulativeY = Boolean(this.config.get(CHART_SETTINGS.CUMULATIVE_Y));
console.log(propertyOrder.length)
for (const group of this.data?.groupedData ?? []) {
const groupKey = group.key?.toString();
let groupIndex: number;
Expand All @@ -132,9 +134,25 @@ export class ChartView extends BasesView {
} else {
groupIndex = groupBySet.indexOf(groupKey);
}

const numProperties = propertyOrder.length
let previous_y = new Array(numProperties).fill(0);
for (const entry of group.entries) {

const processedEntry = this.processEntry(entry, xField, propertyOrder, groupIndex, mode);
// Iterate over each data point in processedEntry, cumulate by group
for (const dataPoint of processedEntry) {
if (cumulativeY) {
let propIndex;
if (mode == MultiChartMode.GROUP) {
propIndex = dataPoint.groupIndex
} else {
propIndex = dataPoint.chartIndex
}
dataPoint.y += previous_y[propIndex];
previous_y[propIndex] = dataPoint.y;
}
}

data.push(...processedEntry);
}
}
Expand All @@ -151,7 +169,7 @@ export class ChartView extends BasesView {
const x = entry.getValue(xField);
const xValue = parseValueAsX(x);
const labelProp = this.config.getAsPropertyId(CHART_SETTINGS.LABEL_PROP);

if (xValue === null) {
return [];
}
Expand Down Expand Up @@ -247,6 +265,12 @@ export class ChartView extends BasesView {
key: CHART_SETTINGS.SYNC_Y_AXES,
default: false,
},
{
displayName: 'Cumulative Y',
type: 'toggle',
key: CHART_SETTINGS.CUMULATIVE_Y,
default: false,
},
{
displayName: 'Min Y override',
type: 'text',
Expand Down