Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/components/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export function setupSpectrogramImage(instance, imageUrl) {
*/
export function updateSVGLayout(instance) {
const { naturalWidth, naturalHeight } = instance.state.imageDetails
const margins = instance.state.axes.margins
const margins = instance.state.margins

if (!naturalWidth || !naturalHeight) {
return
Expand Down Expand Up @@ -208,7 +208,7 @@ export function updateSVGLayout(instance) {
export function applyZoomTransform(instance) {
const { level, centerX, centerY } = instance.state.zoom
const { naturalWidth, naturalHeight } = instance.state.imageDetails
const margins = instance.state.axes.margins
const margins = instance.state.margins

if (!instance.spectrogramImage) {
return
Expand Down Expand Up @@ -273,7 +273,7 @@ export function renderAxes(instance) {
instance.axesGroup.innerHTML = ''

const { naturalWidth, naturalHeight } = instance.state.imageDetails
const margins = instance.state.axes.margins
const margins = instance.state.margins

if (!naturalWidth || !naturalHeight) {
return
Expand All @@ -297,7 +297,7 @@ export function renderAxes(instance) {
export function calculateVisibleDataRange(instance) {
const { timeMin, timeMax, freqMin, freqMax } = instance.state.config
const { naturalWidth, naturalHeight } = instance.state.imageDetails
const margins = instance.state.axes.margins
const margins = instance.state.margins
const zoomLevel = instance.state.zoom.level

if (zoomLevel === 1.0) {
Expand Down
2 changes: 1 addition & 1 deletion src/core/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function screenToDataWithZoom(instance, event) {
const svgCoords = screenToSVGCoordinates(screenX, screenY, instance.svg, instance.state.imageDetails)

// Convert to data coordinates (accounting for margins and zoom)
const margins = instance.state.axes.margins
const margins = instance.state.margins
const zoomLevel = instance.state.zoom.level
const { naturalWidth, naturalHeight } = instance.state.imageDetails

Expand Down
6 changes: 3 additions & 3 deletions src/core/keyboardControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ function moveSelectedMarker(instance, markerId, movement) {
instance.state.config,
instance.state.imageDetails,
instance.state.rate,
instance.state.axes.margins
instance.state.margins
)

// Apply movement in SVG space
Expand All @@ -182,7 +182,7 @@ function moveSelectedMarker(instance, markerId, movement) {
instance.state.config,
instance.state.imageDetails,
instance.state.rate,
instance.state.axes.margins
instance.state.margins
)

// Update marker position
Expand Down Expand Up @@ -242,7 +242,7 @@ function moveSelectedHarmonicSet(instance, harmonicSetId, movement) {
// Convert current anchor time to SVG coordinates
const { naturalHeight } = instance.state.imageDetails
const { timeMin, timeMax } = instance.state.config
const margins = instance.state.axes.margins
const margins = instance.state.margins

// Calculate current anchor position in SVG space
const normalizedTime = 1.0 - (harmonicSet.anchorTime - timeMin) / (timeMax - timeMin)
Expand Down
12 changes: 5 additions & 7 deletions src/core/state.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,11 @@ export const initialState = {
width: 0,
height: 0
},
axes: {
margins: {
left: 60, // Space for time axis labels
bottom: 50, // Space for frequency axis labels
right: 15, // Small right margin
top: 15 // Small top margin
}
margins: {
left: 60, // Space for time axis labels
bottom: 50, // Space for frequency axis labels
right: 15, // Small right margin
top: 15 // Small top margin
},
// Simple zoom state for transform-based zoom
zoom: {
Expand Down
2 changes: 1 addition & 1 deletion src/modes/BaseMode.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export class BaseMode {
*/
getViewport() {
return {
margins: this.instance.state.axes.margins,
margins: this.instance.state.margins,
imageDetails: this.instance.state.imageDetails,
config: this.instance.state.config,
zoom: this.instance.state.zoom
Expand Down
2 changes: 1 addition & 1 deletion src/modes/doppler/DopplerMode.js
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ export class DopplerMode extends BaseMode {
this.instance.cursorGroup.appendChild(path)

// Vertical extensions - clip to intersection of zoomed view and spectrogram data area
const margins = this.instance.state.axes.margins
const margins = this.instance.state.margins
const { naturalHeight } = this.instance.state.imageDetails
const zoomLevel = this.instance.state.zoom.level

Expand Down
2 changes: 1 addition & 1 deletion src/modes/harmonics/HarmonicsMode.js
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ export class HarmonicsMode extends BaseMode {
*/
calculateHarmonicLineDimensions(harmonicSet) {
const { naturalHeight } = this.state.imageDetails
const margins = this.state.axes.margins
const margins = this.state.margins
const zoomLevel = this.state.zoom.level
const { timeMin, timeMax } = this.state.config

Expand Down
2 changes: 1 addition & 1 deletion src/modes/pan/PanMode.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export class PanMode extends BaseMode {

// Convert pixel delta to normalized delta (considering zoom level)
const { naturalWidth, naturalHeight } = this.state.imageDetails
const margins = this.state.axes.margins
const margins = this.state.margins
const svgRect = this.instance.svg.getBoundingClientRect()

// Scale factor based on current zoom and SVG size
Expand Down
2 changes: 1 addition & 1 deletion src/rendering/cursors.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function updateCursorIndicators(instance) {
* @param {DataCoordinates} endPoint - Current drag end point
*/
export function drawDopplerPreview(instance, startPoint, endPoint) {
const margins = instance.state.axes.margins
const margins = instance.state.margins
const { naturalWidth, naturalHeight } = instance.state.imageDetails
const { timeMin, timeMax, freqMin, freqMax } = instance.state.config

Expand Down
7 changes: 1 addition & 6 deletions src/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@
* @property {number} top - Top margin
*/

/**
* Axes configuration
* @typedef {Object} AxesConfig
* @property {AxesMargins} margins - Margin configuration for axes
*/

/**
* Zoom state configuration
Expand Down Expand Up @@ -186,7 +181,7 @@
* @property {ImageDetails} imageDetails - Image source and dimensions
* @property {Config} config - Time and frequency configuration
* @property {DisplayDimensions} displayDimensions - Current display dimensions
* @property {AxesConfig} axes - Axes configuration
* @property {AxesMargins} margins - Axes margin configuration
* @property {ZoomState} zoom - Zoom state configuration
*/

Expand Down