Compare commits

..

No commits in common. "c6d10b6221df271518832f598aef5ca992f73f3d" and "8f673e0095ca1e0abcaa46b190222cf6f4e3c5b0" have entirely different histories.

4 changed files with 157 additions and 290 deletions

View File

@ -3,7 +3,6 @@ import { ref, computed, reactive, onMounted, onBeforeUnmount, watch } from 'vue'
import DeterminationMachine from './components/DeterminationMachine.vue';
//@ts-ignore
import SilverKnob from './components/SilverKnob.vue';
import DraggableInstrumentWrapper from './components/DraggableInstrumentWrapper.vue';
import Oscilloscope from './components/Oscilloscope.vue';
import SignalGen from './components/SignalGen.vue';
import Notebook from './components/Notebook.vue';
@ -337,23 +336,6 @@ const wiringConnected = reactive<Record<WireKey, boolean>>({
rxTransducer_to_right: false,
});
// =========================
// 线
// =========================
// CH1 [ ] -> [ CH1]
const oscCh1HasSignal = computed(() => wiringConnected.txWave_to_ch1);
// CH2线
// [ ] -> [ ]
// [ ] -> [ CH2]
// [ ] -> [ ]
const oscCh2HasSignal = computed(() =>
wiringConnected.txTransducer_to_left
&& wiringConnected.rxWave_to_ch2
&& wiringConnected.rxTransducer_to_right
);
// =========================
// document.title
// =========================
@ -407,17 +389,6 @@ const tooltip = reactive({
side: 'right' as TooltipSide,
});
// 线
const wiringErrorToast = reactive({
visible: false,
text: '',
x: 0,
y: 0,
side: 'right' as TooltipSide,
});
let wiringErrorToastTimer: number | null = null;
const tooltipTargetEl = ref<HTMLElement | null>(null);
const hideTooltip = () => {
@ -425,7 +396,7 @@ const hideTooltip = () => {
tooltipTargetEl.value = null;
};
const calcBubblePosition = (el: HTMLElement) => {
const updateTooltipPosition = (el: HTMLElement) => {
const table = tableRef.value;
if (!table) return;
@ -441,21 +412,11 @@ const calcBubblePosition = (el: HTMLElement) => {
const leftX = r.left - tableRect.left - margin;
const hasRoomOnRight = rightX + approxBubbleW <= tableRect.width;
const side = hasRoomOnRight ? 'right' : 'left';
const x = hasRoomOnRight ? rightX : leftX;
tooltip.side = hasRoomOnRight ? 'right' : 'left';
tooltip.x = hasRoomOnRight ? rightX : leftX;
// y
const y = Math.max(10, Math.min(tableRect.height - 10, anchorY));
return { x, y, side } as const;
};
const updateTooltipPosition = (el: HTMLElement) => {
const pos = calcBubblePosition(el);
if (!pos) return;
tooltip.side = pos.side;
tooltip.x = pos.x;
tooltip.y = pos.y;
tooltip.y = Math.max(10, Math.min(tableRect.height - 10, anchorY));
};
const showTooltipForEl = (el: HTMLElement) => {
@ -469,27 +430,6 @@ const showTooltipForEl = (el: HTMLElement) => {
updateTooltipPosition(el);
};
const showWiringErrorToast = (text: string, anchorEl?: HTMLElement) => {
const el = anchorEl ?? null;
if (el) {
const pos = calcBubblePosition(el);
if (pos) {
wiringErrorToast.side = pos.side;
wiringErrorToast.x = pos.x;
wiringErrorToast.y = pos.y;
}
}
wiringErrorToast.text = text;
wiringErrorToast.visible = true;
if (wiringErrorToastTimer !== null) window.clearTimeout(wiringErrorToastTimer);
wiringErrorToastTimer = window.setTimeout(() => {
wiringErrorToastTimer = null;
wiringErrorToast.visible = false;
}, 1600);
};
const findTooltipEl = (target: EventTarget | null): HTMLElement | null => {
if (!target) return null;
const t = target as HTMLElement;
@ -533,15 +473,6 @@ const tooltipStyle = computed(() => {
return base;
});
const wiringErrorToastStyle = computed(() => {
const base: Record<string, string> = {
left: `${wiringErrorToast.x}px`,
top: `${wiringErrorToast.y}px`,
};
base.transform = wiringErrorToast.side === 'right' ? 'translate(0, -50%)' : 'translate(-100%, -50%)';
return base;
});
const pinEls = new Map<PinId, HTMLElement>();
const selectedPin = ref<PinId | null>(null);
@ -653,16 +584,13 @@ const addCableIfNeeded = (key: WireKey, a: PinId, b: PinId) => {
scheduleUpdateCablePaths();
};
const alertWiringError = (anchorEl?: HTMLElement) => {
showWiringErrorToast('接线错误:请按接线示意连接对应端口。', anchorEl);
const alertWiringError = () => {
window.alert('接线错误:请按接线示意连接对应端口。');
};
const onPinClick = (id: PinId) => {
ea.play('线缆插入')
//
if (wiringErrorToast.visible) wiringErrorToast.visible = false;
postTracker('pin_click', { pinId: id, hasSelected: selectedPin.value !== null });
if (selectedPin.value === null) {
@ -680,7 +608,7 @@ const onPinClick = (id: PinId) => {
const key = requiredByPair.get(normalizePair(first, id));
if (!key) {
postTracker('wire_error', { a: first, b: id });
alertWiringError(pinEls.get(id) ?? pinEls.get(first));
alertWiringError();
return;
}
@ -749,7 +677,6 @@ onBeforeUnmount(() => {
if (cablesRaf !== null) cancelAnimationFrame(cablesRaf);
window.removeEventListener('resize', scheduleUpdateCablePaths);
if (dmRightCableTimer !== null) window.clearTimeout(dmRightCableTimer);
if (wiringErrorToastTimer !== null) window.clearTimeout(wiringErrorToastTimer);
});
</script>
@ -768,11 +695,6 @@ onBeforeUnmount(() => {
<div class="tooltip-inner">{{ tooltip.text }}</div>
</div>
<div v-if="wiringErrorToast.visible" class="tooltip" :class="`tooltip--${wiringErrorToast.side}`"
:style="wiringErrorToastStyle">
<div class="tooltip-inner">{{ wiringErrorToast.text }}</div>
</div>
<svg class="cables" :width="1600" :height="900" viewBox="0 0 1600 900"
aria-hidden="true">
<defs>
@ -789,29 +711,91 @@ onBeforeUnmount(() => {
</g>
</svg>
<DraggableInstrumentWrapper :style="machineStyle" :instrument="machine" @start-drag="startDrag">
<div class="instrument-wrapper" :style="machineStyle">
<div class="drag-handle" data-tooltip="拖动把手可移动仪器位置" @pointerdown="startDrag(machine, $event)">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
viewBox="0 0 24 24" fill="none" stroke="currentColor"
stroke-width="2">
<circle cx="12" cy="5" r="1" />
<circle cx="12" cy="12" r="1" />
<circle cx="12" cy="19" r="1" />
<circle cx="8" cy="5" r="1" />
<circle cx="8" cy="12" r="1" />
<circle cx="8" cy="19" r="1" />
<circle cx="16" cy="5" r="1" />
<circle cx="16" cy="12" r="1" />
<circle cx="16" cy="19" r="1" />
</svg>
</div>
<DeterminationMachine v-model="distance" class="machine"
@register-pin="registerPin" @unregister-pin="unregisterPin" @pin-click="onPinClick"
@change="onDistanceChange" />
</DraggableInstrumentWrapper>
@register-pin="registerPin" @unregister-pin="unregisterPin"
@pin-click="onPinClick" @change="onDistanceChange" />
</div>
<DraggableInstrumentWrapper :style="notebookStyle" :instrument="notebook" @start-drag="startDrag">
<div class="instrument-wrapper" :style="notebookStyle">
<div class="drag-handle" data-tooltip="拖动把手可移动仪器位置" @pointerdown="startDrag(notebook, $event)">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
viewBox="0 0 24 24" fill="none" stroke="currentColor"
stroke-width="2">
<circle cx="12" cy="5" r="1" />
<circle cx="12" cy="12" r="1" />
<circle cx="12" cy="19" r="1" />
<circle cx="8" cy="5" r="1" />
<circle cx="8" cy="12" r="1" />
<circle cx="8" cy="19" r="1" />
<circle cx="16" cy="5" r="1" />
<circle cx="16" cy="12" r="1" />
<circle cx="16" cy="19" r="1" />
</svg>
</div>
<Notebook class="machine" :wiring="wiringConnected"
:osc="{ vdch1: oscStatus.vdch1, vdch2: oscStatus.vdch2, currentModeIndex: oscStatus.currentModeIndex, xyMode: oscStatus.xyMode, power: oscStatus.power }"
:signal-frequency-k-hz="signalFrequencyKHz" :lissajous-line-streak="lissajousLineStreak" />
</DraggableInstrumentWrapper>
:signal-frequency-k-hz="signalFrequencyKHz"
:lissajous-line-streak="lissajousLineStreak" />
</div>
<DraggableInstrumentWrapper :style="oscilloscopeStyle" :instrument="oscilloscope" @start-drag="startDrag">
<Oscilloscope :distance="distance" :frequency="signalFrequencyKHz * 1000" :ch1-has-signal="oscCh1HasSignal"
:ch2-has-signal="oscCh2HasSignal" class="machine" @register-pin="registerPin"
@unregister-pin="unregisterPin" @pin-click="onPinClick" @settings="onOscSettings"
@lissajous-line="onLissajousLine" />
</DraggableInstrumentWrapper>
<div class="instrument-wrapper" :style="oscilloscopeStyle">
<div class="drag-handle" data-tooltip="拖动把手可移动仪器位置" @pointerdown="startDrag(oscilloscope, $event)">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
viewBox="0 0 24 24" fill="none" stroke="currentColor"
stroke-width="2">
<circle cx="12" cy="5" r="1" />
<circle cx="12" cy="12" r="1" />
<circle cx="12" cy="19" r="1" />
<circle cx="8" cy="5" r="1" />
<circle cx="8" cy="12" r="1" />
<circle cx="8" cy="19" r="1" />
<circle cx="16" cy="5" r="1" />
<circle cx="16" cy="12" r="1" />
<circle cx="16" cy="19" r="1" />
</svg>
</div>
<Oscilloscope :distance="distance" :frequency="signalFrequencyKHz * 1000"
class="machine" @register-pin="registerPin"
@unregister-pin="unregisterPin" @pin-click="onPinClick"
@settings="onOscSettings" @lissajous-line="onLissajousLine" />
</div>
<DraggableInstrumentWrapper :style="signalGenStyle" :instrument="signalGen" @start-drag="startDrag">
<SignalGen v-model="signalFrequencyKHz" class="machine" @register-pin="registerPin"
@unregister-pin="unregisterPin" @pin-click="onPinClick" />
</DraggableInstrumentWrapper>
<div class="instrument-wrapper" :style="signalGenStyle">
<div class="drag-handle" data-tooltip="拖动把手可移动仪器位置" @pointerdown="startDrag(signalGen, $event)">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
viewBox="0 0 24 24" fill="none" stroke="currentColor"
stroke-width="2">
<circle cx="12" cy="5" r="1" />
<circle cx="12" cy="12" r="1" />
<circle cx="12" cy="19" r="1" />
<circle cx="8" cy="5" r="1" />
<circle cx="8" cy="12" r="1" />
<circle cx="8" cy="19" r="1" />
<circle cx="16" cy="5" r="1" />
<circle cx="16" cy="12" r="1" />
<circle cx="16" cy="19" r="1" />
</svg>
</div>
<SignalGen v-model="signalFrequencyKHz" class="machine"
@register-pin="registerPin" @unregister-pin="unregisterPin"
@pin-click="onPinClick" />
</div>
</div>
</template>
@ -879,10 +863,62 @@ onBeforeUnmount(() => {
stroke-linejoin: round;
}
.instrument-wrapper {
position: absolute;
filter: drop-shadow(0 10px 10px black);
transition: filter 0.2s;
}
.machine {
pointer-events: auto;
}
.drag-handle {
touch-action: none;
position: absolute;
top: -12px;
left: 50%;
transform: translateX(-50%);
width: 40px;
height: 24px;
background: linear-gradient(135deg, rgba(100, 100, 100, 0.9), rgba(60, 60, 60, 0.95));
border-radius: 12px;
display: flex;
align-items: center;
justify-content: center;
cursor: grab;
z-index: 1000;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3), inset 0 1px 2px rgba(255, 255, 255, 0.2);
opacity: 0.7;
transition: all 0.2s;
border: 1px solid rgba(255, 255, 255, 0.1);
backdrop-filter: blur(4px);
}
.drag-handle:hover {
opacity: 1;
background: linear-gradient(135deg, rgba(120, 120, 120, 0.95), rgba(80, 80, 80, 1));
box-shadow: 0 3px 12px rgba(0, 0, 0, 0.5), inset 0 1px 2px rgba(255, 255, 255, 0.3);
transform: translateX(-50%) scale(1.1);
}
.drag-handle:active {
cursor: grabbing;
background: linear-gradient(135deg, rgba(80, 80, 80, 1), rgba(50, 50, 50, 1));
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.6), inset 0 1px 2px rgba(255, 255, 255, 0.2);
}
.drag-handle svg {
width: 20px;
height: 20px;
color: rgba(255, 255, 255, 0.8);
filter: drop-shadow(0 1px 1px rgba(0, 0, 0, 0.5));
}
.instrument-wrapper:hover .drag-handle {
opacity: 0.9;
}
.tooltip {
position: absolute;
z-index: 9000;

View File

@ -1,104 +0,0 @@
<script setup lang="ts">
import type { PropType } from 'vue';
interface InstrumentState {
left: number;
bottom: number;
baseScale: number;
zIndex: number;
}
const props = defineProps({
instrument: {
type: Object as PropType<InstrumentState>,
required: true,
},
tooltip: {
type: String,
default: '拖动把手可移动仪器位置',
},
});
const emit = defineEmits<{
(e: 'start-drag', instrument: InstrumentState, ev: PointerEvent): void;
}>();
const onPointerDown = (ev: PointerEvent) => {
emit('start-drag', props.instrument, ev);
};
</script>
<template>
<div class="instrument-wrapper">
<div class="drag-handle" :data-tooltip="tooltip" @pointerdown="onPointerDown">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
stroke="currentColor" stroke-width="2">
<circle cx="12" cy="5" r="1" />
<circle cx="12" cy="12" r="1" />
<circle cx="12" cy="19" r="1" />
<circle cx="8" cy="5" r="1" />
<circle cx="8" cy="12" r="1" />
<circle cx="8" cy="19" r="1" />
<circle cx="16" cy="5" r="1" />
<circle cx="16" cy="12" r="1" />
<circle cx="16" cy="19" r="1" />
</svg>
</div>
<slot />
</div>
</template>
<style scoped>
.instrument-wrapper {
position: absolute;
filter: drop-shadow(0 10px 10px black);
transition: filter 0.2s;
}
.drag-handle {
touch-action: none;
position: absolute;
top: -12px;
left: 50%;
transform: translateX(-50%);
width: 40px;
height: 24px;
background: linear-gradient(135deg, rgba(100, 100, 100, 0.9), rgba(60, 60, 60, 0.95));
border-radius: 12px;
display: flex;
align-items: center;
justify-content: center;
cursor: grab;
z-index: 1000;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3), inset 0 1px 2px rgba(255, 255, 255, 0.2);
opacity: 0.7;
transition: all 0.2s;
border: 1px solid rgba(255, 255, 255, 0.1);
backdrop-filter: blur(4px);
}
.drag-handle:hover {
opacity: 1;
background: linear-gradient(135deg, rgba(120, 120, 120, 0.95), rgba(80, 80, 80, 1));
box-shadow: 0 3px 12px rgba(0, 0, 0, 0.5), inset 0 1px 2px rgba(255, 255, 255, 0.3);
transform: translateX(-50%) scale(1.1);
}
.drag-handle:active {
cursor: grabbing;
background: linear-gradient(135deg, rgba(80, 80, 80, 1), rgba(50, 50, 50, 1));
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.6), inset 0 1px 2px rgba(255, 255, 255, 0.2);
}
.drag-handle svg {
width: 20px;
height: 20px;
color: rgba(255, 255, 255, 0.8);
filter: drop-shadow(0 1px 1px rgba(0, 0, 0, 0.5));
}
.instrument-wrapper:hover .drag-handle {
opacity: 0.9;
}
</style>

View File

@ -31,15 +31,6 @@ const props = defineProps({
// m/s
soundSpeed: { type: Number, default: 340 },
// 线
// CH1 [ ] -> [ CH1] true
ch1HasSignal: { type: Boolean, default: false },
// CH2线 true
// [ ] -> [ ]
// [ ] -> [ CH2]
// [ ] -> [ ]
ch2HasSignal: { type: Boolean, default: false },
});
const emit = defineEmits<{
@ -156,8 +147,8 @@ function drawOscilloscope() {
const gainCH1 = getGain(vdch1.value);
const gainCH2 = getGain(vdch2.value);
// X-Y 线
if (power.value && isXYMode.value && props.ch1HasSignal && props.ch2HasSignal) {
// X-Y 线
if (power.value && isXYMode.value) {
const phase = phy.phaseRadTotal;
const isLineNow = Math.abs(Math.sin(phase)) < 0.10 && phy.resonanceFactor > 0.05;
if (isLineNow && !lastWasLine.value) {
@ -180,8 +171,7 @@ function drawOscilloscope() {
if (isXYMode.value) {
// ================= X-Y Mode () =================
const hasAnySignal = props.ch1HasSignal || props.ch2HasSignal;
const opacity = hasAnySignal ? (0.3 + 0.7 * phy.resonanceFactor) : 0.15;
const opacity = 0.3 + 0.7 * phy.resonanceFactor;
ctx.strokeStyle = `rgba(0, 255, 0, ${opacity})`;
// -
@ -190,8 +180,8 @@ function drawOscilloscope() {
ctx.beginPath();
const phase = phy.phaseRadTotal;
const ampX = props.ch1HasSignal ? gainCH1 : 0;
const ampY = props.ch2HasSignal ? (phy.resonanceFactor * gainCH2) : 0;
const ampX = gainCH1;
const ampY = phy.resonanceFactor * gainCH2;
for (let t = 0; t <= 2 * Math.PI; t += 0.03) {
const x = scale * ampX * Math.cos(t);
@ -207,12 +197,6 @@ function drawOscilloscope() {
ctx.shadowBlur = 0;
//
if (!props.ch1HasSignal && !props.ch2HasSignal) {
ctx.fillStyle = 'rgba(0, 255, 0, 0.25)';
ctx.fillRect(cx - 1.5, cy - 1.5, 3, 3);
}
//
ctx.fillStyle = 'rgba(0, 255, 0, 0.3)';
ctx.fillRect(cx - 1, cy - 5, 2, 10);
@ -234,52 +218,18 @@ function drawOscilloscope() {
ctx.lineWidth = 3;
// CH1 + CH2
if (currentModeIndex.value === 3) {
const opacity = 0.45 + 0.55 * phy.resonanceFactor;
ctx.beginPath();
// CH1 线 + CH2 绿便/
ctx.strokeStyle = `rgba(255, 230, 0, ${opacity})`;
ctx.shadowBlur = 14 * (0.4 + 0.6 * phy.resonanceFactor);
ctx.shadowColor = '#00ff00';
const phaseShift = phy.phaseRadTotal;
const amp1 = gainCH1 * 0.8;
const amp2 = phy.resonanceFactor * gainCH2 * 0.8;
for (let x = 0; x < w; x += 2) {
const t = (x / pixPerCycle) * 2 * Math.PI;
const y1 = props.ch1HasSignal ? (amp1 * Math.sin(t + time)) : 0;
const y2 = props.ch2HasSignal ? (amp2 * Math.sin(t - phaseShift + time)) : 0;
const yVal = scale * (y1 + y2);
if (x === 0) ctx.moveTo(x, cy - yVal);
else ctx.lineTo(x, cy - yVal);
}
ctx.stroke();
//
ctx.shadowBlur = 22 * (0.4 + 0.6 * phy.resonanceFactor);
ctx.stroke();
}
// CH1 (Source) - CH1
if (currentModeIndex.value === 0 || currentModeIndex.value === 2) {
// CH1 (Source) - CH1
if (currentModeIndex.value === 0 || currentModeIndex.value === 2 || currentModeIndex.value === 3) {
ctx.beginPath();
ctx.strokeStyle = 'rgba(255, 230, 0, 0.9)';
ctx.shadowBlur = 12;
ctx.shadowColor = '#ffff00';
if (props.ch1HasSignal) {
for (let x = 0; x < w; x += 2) {
const t = (x / pixPerCycle) * 2 * Math.PI;
const yVal = scale * gainCH1 * 0.8 * Math.sin(t + time);
if (x === 0) ctx.moveTo(x, cy - yVal);
else ctx.lineTo(x, cy - yVal);
}
} else {
// 线线
ctx.moveTo(0, cy);
ctx.lineTo(w, cy);
for (let x = 0; x < w; x += 2) {
const t = (x / pixPerCycle) * 2 * Math.PI;
const yVal = scale * gainCH1 * 0.8 * Math.sin(t + time);
if (x === 0) ctx.moveTo(x, cy - yVal);
else ctx.lineTo(x, cy - yVal);
}
ctx.stroke();
@ -288,8 +238,8 @@ function drawOscilloscope() {
ctx.stroke();
}
// CH2 (Receiver) - 绿CH2
if (currentModeIndex.value === 1 || currentModeIndex.value === 2) {
// CH2 (Receiver) - 绿CH2
if (currentModeIndex.value === 1 || currentModeIndex.value === 2 || currentModeIndex.value === 3) {
const opacity = 0.3 + 0.7 * phy.resonanceFactor;
ctx.beginPath();
ctx.strokeStyle = `rgba(0, 255, 0, ${opacity})`;
@ -299,18 +249,11 @@ function drawOscilloscope() {
const phaseShift = phy.phaseRadTotal;
const ampY = phy.resonanceFactor * gainCH2 * 0.8;
if (props.ch2HasSignal) {
for (let x = 0; x < w; x += 2) {
const t = (x / pixPerCycle) * 2 * Math.PI;
const yVal = scale * ampY * Math.sin(t - phaseShift + time);
if (x === 0) ctx.moveTo(x, cy - yVal);
else ctx.lineTo(x, cy - yVal);
}
} else {
// 线线
ctx.shadowBlur = 0;
ctx.moveTo(0, cy);
ctx.lineTo(w, cy);
for (let x = 0; x < w; x += 2) {
const t = (x / pixPerCycle) * 2 * Math.PI;
const yVal = scale * ampY * Math.sin(t - phaseShift + time);
if (x === 0) ctx.moveTo(x, cy - yVal);
else ctx.lineTo(x, cy - yVal);
}
ctx.stroke();

View File

@ -1,8 +0,0 @@
src\components\DeterminationMachine.vue -> 换能器
src\components\Oscilloscope.vue -> 示波器
src\components\SignalGen.vue -> 信号发生器
[信号发生器的 发射端 波形] 接 [示波器的 CH1 输入]
[信号发生器的 发射端 换能器] 接 [换能器 左侧输入]
[信号发生器的 接收端 波形] 接 [示波器的 CH2 输入]
[信号发生器的 接收端 换能器] 接 [换能器 右侧输出]