Skip to content

WidgetImprovements #84

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

Merged
elwills merged 2 commits into from
Sep 25, 2026
Merged

WidgetImprovements #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68997c3
Show resolved auto time unit and full timestamps in tooltips
prestoncraw Sep 25, 2026
51ecfcd
Fix vulns
prestoncraw Sep 25, 2026
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
96 changes: 48 additions & 48 deletions src/OpenSEE/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 2 additions & 15 deletions src/OpenSEE/wwwroot/Scripts/TSX/Graphs/LineChart/Renderers/XAxes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

import * as d3 from "d3";
import { OpenSee } from "../../../global";
import { formatTimeTick } from "../../Utils/Utilities";
import { formatTimeTick, getAutoTimeUnit, resolveTimeUnit } from "../../Utils/Utilities";
import { IFormatTimeContext } from "../../Utils/Types";

export function createXAxis(
Expand Down Expand Up @@ -66,22 +66,9 @@ export const updateXAxisLabel = (

const h = xScale != null ? xScale.domain()[1] - xScale.domain()[0] : 100;

let label: string;
if ((timeUnit as OpenSee.IUnitSetting).options?.[timeUnit.current]?.short !== "auto" && !isOverlappingWaveform) {
label = (timeUnit as OpenSee.IUnitSetting).options?.[timeUnit.current]?.short ?? "";
} else if (isOverlappingWaveform) {
label = h < 100 ? "ms" : "s";
} else if ((timeUnit as OpenSee.IUnitSetting).options?.[timeUnit.current]?.short === "ms since event") {
label = "ms";
} else if ((timeUnit as OpenSee.IUnitSetting).options?.[timeUnit.current]?.short === "cycles") {
label = "cycle";
} else {
label = h < 100 ? "ms" : "s";
}

d3.select(container)
.select(".xAxisLabel")
.text(`Time (${label})`);
.text(`Time (${isOverlappingWaveform ? getAutoTimeUnit(h) : resolveTimeUnit(timeUnit, h)})`);
}

export const updateXAxisPositionOnResize = (container: HTMLDivElement | null, height: number, width: number) => {
Expand Down
74 changes: 37 additions & 37 deletions src/OpenSEE/wwwroot/Scripts/TSX/Graphs/Utils/Utilities.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,62 +83,64 @@ export const formatValueTick = (d: number, unit: OpenSee.Unit, yScaleCollection:
return d.toFixed(2)
};

// The only place that decides what the "auto" time unit means: ms while less than 100 ms is visible, otherwise s.
export const getAutoTimeUnit = (timeSpanMs: number): 'ms' | 's' => timeSpanMs < 100 ? 'ms' : 's';

// Short name of the time unit actually displayed, with "auto" replaced by the unit it resolves to.
export const resolveTimeUnit = (timeUnit: OpenSee.IUnitSetting, timeSpanMs: number): string => {
const short = timeUnit.options?.[timeUnit.current]?.short ?? 'auto';
return short === 'auto' ? getAutoTimeUnit(timeSpanMs) : short;
};

export const formatTimeTick = (d: number, ctx: IFormatTimeContext, extraPrecision = false): string => {
const TS = moment(d);
let h = ctx.xDomainWidth;
const timeSpanMs = ctx.xDomainWidth;
const short = resolveTimeUnit(ctx.timeUnit, timeSpanMs);
// moment/JS Date only resolve to whole milliseconds, so when extra precision is requested the
// sub-second portion is taken from the raw value (which keeps sub-ms detail) instead of moment.
const extra = extraPrecision ? 1 : 0;
const subSecondMs = d - Math.floor(d / 1000) * 1000;

if (ctx.isOverlappingWaveform) {
if (defaultSettings.OverlappingWaveTimeUnit.options?.[ctx.overlappingWaveTimeUnit]?.short === "ms") {
if (h < 2)
if (timeSpanMs < 2)
return d.toFixed(3 + extra)
if (h < 5)
if (timeSpanMs < 5)
return d.toFixed(2 + extra)
else
return d.toFixed(1 + extra)
} else if (defaultSettings.OverlappingWaveTimeUnit.options?.[ctx.overlappingWaveTimeUnit]?.short === "cycles") {
const cyc = d * 60.0 / 1000.0;
h = h * 60.0 / 1000.0;
if (h < 2)
const timeSpanCycles = timeSpanMs * 60.0 / 1000.0;
if (timeSpanCycles < 2)
return cyc.toFixed(3 + extra)
if (h < 5)
if (timeSpanCycles < 5)
return cyc.toFixed(2 + extra)
else
return cyc.toFixed(1 + extra)
}

}
else if (ctx.timeUnit.options?.[ctx.timeUnit.current]?.short == 'auto') {
if (h < 100)
return extraPrecision ? subSecondMs.toFixed(3) : TS.format("SSS.S")
else if (h < 1000)
return TS.format("ss.SS")
else
return TS.format("ss.S")
}
else if (ctx.timeUnit.options?.[ctx.timeUnit.current]?.short == 's') {
if (h < 100)
else if (short == 's') {
if (timeSpanMs < 100)
return extraPrecision ? ((d % 60000) / 1000).toFixed(5) : TS.format("ss.SSS")
else if (h < 1000)
else if (timeSpanMs < 1000)
return TS.format("ss.SS")
else
return TS.format("ss.S")
}
else if (ctx.timeUnit.options?.[ctx.timeUnit.current]?.short == 'ms')
else if (short == 'ms')
if (extraPrecision)
return subSecondMs.toFixed(3)
else if (h < 100)
else if (timeSpanMs < 100)
return TS.format("SSS.S")
else
return TS.format("SSS")

else if (ctx.timeUnit.options?.[ctx.timeUnit.current]?.short == 'min')
else if (short == 'min')
return TS.format("mm:ss")

else if (ctx.timeUnit.options?.[ctx.timeUnit.current]?.short == 'ms since record') {
else if (short == 'ms since record') {
let ms = d - ctx.originalStartTime;

if (ctx.useRelevantTime && !ctx.isOriginalEvt) {
Expand All @@ -147,15 +149,15 @@ export const formatTimeTick = (d: number, ctx: IFormatTimeContext, extraPrecisio
ms = d - evt?.StartTime
}

if (h < 2)
if (timeSpanMs < 2)
return ms.toFixed(3 + extra)
if (h < 5)
if (timeSpanMs < 5)
return ms.toFixed(2 + extra)
else
return ms.toFixed(1 + extra)
}

else if (ctx.timeUnit.options?.[ctx.timeUnit.current]?.short == 'ms since inception') {
else if (short == 'ms since inception') {
let ms = d - ctx.inceptionTime;

if (ctx.useRelevantTime && !ctx.isOriginalEvt) {
Expand All @@ -164,32 +166,32 @@ export const formatTimeTick = (d: number, ctx: IFormatTimeContext, extraPrecisio
ms = d - evt?.Inception
}

if (h < 2)
if (timeSpanMs < 2)
return ms.toFixed(3 + extra)
if (h < 5)
if (timeSpanMs < 5)
return ms.toFixed(2 + extra)
else
return ms.toFixed(1 + extra)
}

else if (ctx.timeUnit.options?.[ctx.timeUnit.current]?.short == 'cycles since record') {
else if (short == 'cycles since record') {
const cyc = (d - ctx.startTime) * 60.0 / 1000.0;

h = h * 60.0 / 1000.0;
if (h < 2)
const timeSpanCycles = timeSpanMs * 60.0 / 1000.0;
if (timeSpanCycles < 2)
return cyc.toFixed(3 + extra)
if (h < 5)
if (timeSpanCycles < 5)
return cyc.toFixed(2 + extra)
else
return cyc.toFixed(1 + extra)
}
else if (ctx.timeUnit.options?.[ctx.timeUnit.current]?.short == 'cycles since inception') {
else if (short == 'cycles since inception') {
const cyc = (d - ctx.inceptionTime) * 60.0 / 1000.0;

h = h * 60.0 / 1000.0;
if (h < 2)
const timeSpanCycles = timeSpanMs * 60.0 / 1000.0;
if (timeSpanCycles < 2)
return cyc.toFixed(3 + extra)
if (h < 5)
if (timeSpanCycles < 5)
return cyc.toFixed(2 + extra)
else
return cyc.toFixed(1 + extra)
Expand Down Expand Up @@ -227,9 +229,7 @@ export const formatTimeDelta = (deltaMs: number, timeUnit: OpenSee.IUnitSetting,
if (isNaN(deltaMs))
return '';

let short = timeUnit.options?.[timeUnit.current]?.short ?? 'auto';
if (short === 'auto')
short = domainWidthMS < 100 ? 'ms' : 's';
const short = resolveTimeUnit(timeUnit, domainWidthMS);

if (short === 's')
return (deltaMs / 1000).toFixed(7) + ' (s)';
Expand Down
Loading
Loading