weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed measure bug, added middle mouse click shortcut

Browse Source
This commit is contained in:
Davide Passoni 2025-02-26 10:39:08 +01:00
parent b2477112b1
commit d4a06e9edb
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/react/src/audio/audiomanager.ts
View File

@ -66,7 +66,7 @@ export class AudioManager {
this.#commandMode = options.commandMode;
});
let PTTKeys = ["KeyZ", "KeyX", "KeyC", "KeyV", "KeyB", "KeyN", "KeyM", "KeyComma", "KeyDot"];
let PTTKeys = ["KeyZ", "KeyX", "KeyC", "KeyV", "KeyB", "KeyN", "KeyM", "Comma", "Dot"];
PTTKeys.forEach((key, idx) => {
getApp()
.getShortcutManager()

54
frontend/react/src/map/map.ts
View File

@ -48,7 +48,6 @@ import {
ConfigLoadedEvent,
ContextActionChangedEvent,
ContextActionSetChangedEvent,
DrawingsInitEvent,
HiddenTypesChangedEvent,
MapContextMenuRequestEvent,
MapOptionsChangedEvent,
@ -67,9 +66,6 @@ import {
} from "../events";
import { ContextActionSet } from "../unit/contextactionset";
import { SmokeMarker } from "./markers/smokemarker";
import { MeasureMarker } from "./markers/measuremarker";
import { MeasureStartMarker } from "./markers/measurestartmarker";
import { MeasureEndMarker } from "./markers/measureendmarker";
import { Measure } from "./measure";
/* Register the handler for the box selection */
@ -185,7 +181,7 @@ export class Map extends L.Map {
maxBoundsViscosity: 1.0,
minZoom: 7,
keyboard: true,
keyboardPanDelta: 0,
keyboardPanDelta: 0
});
this.setView([37.23, -115.8], 10);
@ -351,7 +347,7 @@ export class Map extends L.Map {
keyUpCallback: () => {
this.clearMeasures();
},
code: "KeyComma",
code: "Comma",
shiftKey: false,
altKey: false,
ctrlKey: false,
@ -855,6 +851,19 @@ export class Map extends L.Map {
this.#contextActionSet?.getDefaultContextAction()?.executeCallback(targetUnit, targetPosition, originalEvent);
}
clearMeasures() {
this.#measures.forEach((measure) => measure.remove());
this.#measures = [];
}
getMapLayer(layerName: string) {
return this.#mapLayers[layerName] && this.#mapLayers[layerName];
}
getAllMapLayers() {
return this.#mapLayers;
}
/* Event handlers */
#onStateChanged(state: OlympusState, subState: OlympusSubState) {
/* Operations to perform when leaving a state */
@ -882,6 +891,7 @@ export class Map extends L.Map {
if (this.#measures[this.#measures.length - 1].getDistance() < 1) {
this.#measures[this.#measures.length - 1].remove();
this.#measures.pop();
this.#measures[this.#measures.length - 1].showEndMarker();
} else {
this.#measures[this.#measures.length - 1].showEndMarker();
}
@ -947,16 +957,35 @@ export class Map extends L.Map {
}
#onMouseUp(e: any) {
this.dragging.enable();
if (e.originalEvent?.button === 0) {
if (Date.now() - this.#leftMouseDownEpoch < SHORT_PRESS_MILLISECONDS) this.#onLeftShortClick(e);
this.#isLeftMouseDown = false;
} else if (e.originalEvent?.button === 2) {
if (Date.now() - this.#rightMouseDownEpoch < SHORT_PRESS_MILLISECONDS) this.#onRightShortClick(e);
this.#isRightMouseDown = false;
} else if (e.originalEvent?.button === 1) {
getApp().setState(getApp().getState() === OlympusState.MEASURE? OlympusState.IDLE: OlympusState.MEASURE);
if (getApp().getState() === OlympusState.MEASURE) {
const newMeasure = new Measure(this);
const previousMeasure = this.#measures[this.#measures.length - 1];
this.#measures.push(newMeasure);
newMeasure.onClick(e.latlng);
if (previousMeasure && previousMeasure.isActive()) {
previousMeasure.finish();
previousMeasure.hideEndMarker();
newMeasure.onMarkerMoved = (startLatLng, endLatLng) => {
previousMeasure.moveMarkers(null, startLatLng);
};
}
}
}
}
#onMouseDown(e: any) {
if (e.originalEvent.button === 1) {this.dragging.disable();} // Disable dragging when right clicking
this.#originalMouseClickLatLng = e.latlng;
if (e.originalEvent?.button === 0) {
this.#isLeftMouseDown = true;
@ -1326,17 +1355,4 @@ export class Map extends L.Map {
});
}
}
clearMeasures() {
this.#measures.forEach((measure) => measure.remove());
this.#measures = [];
}
getMapLayer(layerName: string) {
return this.#mapLayers[layerName] && this.#mapLayers[layerName];
}
getAllMapLayers() {
return this.#mapLayers;
}
}