fix: mother board reactive problem
This commit is contained in:
parent
1eded97c76
commit
c39f688115
|
|
@ -20,9 +20,7 @@ update:
|
|||
|
||||
# 生成Restful API到网页客户端
|
||||
gen-api:
|
||||
cd server && dotnet run &
|
||||
npx nswag openapi2tsclient /input:http://localhost:5000/swagger/v1/swagger.json /output:src/APIClient.ts
|
||||
pkill server
|
||||
npm run gen-api
|
||||
|
||||
# 构建服务器，包含win与linux平台
|
||||
[working-directory: "server"]
|
||||
|
|
|
|||
|
|
@ -8,44 +8,6 @@ using WebProtocol;
|
|||
|
||||
namespace server.Controllers;
|
||||
|
||||
// /// <summary>
|
||||
// /// [TODO:description]
|
||||
// /// </summary>
|
||||
// public class HomeController : ControllerBase
|
||||
// {
|
||||
// private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||
//
|
||||
// string INDEX_HTML_PATH = Path.Combine(Environment.CurrentDirectory, "index.html");
|
||||
//
|
||||
// /// <summary>
|
||||
// /// [TODO:description]
|
||||
// /// </summary>
|
||||
// /// <returns>[TODO:return]</returns>
|
||||
// [HttpGet("/")]
|
||||
// public IResult Index()
|
||||
// {
|
||||
// return TypedResults.Content("Hello", "text/html");
|
||||
// }
|
||||
//
|
||||
// // [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
|
||||
// // public IResult Error()
|
||||
// // {
|
||||
// // return TypedResults.Ok();
|
||||
// // }
|
||||
//
|
||||
// /// <summary>
|
||||
// /// [TODO:description]
|
||||
// /// </summary>
|
||||
// /// <returns>[TODO:return]</returns>
|
||||
// [HttpGet("/hello")]
|
||||
// [HttpPost("/hello")]
|
||||
// public IActionResult Hello()
|
||||
// {
|
||||
// string randomString = Guid.NewGuid().ToString();
|
||||
// return this.Ok($"Hello World! GUID: {randomString}");
|
||||
// }
|
||||
// }
|
||||
|
||||
/// <summary>
|
||||
/// UDP API
|
||||
/// </summary>
|
||||
|
|
@ -524,9 +486,9 @@ public class RemoteUpdater : ControllerBase
|
|||
/// <param name="bitstreamNum"> 比特流位号 </param>
|
||||
[HttpPost("DownloadBitstream")]
|
||||
[EnableCors("Users")]
|
||||
[ProducesResponseType(typeof(bool),StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException),StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception),StatusCodes.Status500InternalServerError)]
|
||||
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||
public async ValueTask<IResult> UpdateBitstream(string address, int port, int bitstreamNum)
|
||||
{
|
||||
// 检查文件
|
||||
|
|
@ -543,7 +505,7 @@ public class RemoteUpdater : ControllerBase
|
|||
if (!fileBytes.IsSuccessful) return TypedResults.InternalServerError(fileBytes.Error);
|
||||
|
||||
// 下载比特流
|
||||
var remoteUpdater = new RemoteUpdate.RemoteUpdateClient(address, port);
|
||||
var remoteUpdater = new RemoteUpdateClient.RemoteUpdater(address, port);
|
||||
var ret = await remoteUpdater.UpdateBitstream(bitstreamNum, fileBytes.Value);
|
||||
|
||||
if (ret.IsSuccessful)
|
||||
|
|
@ -574,9 +536,9 @@ public class RemoteUpdater : ControllerBase
|
|||
/// <returns>总共上传比特流的数量</returns>
|
||||
[HttpPost("DownloadMultiBitstreams")]
|
||||
[EnableCors("Users")]
|
||||
[ProducesResponseType(typeof(int),StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException),StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception),StatusCodes.Status500InternalServerError)]
|
||||
[ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||
public async ValueTask<IResult> DownloadMultiBitstreams(string address, int port, int? bitstreamNum)
|
||||
{
|
||||
// 检查文件
|
||||
|
|
@ -603,7 +565,7 @@ public class RemoteUpdater : ControllerBase
|
|||
}
|
||||
|
||||
// 下载比特流
|
||||
var remoteUpdater = new RemoteUpdate.RemoteUpdateClient(address, port);
|
||||
var remoteUpdater = new RemoteUpdateClient.RemoteUpdater(address, port);
|
||||
{
|
||||
var ret = await remoteUpdater.UploadBitstreams(bitstreams[0], bitstreams[1], bitstreams[2], bitstreams[3]);
|
||||
if (!ret.IsSuccessful) return TypedResults.InternalServerError(ret.Error);
|
||||
|
|
@ -634,12 +596,12 @@ public class RemoteUpdater : ControllerBase
|
|||
/// <returns>操作结果</returns>
|
||||
[HttpPost("HotResetBitstream")]
|
||||
[EnableCors("Users")]
|
||||
[ProducesResponseType(typeof(bool),StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException),StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception),StatusCodes.Status500InternalServerError)]
|
||||
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||
public async ValueTask<IResult> HotResetBitstream(string address, int port, int bitstreamNum)
|
||||
{
|
||||
var remoteUpdater = new RemoteUpdate.RemoteUpdateClient(address, port);
|
||||
var remoteUpdater = new RemoteUpdateClient.RemoteUpdater(address, port);
|
||||
var ret = await remoteUpdater.HotResetBitstream(bitstreamNum);
|
||||
|
||||
if (ret.IsSuccessful)
|
||||
|
|
@ -662,12 +624,12 @@ public class RemoteUpdater : ControllerBase
|
|||
/// <returns>[TODO:return]</returns>
|
||||
[HttpPost("GetFirmwareVersion")]
|
||||
[EnableCors("Users")]
|
||||
[ProducesResponseType(typeof(UInt32),StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException),StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception),StatusCodes.Status500InternalServerError)]
|
||||
[ProducesResponseType(typeof(UInt32), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||
public async ValueTask<IResult> GetFirmwareVersion(string address, int port)
|
||||
{
|
||||
var remoteUpdater = new RemoteUpdate.RemoteUpdateClient(address, port);
|
||||
var remoteUpdater = new RemoteUpdateClient.RemoteUpdater(address, port);
|
||||
var ret = await remoteUpdater.GetVersion();
|
||||
|
||||
if (ret.IsSuccessful)
|
||||
|
|
@ -684,6 +646,110 @@ public class RemoteUpdater : ControllerBase
|
|||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
[ApiController]
|
||||
[Route("api/[controller]")]
|
||||
public class DDSController : ControllerBase
|
||||
{
|
||||
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
/// <param name="address">[TODO:parameter]</param>
|
||||
/// <param name="port">[TODO:parameter]</param>
|
||||
/// <param name="channelNum">[TODO:parameter]</param>
|
||||
/// <param name="waveNum">[TODO:parameter]</param>
|
||||
/// <returns>[TODO:return]</returns>
|
||||
[HttpPost("SetWaveNum")]
|
||||
[EnableCors("Users")]
|
||||
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||
public async ValueTask<IResult> SetWaveNum(string address, int port, int channelNum, int waveNum)
|
||||
{
|
||||
var dds = new DDSClient.DDS(address, port);
|
||||
|
||||
var ret = await dds.SetWaveNum(channelNum, waveNum);
|
||||
if (ret.IsSuccessful)
|
||||
{
|
||||
logger.Info($"Device {address} set output wave num successfully");
|
||||
return TypedResults.Ok(ret.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
logger.Error(ret.Error);
|
||||
return TypedResults.InternalServerError(ret.Error);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
/// <param name="address">[TODO:parameter]</param>
|
||||
/// <param name="port">[TODO:parameter]</param>
|
||||
/// <param name="channelNum">[TODO:parameter]</param>
|
||||
/// <param name="waveNum">[TODO:parameter]</param>
|
||||
/// <param name="step">[TODO:parameter]</param>
|
||||
/// <returns>[TODO:return]</returns>
|
||||
[HttpPost("SetFreq")]
|
||||
[EnableCors("Users")]
|
||||
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||
public async ValueTask<IResult> SetFreq(string address, int port, int channelNum, int waveNum, UInt32 step)
|
||||
{
|
||||
var dds = new DDSClient.DDS(address, port);
|
||||
|
||||
var ret = await dds.SetFreq(channelNum, waveNum, step);
|
||||
if (ret.IsSuccessful)
|
||||
{
|
||||
logger.Info($"Device {address} set output freqency successfully");
|
||||
return TypedResults.Ok(ret.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
logger.Error(ret.Error);
|
||||
return TypedResults.InternalServerError(ret.Error);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
/// <param name="address">[TODO:parameter]</param>
|
||||
/// <param name="port">[TODO:parameter]</param>
|
||||
/// <param name="channelNum">[TODO:parameter]</param>
|
||||
/// <param name="waveNum">[TODO:parameter]</param>
|
||||
/// <param name="phase">[TODO:parameter]</param>
|
||||
/// <returns>[TODO:return]</returns>
|
||||
[HttpPost("SetPhase")]
|
||||
[EnableCors("Users")]
|
||||
[ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
|
||||
[ProducesResponseType(typeof(ArgumentException), StatusCodes.Status400BadRequest)]
|
||||
[ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
|
||||
public async ValueTask<IResult> SetPhase(string address, int port, int channelNum, int waveNum, int phase)
|
||||
{
|
||||
var dds = new DDSClient.DDS(address, port);
|
||||
|
||||
var ret = await dds.SetPhase(channelNum, waveNum, phase);
|
||||
if (ret.IsSuccessful)
|
||||
{
|
||||
logger.Info($"Device {address} set output phase successfully");
|
||||
return TypedResults.Ok(ret.Value);
|
||||
}
|
||||
else
|
||||
{
|
||||
logger.Error(ret.Error);
|
||||
return TypedResults.InternalServerError(ret.Error);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 数据控制器
|
||||
|
|
|
|||
|
|
@ -0,0 +1,170 @@
|
|||
using System.Net;
|
||||
using DotNext;
|
||||
|
||||
namespace DDSClient;
|
||||
|
||||
static class DDSAddr
|
||||
{
|
||||
/*地址定义：（以2路输出，4波形存储为例）
|
||||
00 R/W CHANNEL0 wave_sel
|
||||
01 R/W CHANNEL0 STORE0 freq_ctrl
|
||||
02 R/W CHANNEL0 STORE1 freq_ctrl
|
||||
03 R/W CHANNEL0 STORE2 freq_ctrl
|
||||
04 R/W CHANNEL0 STORE3 freq_ctrl
|
||||
05 R/W CHANNEL0 STORE0 phase_ctrl
|
||||
06 R/W CHANNEL0 STORE1 phase_ctrl
|
||||
07 R/W CHANNEL0 STORE2 phase_ctrl
|
||||
08 R/W CHANNEL0 STORE3 phase_ctrl
|
||||
09 R/W CHANNEL0 dds_wr_enable
|
||||
0A WO CHANNEL0 data
|
||||
|
||||
10 R/W CHANNEL1 wave_sel
|
||||
11 R/W CHANNEL1 STORE0 freq_ctrl
|
||||
12 R/W CHANNEL1 STORE1 freq_ctrl
|
||||
13 R/W CHANNEL1 STORE2 freq_ctrl
|
||||
14 R/W CHANNEL1 STORE3 freq_ctrl
|
||||
15 R/W CHANNEL1 STORE0 phase_ctrl
|
||||
16 R/W CHANNEL1 STORE1 phase_ctrl
|
||||
17 R/W CHANNEL1 STORE2 phase_ctrl
|
||||
18 R/W CHANNEL1 STORE3 phase_ctrl
|
||||
19 R/W CHANNEL1 dds_wr_enable
|
||||
1A WO CHANNEL1 data
|
||||
*/
|
||||
public const UInt32 Base = 0x4000_0000;
|
||||
public static readonly ChannelAddr[] Channel = { new ChannelAddr(0x00), new ChannelAddr(0x10) };
|
||||
|
||||
public class ChannelAddr
|
||||
{
|
||||
private readonly UInt32 Offset;
|
||||
public readonly UInt32 WaveSelect;
|
||||
public readonly UInt32[] FreqCtrl;
|
||||
public readonly UInt32[] PhaseCtrl;
|
||||
public readonly UInt32 WriteEnable;
|
||||
public readonly UInt32 WriteData;
|
||||
|
||||
public ChannelAddr(UInt32 offset)
|
||||
{
|
||||
this.Offset = offset;
|
||||
this.WaveSelect = Base + Offset + 0x00;
|
||||
this.FreqCtrl = new UInt32[]
|
||||
{
|
||||
Base + offset + 0x01,
|
||||
Base + offset + 0x02,
|
||||
Base + offset + 0x03,
|
||||
Base + offset + 0x04
|
||||
};
|
||||
this.PhaseCtrl = new UInt32[] {
|
||||
Base + Offset + 0x05,
|
||||
Base + Offset + 0x06,
|
||||
Base + Offset + 0x07,
|
||||
Base + Offset + 0x08
|
||||
};
|
||||
this.WriteEnable = Base + Offset + 0x09;
|
||||
this.WriteData = Base + Offset + 0x0A;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
public class DDS
|
||||
{
|
||||
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||
|
||||
readonly int timeout = 2000;
|
||||
|
||||
readonly int port;
|
||||
readonly string address;
|
||||
private IPEndPoint ep;
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
/// <param name="address">[TODO:parameter]</param>
|
||||
/// <param name="port">[TODO:parameter]</param>
|
||||
/// <param name="timeout">[TODO:parameter]</param>
|
||||
/// <returns>[TODO:return]</returns>
|
||||
public DDS(string address, int port, int timeout = 2000)
|
||||
{
|
||||
if (timeout < 0)
|
||||
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||
this.address = address;
|
||||
this.port = port;
|
||||
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||
this.timeout = timeout;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
/// <param name="channelNum">[TODO:parameter]</param>
|
||||
/// <param name="waveNum">[TODO:parameter]</param>
|
||||
/// <returns>[TODO:return]</returns>
|
||||
public async ValueTask<Result<bool>> SetWaveNum(int channelNum, int waveNum)
|
||||
{
|
||||
if (channelNum < 0 || channelNum > 1) return new(new ArgumentException(
|
||||
$"Channel number should be 0 ~ 1 instead of {channelNum}", nameof(channelNum)));
|
||||
if (waveNum < 0 || waveNum > 3) return new(new ArgumentException(
|
||||
$"Wave number should be 0 ~ 3 instead of {waveNum}", nameof(waveNum)));
|
||||
|
||||
await MsgBus.UDPServer.ClearUDPData(this.address);
|
||||
logger.Trace("Clear udp data finished");
|
||||
|
||||
var ret = await UDPClientPool.WriteAddr(
|
||||
this.ep, DDSAddr.Channel[channelNum].WaveSelect, (UInt32)waveNum, this.timeout);
|
||||
if (!ret.IsSuccessful)
|
||||
return new(ret.Error);
|
||||
return ret.Value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
/// <param name="channelNum">[TODO:parameter]</param>
|
||||
/// <param name="waveNum">[TODO:parameter]</param>
|
||||
/// <param name="step">[TODO:parameter]</param>
|
||||
/// <returns>[TODO:return]</returns>
|
||||
public async ValueTask<Result<bool>> SetFreq(int channelNum, int waveNum, UInt32 step)
|
||||
{
|
||||
if (channelNum < 0 || channelNum > 1) return new(new ArgumentException(
|
||||
$"Channel number should be 0 ~ 1 instead of {channelNum}", nameof(channelNum)));
|
||||
if (waveNum < 0 || waveNum > 3) return new(new ArgumentException(
|
||||
$"Wave number should be 0 ~ 3 instead of {waveNum}", nameof(waveNum)));
|
||||
|
||||
await MsgBus.UDPServer.ClearUDPData(this.address);
|
||||
logger.Trace("Clear udp data finished");
|
||||
|
||||
var ret = await UDPClientPool.WriteAddr(
|
||||
this.ep, DDSAddr.Channel[channelNum].FreqCtrl[waveNum], step, this.timeout);
|
||||
if (!ret.IsSuccessful)
|
||||
return new(ret.Error);
|
||||
return ret.Value;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// [TODO:description]
|
||||
/// </summary>
|
||||
/// <param name="channelNum">[TODO:parameter]</param>
|
||||
/// <param name="waveNum">[TODO:parameter]</param>
|
||||
/// <param name="phase">[TODO:parameter]</param>
|
||||
/// <returns>[TODO:return]</returns>
|
||||
public async ValueTask<Result<bool>> SetPhase(int channelNum, int waveNum, int phase)
|
||||
{
|
||||
if (channelNum < 0 || channelNum > 1) return new(new ArgumentException(
|
||||
$"Channel number should be 0 ~ 1 instead of {channelNum}", nameof(channelNum)));
|
||||
if (waveNum < 0 || waveNum > 3) return new(new ArgumentException(
|
||||
$"Wave number should be 0 ~ 3 instead of {waveNum}", nameof(waveNum)));
|
||||
if (phase < 0 || phase > 4096) return new(new ArgumentException(
|
||||
$"Phase should be 0 ~ 4096 instead of {phase}", nameof(phase)));
|
||||
|
||||
await MsgBus.UDPServer.ClearUDPData(this.address);
|
||||
logger.Trace("Clear udp data finished");
|
||||
|
||||
var ret = await UDPClientPool.WriteAddr(
|
||||
this.ep, DDSAddr.Channel[channelNum].PhaseCtrl[waveNum], (UInt32)phase, this.timeout);
|
||||
if (!ret.IsSuccessful)
|
||||
return new(ret.Error);
|
||||
return ret.Value;
|
||||
}
|
||||
}
|
||||
240
src/APIClient.ts
240
src/APIClient.ts
|
|
@ -1000,6 +1000,246 @@ export class RemoteUpdaterClient {
|
|||
}
|
||||
}
|
||||
|
||||
export class DDSClient {
|
||||
private http: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> };
|
||||
private baseUrl: string;
|
||||
protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined;
|
||||
|
||||
constructor(baseUrl?: string, http?: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> }) {
|
||||
this.http = http ? http : window as any;
|
||||
this.baseUrl = baseUrl ?? "http://localhost:5000";
|
||||
}
|
||||
|
||||
/**
|
||||
* [TODO:description]
|
||||
* @param address (optional) [TODO:parameter]
|
||||
* @param port (optional) [TODO:parameter]
|
||||
* @param channelNum (optional) [TODO:parameter]
|
||||
* @param waveNum (optional) [TODO:parameter]
|
||||
* @return [TODO:return]
|
||||
*/
|
||||
setWaveNum(address: string | undefined, port: number | undefined, channelNum: number | undefined, waveNum: number | undefined): Promise<boolean> {
|
||||
let url_ = this.baseUrl + "/api/DDS/SetWaveNum?";
|
||||
if (address === null)
|
||||
throw new Error("The parameter 'address' cannot be null.");
|
||||
else if (address !== undefined)
|
||||
url_ += "address=" + encodeURIComponent("" + address) + "&";
|
||||
if (port === null)
|
||||
throw new Error("The parameter 'port' cannot be null.");
|
||||
else if (port !== undefined)
|
||||
url_ += "port=" + encodeURIComponent("" + port) + "&";
|
||||
if (channelNum === null)
|
||||
throw new Error("The parameter 'channelNum' cannot be null.");
|
||||
else if (channelNum !== undefined)
|
||||
url_ += "channelNum=" + encodeURIComponent("" + channelNum) + "&";
|
||||
if (waveNum === null)
|
||||
throw new Error("The parameter 'waveNum' cannot be null.");
|
||||
else if (waveNum !== undefined)
|
||||
url_ += "waveNum=" + encodeURIComponent("" + waveNum) + "&";
|
||||
url_ = url_.replace(/[?&]$/, "");
|
||||
|
||||
let options_: RequestInit = {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Accept": "application/json"
|
||||
}
|
||||
};
|
||||
|
||||
return this.http.fetch(url_, options_).then((_response: Response) => {
|
||||
return this.processSetWaveNum(_response);
|
||||
});
|
||||
}
|
||||
|
||||
protected processSetWaveNum(response: Response): Promise<boolean> {
|
||||
const status = response.status;
|
||||
let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
|
||||
if (status === 200) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result200: any = null;
|
||||
let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result200 = resultData200 !== undefined ? resultData200 : <any>null;
|
||||
|
||||
return result200;
|
||||
});
|
||||
} else if (status === 400) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result400: any = null;
|
||||
let resultData400 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result400 = ArgumentException.fromJS(resultData400);
|
||||
return throwException("A server side error occurred.", status, _responseText, _headers, result400);
|
||||
});
|
||||
} else if (status === 500) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result500: any = null;
|
||||
let resultData500 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result500 = Exception.fromJS(resultData500);
|
||||
return throwException("A server side error occurred.", status, _responseText, _headers, result500);
|
||||
});
|
||||
} else if (status !== 200 && status !== 204) {
|
||||
return response.text().then((_responseText) => {
|
||||
return throwException("An unexpected server error occurred.", status, _responseText, _headers);
|
||||
});
|
||||
}
|
||||
return Promise.resolve<boolean>(null as any);
|
||||
}
|
||||
|
||||
/**
|
||||
* [TODO:description]
|
||||
* @param address (optional) [TODO:parameter]
|
||||
* @param port (optional) [TODO:parameter]
|
||||
* @param channelNum (optional) [TODO:parameter]
|
||||
* @param waveNum (optional) [TODO:parameter]
|
||||
* @param step (optional) [TODO:parameter]
|
||||
* @return [TODO:return]
|
||||
*/
|
||||
setFreq(address: string | undefined, port: number | undefined, channelNum: number | undefined, waveNum: number | undefined, step: number | undefined): Promise<boolean> {
|
||||
let url_ = this.baseUrl + "/api/DDS/SetFreq?";
|
||||
if (address === null)
|
||||
throw new Error("The parameter 'address' cannot be null.");
|
||||
else if (address !== undefined)
|
||||
url_ += "address=" + encodeURIComponent("" + address) + "&";
|
||||
if (port === null)
|
||||
throw new Error("The parameter 'port' cannot be null.");
|
||||
else if (port !== undefined)
|
||||
url_ += "port=" + encodeURIComponent("" + port) + "&";
|
||||
if (channelNum === null)
|
||||
throw new Error("The parameter 'channelNum' cannot be null.");
|
||||
else if (channelNum !== undefined)
|
||||
url_ += "channelNum=" + encodeURIComponent("" + channelNum) + "&";
|
||||
if (waveNum === null)
|
||||
throw new Error("The parameter 'waveNum' cannot be null.");
|
||||
else if (waveNum !== undefined)
|
||||
url_ += "waveNum=" + encodeURIComponent("" + waveNum) + "&";
|
||||
if (step === null)
|
||||
throw new Error("The parameter 'step' cannot be null.");
|
||||
else if (step !== undefined)
|
||||
url_ += "step=" + encodeURIComponent("" + step) + "&";
|
||||
url_ = url_.replace(/[?&]$/, "");
|
||||
|
||||
let options_: RequestInit = {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Accept": "application/json"
|
||||
}
|
||||
};
|
||||
|
||||
return this.http.fetch(url_, options_).then((_response: Response) => {
|
||||
return this.processSetFreq(_response);
|
||||
});
|
||||
}
|
||||
|
||||
protected processSetFreq(response: Response): Promise<boolean> {
|
||||
const status = response.status;
|
||||
let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
|
||||
if (status === 200) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result200: any = null;
|
||||
let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result200 = resultData200 !== undefined ? resultData200 : <any>null;
|
||||
|
||||
return result200;
|
||||
});
|
||||
} else if (status === 400) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result400: any = null;
|
||||
let resultData400 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result400 = ArgumentException.fromJS(resultData400);
|
||||
return throwException("A server side error occurred.", status, _responseText, _headers, result400);
|
||||
});
|
||||
} else if (status === 500) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result500: any = null;
|
||||
let resultData500 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result500 = Exception.fromJS(resultData500);
|
||||
return throwException("A server side error occurred.", status, _responseText, _headers, result500);
|
||||
});
|
||||
} else if (status !== 200 && status !== 204) {
|
||||
return response.text().then((_responseText) => {
|
||||
return throwException("An unexpected server error occurred.", status, _responseText, _headers);
|
||||
});
|
||||
}
|
||||
return Promise.resolve<boolean>(null as any);
|
||||
}
|
||||
|
||||
/**
|
||||
* [TODO:description]
|
||||
* @param address (optional) [TODO:parameter]
|
||||
* @param port (optional) [TODO:parameter]
|
||||
* @param channelNum (optional) [TODO:parameter]
|
||||
* @param waveNum (optional) [TODO:parameter]
|
||||
* @param phase (optional) [TODO:parameter]
|
||||
* @return [TODO:return]
|
||||
*/
|
||||
setPhase(address: string | undefined, port: number | undefined, channelNum: number | undefined, waveNum: number | undefined, phase: number | undefined): Promise<boolean> {
|
||||
let url_ = this.baseUrl + "/api/DDS/SetPhase?";
|
||||
if (address === null)
|
||||
throw new Error("The parameter 'address' cannot be null.");
|
||||
else if (address !== undefined)
|
||||
url_ += "address=" + encodeURIComponent("" + address) + "&";
|
||||
if (port === null)
|
||||
throw new Error("The parameter 'port' cannot be null.");
|
||||
else if (port !== undefined)
|
||||
url_ += "port=" + encodeURIComponent("" + port) + "&";
|
||||
if (channelNum === null)
|
||||
throw new Error("The parameter 'channelNum' cannot be null.");
|
||||
else if (channelNum !== undefined)
|
||||
url_ += "channelNum=" + encodeURIComponent("" + channelNum) + "&";
|
||||
if (waveNum === null)
|
||||
throw new Error("The parameter 'waveNum' cannot be null.");
|
||||
else if (waveNum !== undefined)
|
||||
url_ += "waveNum=" + encodeURIComponent("" + waveNum) + "&";
|
||||
if (phase === null)
|
||||
throw new Error("The parameter 'phase' cannot be null.");
|
||||
else if (phase !== undefined)
|
||||
url_ += "phase=" + encodeURIComponent("" + phase) + "&";
|
||||
url_ = url_.replace(/[?&]$/, "");
|
||||
|
||||
let options_: RequestInit = {
|
||||
method: "POST",
|
||||
headers: {
|
||||
"Accept": "application/json"
|
||||
}
|
||||
};
|
||||
|
||||
return this.http.fetch(url_, options_).then((_response: Response) => {
|
||||
return this.processSetPhase(_response);
|
||||
});
|
||||
}
|
||||
|
||||
protected processSetPhase(response: Response): Promise<boolean> {
|
||||
const status = response.status;
|
||||
let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
|
||||
if (status === 200) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result200: any = null;
|
||||
let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result200 = resultData200 !== undefined ? resultData200 : <any>null;
|
||||
|
||||
return result200;
|
||||
});
|
||||
} else if (status === 400) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result400: any = null;
|
||||
let resultData400 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result400 = ArgumentException.fromJS(resultData400);
|
||||
return throwException("A server side error occurred.", status, _responseText, _headers, result400);
|
||||
});
|
||||
} else if (status === 500) {
|
||||
return response.text().then((_responseText) => {
|
||||
let result500: any = null;
|
||||
let resultData500 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
|
||||
result500 = Exception.fromJS(resultData500);
|
||||
return throwException("A server side error occurred.", status, _responseText, _headers, result500);
|
||||
});
|
||||
} else if (status !== 200 && status !== 204) {
|
||||
return response.text().then((_responseText) => {
|
||||
return throwException("An unexpected server error occurred.", status, _responseText, _headers);
|
||||
});
|
||||
}
|
||||
return Promise.resolve<boolean>(null as any);
|
||||
}
|
||||
}
|
||||
|
||||
export class DataClient {
|
||||
private http: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> };
|
||||
private baseUrl: string;
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ const emit = defineEmits<{
|
|||
}>();
|
||||
|
||||
// 控制折叠面板状态
|
||||
const generalPropsExpanded = ref(true);
|
||||
const generalPropsExpanded = ref(false);
|
||||
const componentPropsExpanded = ref(true);
|
||||
|
||||
// 更新组件属性方法
|
||||
|
|
|
|||
|
|
@ -45,18 +45,10 @@
|
|||
|
||||
<CollapsibleSection title="组件功能" v-model:isExpanded="componentCapsExpanded" status="default" class="mt-4">
|
||||
<div v-if="componentData && componentData.type">
|
||||
<component
|
||||
v-if="capabilityComponent"
|
||||
:is="capabilityComponent"
|
||||
v-bind="componentData.attrs"
|
||||
/>
|
||||
<div v-else class="text-gray-400">
|
||||
该组件没有提供特殊功能
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="text-gray-400">
|
||||
选择元件以查看其功能
|
||||
<component v-if="capabilityComponent" :is="capabilityComponent" v-bind="componentData.attrs" />
|
||||
<div v-else class="text-gray-400">该组件没有提供特殊功能</div>
|
||||
</div>
|
||||
<div v-else class="text-gray-400">选择元件以查看其功能</div>
|
||||
</CollapsibleSection>
|
||||
|
||||
<!-- 未来可以在这里添加更多的分区 -->
|
||||
|
|
@ -98,7 +90,7 @@ const props = defineProps<{
|
|||
}>();
|
||||
|
||||
// 控制各个属性分区的展开状态
|
||||
const propertySectionExpanded = ref(true); // 基本属性区域默认展开
|
||||
const propertySectionExpanded = ref(false); // 基本属性区域默认展开
|
||||
const pinsSectionExpanded = ref(false); // 引脚配置区域默认折叠
|
||||
const componentCapsExpanded = ref(true); // 组件功能区域默认展开
|
||||
const wireSectionExpanded = ref(false); // 连线管理区域默认折叠
|
||||
|
|
@ -227,7 +219,7 @@ async function getExposedCapabilities(componentType: string) {
|
|||
const Component = module.default;
|
||||
|
||||
// 创建一个临时div作为挂载点
|
||||
const tempDiv = document.createElement('div');
|
||||
const tempDiv = document.createElement("div");
|
||||
|
||||
// 创建临时应用实例并挂载组件
|
||||
let exposedMethods: any = null;
|
||||
|
|
@ -239,19 +231,22 @@ async function getExposedCapabilities(componentType: string) {
|
|||
// 获取组件实例暴露的方法
|
||||
exposedMethods = el;
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
// 挂载应用
|
||||
const vm = app.mount(tempDiv);
|
||||
|
||||
// 确保实例已创建并获取到暴露的方法
|
||||
await new Promise(resolve => setTimeout(resolve, 0));
|
||||
await new Promise((resolve) => setTimeout(resolve, 0));
|
||||
|
||||
// 检查是否有getCapabilities方法
|
||||
if (exposedMethods && typeof exposedMethods.getCapabilities === 'function') {
|
||||
if (
|
||||
exposedMethods &&
|
||||
typeof exposedMethods.getCapabilities === "function"
|
||||
) {
|
||||
// 获取能力组件定义
|
||||
const CapabilityComponent = exposedMethods.getCapabilities();
|
||||
|
||||
|
|
@ -280,7 +275,9 @@ watch(
|
|||
if (newComponentData && newComponentData.type) {
|
||||
try {
|
||||
// 首先尝试从实例中获取暴露的方法
|
||||
const capsComponent = await getExposedCapabilities(newComponentData.type);
|
||||
const capsComponent = await getExposedCapabilities(
|
||||
newComponentData.type,
|
||||
);
|
||||
|
||||
if (capsComponent) {
|
||||
capabilityComponent.value = markRaw(capsComponent);
|
||||
|
|
@ -289,10 +286,13 @@ watch(
|
|||
}
|
||||
|
||||
// 如果实例方法获取失败，回退到模块导出方法
|
||||
const module = await import(`./equipments/${newComponentData.type}.vue`);
|
||||
const module = await import(
|
||||
`./equipments/${newComponentData.type}.vue`
|
||||
);
|
||||
|
||||
if (
|
||||
(module.default && typeof module.default.getCapabilities === "function") ||
|
||||
(module.default &&
|
||||
typeof module.default.getCapabilities === "function") ||
|
||||
typeof module.getCapabilities === "function"
|
||||
) {
|
||||
const getCapsFn =
|
||||
|
|
@ -318,7 +318,7 @@ watch(
|
|||
capabilityComponent.value = null;
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
{ immediate: true },
|
||||
);
|
||||
|
||||
// 修改hasComponentCaps计算属性
|
||||
|
|
|
|||
|
|
@ -6,26 +6,27 @@
|
|||
<!-- Input File -->
|
||||
<fieldset class="fieldset w-full">
|
||||
<legend class="fieldset-legend text-sm">选择或拖拽上传文件</legend>
|
||||
<input
|
||||
type="file"
|
||||
ref="fileInput"
|
||||
class="file-input w-full"
|
||||
@change="handleFileChange"
|
||||
/>
|
||||
<input type="file" ref="fileInput" class="file-input w-full" @change="handleFileChange" />
|
||||
<label class="fieldset-label">文件最大容量: {{ maxMemory }}MB</label>
|
||||
</fieldset>
|
||||
|
||||
<!-- Upload Button -->
|
||||
<div class="card-actions w-full">
|
||||
<button @click="handleClick" class="btn btn-primary grow">
|
||||
<button @click="handleClick" class="btn btn-primary grow" :disabled="isUploading">
|
||||
<div v-if="isUploading">
|
||||
<span class="loading loading-spinner"></span>
|
||||
下载中...
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ buttonText }}
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, useTemplateRef, onMounted } from "vue";
|
||||
import { computed, ref, useTemplateRef, onMounted } from "vue";
|
||||
import { useDialogStore } from "@/stores/dialog";
|
||||
import { isNull, isUndefined } from "lodash";
|
||||
|
||||
|
|
@ -46,6 +47,7 @@ const emits = defineEmits<{
|
|||
|
||||
const dialog = useDialogStore();
|
||||
|
||||
const isUploading = ref(false);
|
||||
const buttonText = computed(() => {
|
||||
return isUndefined(props.downloadEvent) ? "上传" : "上传并下载";
|
||||
});
|
||||
|
|
@ -93,6 +95,7 @@ async function handleClick(event: Event): Promise<void> {
|
|||
}
|
||||
|
||||
// Upload - 修改这里，传递bitstream.value而不是bitstream
|
||||
isUploading.value = true;
|
||||
try {
|
||||
const ret = await props.uploadEvent(event, bitstream.value);
|
||||
if (isUndefined(props.downloadEvent)) {
|
||||
|
|
@ -117,6 +120,8 @@ async function handleClick(event: Event): Promise<void> {
|
|||
dialog.error("下载失败");
|
||||
console.error(e);
|
||||
}
|
||||
|
||||
isUploading.value = false;
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<template> <div class="dds-property-editor">
|
||||
<template>
|
||||
<div class="dds-property-editor">
|
||||
<CollapsibleSection title="信号发生器" :isExpanded="true">
|
||||
<div class="dds-editor-container">
|
||||
<div class="dds-display">
|
||||
|
|
@ -9,27 +10,35 @@
|
|||
<path :d="currentWaveformPath" stroke="lime" stroke-width="2" fill="none" />
|
||||
|
||||
<!-- 频率和相位显示 -->
|
||||
<text x="20" y="25" fill="#0f0" font-size="14">{{ displayFrequency }}</text>
|
||||
<text x="200" y="25" fill="#0f0" font-size="14">φ: {{ phase }}°</text>
|
||||
<text x="150" y="110" fill="#0f0" font-size="14" text-anchor="middle">{{ displayTimebase }}</text>
|
||||
<text x="20" y="25" fill="#0f0" font-size="14">
|
||||
{{ displayFrequency }}
|
||||
</text>
|
||||
<text x="200" y="25" fill="#0f0" font-size="14">
|
||||
φ: {{ phase }}°
|
||||
</text>
|
||||
<text x="150" y="110" fill="#0f0" font-size="14" text-anchor="middle">
|
||||
{{ displayTimebase }}
|
||||
</text>
|
||||
</svg>
|
||||
|
||||
<!-- 时基控制 -->
|
||||
<div class="timebase-controls">
|
||||
<button class="timebase-button" @click="decreaseTimebase">-</button>
|
||||
<button class="timebase-button" @click="decreaseTimebase">
|
||||
-
|
||||
</button>
|
||||
<span class="timebase-label">时基</span>
|
||||
<button class="timebase-button" @click="increaseTimebase">+</button>
|
||||
<button class="timebase-button" @click="increaseTimebase">
|
||||
+
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 波形选择区 -->
|
||||
<div class="waveform-selector">
|
||||
<div
|
||||
v-for="(name, index) in waveformNames"
|
||||
:key="`wave-${index}`"
|
||||
:class="['waveform-option', { active: currentWaveformIndex === index }]"
|
||||
@click="selectWaveform(index)"
|
||||
>
|
||||
<div v-for="(name, index) in waveformNames" :key="`wave-${index}`" :class="[
|
||||
'waveform-option',
|
||||
{ active: currentWaveformIndex === index },
|
||||
]" @click="selectWaveform(index)">
|
||||
{{ name }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -39,15 +48,14 @@
|
|||
<div class="control-group">
|
||||
<span class="control-label">频率:</span>
|
||||
<div class="control-buttons">
|
||||
<button class="control-button" @click="decreaseFrequency">-</button>
|
||||
<input
|
||||
v-model="frequencyInput"
|
||||
@blur="applyFrequencyInput"
|
||||
@keyup.enter="applyFrequencyInput"
|
||||
class="control-input"
|
||||
type="text"
|
||||
/>
|
||||
<button class="control-button" @click="increaseFrequency">+</button>
|
||||
<button class="control-button" @click="decreaseFrequency">
|
||||
-
|
||||
</button>
|
||||
<input v-model="frequencyInput" @blur="applyFrequencyInput" @keyup.enter="applyFrequencyInput"
|
||||
class="control-input" type="text" />
|
||||
<button class="control-button" @click="increaseFrequency">
|
||||
+
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -55,13 +63,8 @@
|
|||
<span class="control-label">相位:</span>
|
||||
<div class="control-buttons">
|
||||
<button class="control-button" @click="decreasePhase">-</button>
|
||||
<input
|
||||
v-model="phaseInput"
|
||||
@blur="applyPhaseInput"
|
||||
@keyup.enter="applyPhaseInput"
|
||||
class="control-input"
|
||||
type="text"
|
||||
/>
|
||||
<input v-model="phaseInput" @blur="applyPhaseInput" @keyup.enter="applyPhaseInput" class="control-input"
|
||||
type="text" />
|
||||
<button class="control-button" @click="increasePhase">+</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -69,53 +72,48 @@
|
|||
|
||||
<!-- 自定义波形输入 -->
|
||||
<div class="custom-waveform">
|
||||
<div class="section-heading">自定义波形</div> <div class="input-group">
|
||||
<div class="section-heading">自定义波形</div>
|
||||
<div class="input-group">
|
||||
<label class="input-label">函数表达式:</label>
|
||||
<input
|
||||
v-model="customWaveformExpression"
|
||||
class="function-input"
|
||||
<input v-model="customWaveformExpression" class="function-input"
|
||||
placeholder="例如: sin(t) 或 x^(2/3)+0.9*sqrt(3.3-x^2)*sin(a*PI*x) [a=7.8]"
|
||||
@keyup.enter="applyCustomWaveform"
|
||||
/>
|
||||
<button class="apply-button" @click="applyCustomWaveform">应用</button>
|
||||
@keyup.enter="applyCustomWaveform" />
|
||||
<button class="apply-button" @click="applyCustomWaveform">
|
||||
应用
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="example-functions">
|
||||
<div class="example-label">示例函数:</div>
|
||||
<div class="example-buttons">
|
||||
<button
|
||||
class="example-button"
|
||||
@click="applyExampleFunction('sin(t)')"
|
||||
>正弦波</button>
|
||||
<button
|
||||
class="example-button"
|
||||
@click="applyExampleFunction('sin(t)^3')"
|
||||
>立方正弦</button> <button
|
||||
class="example-button"
|
||||
@click="applyExampleFunction('((x)^(2/3)+0.9*sqrt(3.3-(x)^2)*sin(10*PI*(x)))*0.75')"
|
||||
>心形函数</button>
|
||||
<button class="example-button" @click="applyExampleFunction('sin(t)')">
|
||||
正弦波
|
||||
</button>
|
||||
<button class="example-button" @click="applyExampleFunction('sin(t)^3')">
|
||||
立方正弦
|
||||
</button>
|
||||
<button class="example-button" @click="
|
||||
applyExampleFunction(
|
||||
'((x)^(2/3)+0.9*sqrt(3.3-(x)^2)*sin(10*PI*(x)))*0.75',
|
||||
)
|
||||
">
|
||||
心形函数
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="drawing-area">
|
||||
<div class="section-heading">波形绘制</div>
|
||||
<div
|
||||
class="waveform-canvas-container"
|
||||
ref="canvasContainer"
|
||||
>
|
||||
<canvas
|
||||
ref="drawingCanvas"
|
||||
class="drawing-canvas"
|
||||
width="280"
|
||||
height="100"
|
||||
@mousedown="startDrawing"
|
||||
@mousemove="draw"
|
||||
@mouseup="stopDrawing"
|
||||
@mouseleave="stopDrawing"
|
||||
></canvas>
|
||||
<div class="waveform-canvas-container" ref="canvasContainer">
|
||||
<canvas ref="drawingCanvas" class="drawing-canvas" width="280" height="100" @mousedown="startDrawing"
|
||||
@mousemove="draw" @mouseup="stopDrawing" @mouseleave="stopDrawing"></canvas>
|
||||
<div class="canvas-actions">
|
||||
<button class="canvas-button" @click="clearCanvas">清除</button>
|
||||
<button class="canvas-button" @click="applyDrawnWaveform">应用绘制</button>
|
||||
<button class="canvas-button" @click="clearCanvas">
|
||||
清除
|
||||
</button>
|
||||
<button class="canvas-button" @click="applyDrawnWaveform">
|
||||
应用绘制
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -125,22 +123,25 @@
|
|||
<div class="saved-waveforms">
|
||||
<div class="section-heading">波形存储槽</div>
|
||||
<div class="slot-container">
|
||||
<div
|
||||
v-for="(slot, index) in waveformSlots"
|
||||
:key="`slot-${index}`"
|
||||
:class="['waveform-slot', { empty: !slot.name }]"
|
||||
@click="loadWaveformSlot(index)"
|
||||
>
|
||||
<span class="slot-name">{{ slot.name || `槽 ${index+1}` }}</span>
|
||||
<button
|
||||
class="save-button"
|
||||
@click.stop="saveCurrentToSlot(index)"
|
||||
>
|
||||
<div v-for="(slot, index) in waveformSlots" :key="`slot-${index}`"
|
||||
:class="['waveform-slot', { empty: !slot.name }]" @click="loadWaveformSlot(index)">
|
||||
<span class="slot-name">{{
|
||||
slot.name || `槽 ${index + 1}`
|
||||
}}</span>
|
||||
<button class="save-button" @click.stop="saveCurrentToSlot(index)">
|
||||
保存
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button class="btn btn-primary text-primary-content w-full" :disabled="isApplying" @click="applyOutputWave">
|
||||
<div v-if="isApplying">
|
||||
<span class="loading loading-spinner"></span>
|
||||
应用中...
|
||||
</div>
|
||||
<div v-else>应用输出波形</div>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</CollapsibleSection>
|
||||
|
|
@ -148,22 +149,33 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, watch, onMounted } from 'vue';
|
||||
import CollapsibleSection from '../CollapsibleSection.vue';
|
||||
import { ref, computed, watch, onMounted } from "vue";
|
||||
import CollapsibleSection from "../CollapsibleSection.vue";
|
||||
import { DDSClient } from "@/APIClient";
|
||||
import { useEquipments } from "@/stores/equipments";
|
||||
import { useDialogStore } from "@/stores/dialog";
|
||||
import { toInteger } from "lodash";
|
||||
|
||||
// Component Attributes
|
||||
const props = defineProps<{
|
||||
modelValue: any;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits(['update:modelValue']);
|
||||
const emit = defineEmits(["update:modelValue"]);
|
||||
|
||||
// Global varibles
|
||||
const dds = new DDSClient();
|
||||
const eqps = useEquipments();
|
||||
const dialog = useDialogStore();
|
||||
|
||||
// 波形状态
|
||||
const frequency = ref(props.modelValue?.frequency || 1000);
|
||||
const phase = ref(props.modelValue?.phase || 0);
|
||||
const frequency = ref<number>(props.modelValue?.frequency || 1000);
|
||||
const phase = ref<number>(props.modelValue?.phase || 0);
|
||||
const timebase = ref(props.modelValue?.timebase || 1); // 时基默认为1倍
|
||||
const currentWaveformIndex = ref(0);
|
||||
const waveformNames = ['正弦波', '方波', '三角波', '锯齿波', '自定义'];
|
||||
const waveforms = ['sine', 'square', 'triangle', 'sawtooth', 'custom'];
|
||||
const waveformNames = ["正弦波", "方波", "三角波", "锯齿波", "自定义"];
|
||||
const waveforms = ["sine", "square", "triangle", "sawtooth", "custom"];
|
||||
const isApplying = ref(false);
|
||||
|
||||
// 波形函数集合
|
||||
interface WaveformFunction {
|
||||
|
|
@ -176,45 +188,72 @@ interface WaveformFunctions {
|
|||
|
||||
const waveformFunctions: WaveformFunctions = {
|
||||
// 正弦波函数: sin(2π*x + φ)
|
||||
sine: (x: number, width: number, height: number, phaseRad: number): number => {
|
||||
return height/2 * Math.sin(2 * Math.PI * (x / width) * 2 + phaseRad);
|
||||
sine: (
|
||||
x: number,
|
||||
width: number,
|
||||
height: number,
|
||||
phaseRad: number,
|
||||
): number => {
|
||||
return (height / 2) * Math.sin(2 * Math.PI * (x / width) * 2 + phaseRad);
|
||||
},
|
||||
|
||||
// 方波函数: 周期性的高低电平
|
||||
square: (x: number, width: number, height: number, phaseRad: number): number => {
|
||||
square: (
|
||||
x: number,
|
||||
width: number,
|
||||
height: number,
|
||||
phaseRad: number,
|
||||
): number => {
|
||||
const normX = (x / width + phaseRad / (2 * Math.PI)) % 1;
|
||||
return normX < 0.5 ? height/4 : -height/4;
|
||||
return normX < 0.5 ? height / 4 : -height / 4;
|
||||
},
|
||||
|
||||
// 三角波函数: 线性上升和下降
|
||||
triangle: (x: number, width: number, height: number, phaseRad: number): number => {
|
||||
triangle: (
|
||||
x: number,
|
||||
width: number,
|
||||
height: number,
|
||||
phaseRad: number,
|
||||
): number => {
|
||||
const normX = (x / width + phaseRad / (2 * Math.PI)) % 1;
|
||||
return height/2 - height * Math.abs(2 * normX - 1);
|
||||
return height / 2 - height * Math.abs(2 * normX - 1);
|
||||
},
|
||||
|
||||
// 锯齿波函数: 线性上升,瞬间下降
|
||||
sawtooth: (x: number, width: number, height: number, phaseRad: number): number => {
|
||||
sawtooth: (
|
||||
x: number,
|
||||
width: number,
|
||||
height: number,
|
||||
phaseRad: number,
|
||||
): number => {
|
||||
const normX = (x / width + phaseRad / (2 * Math.PI)) % 1;
|
||||
return height/2 - height/2 * (2 * normX);
|
||||
return height / 2 - (height / 2) * (2 * normX);
|
||||
},
|
||||
|
||||
// 自定义波形函数占位符
|
||||
custom: (x: number, width: number, height: number, phaseRad: number): number => {
|
||||
custom: (
|
||||
x: number,
|
||||
width: number,
|
||||
height: number,
|
||||
phaseRad: number,
|
||||
): number => {
|
||||
return 0; // 默认返回0，会在应用自定义表达式时更新
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
// 输入控制
|
||||
const frequencyInput = ref(formatFrequency(frequency.value));
|
||||
const phaseInput = ref(phase.value.toString());
|
||||
const customWaveformExpression = ref('');
|
||||
const customWaveformExpression = ref("");
|
||||
|
||||
// 波形槽
|
||||
const waveformSlots = ref<{ name: string; type: string; data: number[][] | null }[]>([
|
||||
{ name: '正弦波', type: 'sine', data: null },
|
||||
{ name: '方波', type: 'square', data: null },
|
||||
{ name: '三角波', type: 'triangle', data: null },
|
||||
{ name: '', type: '', data: null }
|
||||
const waveformSlots = ref<
|
||||
{ name: string; type: string; data: number[][] | null }[]
|
||||
>([
|
||||
{ name: "正弦波", type: "sine", data: null },
|
||||
{ name: "方波", type: "square", data: null },
|
||||
{ name: "三角波", type: "triangle", data: null },
|
||||
{ name: "", type: "", data: null },
|
||||
]);
|
||||
|
||||
// 绘图相关
|
||||
|
|
@ -283,7 +322,7 @@ const currentWaveformPath = computed(() => {
|
|||
const xOffset = 0;
|
||||
const yOffset = 30;
|
||||
const currentWaveform = waveforms[currentWaveformIndex.value];
|
||||
const phaseRadians = phase.value * Math.PI / 180;
|
||||
const phaseRadians = (phase.value * Math.PI) / 180;
|
||||
|
||||
// 时基和频率共同影响周期数量
|
||||
// 频率因素 - 频率越高，一个屏幕内显示的周期越多
|
||||
|
|
@ -297,9 +336,9 @@ const currentWaveformPath = computed(() => {
|
|||
// 组合因素
|
||||
const scaleFactor = timebaseFactor * frequencyFactor;
|
||||
|
||||
let path = '';
|
||||
let path = "";
|
||||
// 使用函数生成波形
|
||||
if (currentWaveform === 'custom') {
|
||||
if (currentWaveform === "custom") {
|
||||
// 自定义波形
|
||||
if (drawPoints.value.length > 0) {
|
||||
path = `M${xOffset + drawPoints.value[0][0]},${yOffset + drawPoints.value[0][1]}`;
|
||||
|
|
@ -308,32 +347,34 @@ const currentWaveformPath = computed(() => {
|
|||
}
|
||||
} else {
|
||||
// 如果没有绘制点但选择了自定义波形，仍然使用函数生成
|
||||
const waveFunction = waveformFunctions.custom; path = `M${xOffset},${yOffset + height/2}`;
|
||||
const waveFunction = waveformFunctions.custom;
|
||||
path = `M${xOffset},${yOffset + height / 2}`;
|
||||
|
||||
for (let x = 0; x <= width; x++) {
|
||||
const scaledX = x * scaleFactor;
|
||||
const y = waveFunction(scaledX, width, height, phaseRadians);
|
||||
// 注意：心形函数可能返回undefined或极端值，需要处理
|
||||
if (typeof y === 'number' && isFinite(y)) {
|
||||
path += ` L${x + xOffset},${yOffset + height/2 - y}`;
|
||||
if (typeof y === "number" && isFinite(y)) {
|
||||
path += ` L${x + xOffset},${yOffset + height / 2 - y}`;
|
||||
} else {
|
||||
// 如果返回异常值，保持当前位置
|
||||
path += ` L${x + xOffset},${yOffset + height/2}`;
|
||||
path += ` L${x + xOffset},${yOffset + height / 2}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 使用预定义的波形函数
|
||||
const waveFunction = waveformFunctions[currentWaveform as keyof typeof waveformFunctions];
|
||||
const waveFunction =
|
||||
waveformFunctions[currentWaveform as keyof typeof waveformFunctions];
|
||||
|
||||
// 生成路径点
|
||||
path = `M${xOffset},${yOffset + height/2}`;
|
||||
path = `M${xOffset},${yOffset + height / 2}`;
|
||||
|
||||
for (let x = 0; x <= width; x++) {
|
||||
// 应用组合缩放因素 - 影响x轴的缩放
|
||||
const scaledX = x * scaleFactor;
|
||||
const y = waveFunction(scaledX, width, height, phaseRadians);
|
||||
path += ` L${x + xOffset},${yOffset + height/2 - y}`;
|
||||
path += ` L${x + xOffset},${yOffset + height / 2 - y}`;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -346,6 +387,56 @@ function selectWaveform(index: number) {
|
|||
updateModelValue();
|
||||
}
|
||||
|
||||
async function applyOutputWave() {
|
||||
try {
|
||||
isApplying.value = true;
|
||||
{
|
||||
const ret = await dds.setWaveNum(
|
||||
eqps.boardAddr,
|
||||
eqps.boardPort,
|
||||
0,
|
||||
currentWaveformIndex.value,
|
||||
);
|
||||
if (!ret) {
|
||||
dialog.error("应用失败");
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
const ret = await dds.setFreq(
|
||||
eqps.boardAddr,
|
||||
eqps.boardPort,
|
||||
0,
|
||||
currentWaveformIndex.value,
|
||||
frequency.value * Math.pow(2, 32 - 20),
|
||||
);
|
||||
if (!ret) {
|
||||
dialog.error("应用失败");
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
const ret = await dds.setPhase(
|
||||
eqps.boardAddr,
|
||||
eqps.boardPort,
|
||||
0,
|
||||
currentWaveformIndex.value,
|
||||
toInteger((phase.value * 4096) / 360),
|
||||
);
|
||||
if (ret) {
|
||||
dialog.info("应用成功");
|
||||
} else {
|
||||
dialog.error("应用失败");
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
dialog.error("应用失败");
|
||||
console.error(e);
|
||||
} finally {
|
||||
isApplying.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function increaseFrequency() {
|
||||
if (frequency.value < 10) {
|
||||
frequency.value += 0.1;
|
||||
|
|
@ -390,11 +481,11 @@ function applyFrequencyInput() {
|
|||
let value = parseFloat(frequencyInput.value);
|
||||
|
||||
// 处理单位
|
||||
if (frequencyInput.value.includes('MHz')) {
|
||||
if (frequencyInput.value.includes("MHz")) {
|
||||
value = parseFloat(frequencyInput.value) * 1000000;
|
||||
} else if (frequencyInput.value.includes('kHz')) {
|
||||
} else if (frequencyInput.value.includes("kHz")) {
|
||||
value = parseFloat(frequencyInput.value) * 1000;
|
||||
} else if (frequencyInput.value.includes('Hz')) {
|
||||
} else if (frequencyInput.value.includes("Hz")) {
|
||||
value = parseFloat(frequencyInput.value);
|
||||
}
|
||||
|
||||
|
|
@ -444,11 +535,11 @@ function applyCustomWaveform() {
|
|||
try {
|
||||
// 创建自定义波形函数
|
||||
createCustomWaveformFunction();
|
||||
currentWaveformIndex.value = waveforms.indexOf('custom');
|
||||
currentWaveformIndex.value = waveforms.indexOf("custom");
|
||||
drawCustomWaveformFromExpression();
|
||||
updateModelValue();
|
||||
} catch (error) {
|
||||
console.error('Invalid expression:', error);
|
||||
console.error("Invalid expression:", error);
|
||||
// 这里可以添加一些错误提示
|
||||
}
|
||||
}
|
||||
|
|
@ -466,23 +557,29 @@ function createCustomWaveformFunction() {
|
|||
const expression = customWaveformExpression.value;
|
||||
|
||||
// 导入 mathjs
|
||||
import('mathjs').then((math) => {
|
||||
import("mathjs")
|
||||
.then((math) => {
|
||||
try {
|
||||
// 预编译表达式以提高性能
|
||||
const compiledExpression = math.compile(expression);
|
||||
|
||||
// 添加自定义函数到波形函数集合中
|
||||
waveformFunctions.custom = (x: number, width: number, height: number, phaseRad: number): number => {
|
||||
waveformFunctions.custom = (
|
||||
x: number,
|
||||
width: number,
|
||||
height: number,
|
||||
phaseRad: number,
|
||||
): number => {
|
||||
try {
|
||||
// 相位调整 - 将相位转换为x轴的位移
|
||||
const phaseShift = phaseRad / (2 * Math.PI);
|
||||
|
||||
// 标准化参数，使x落在 0-1 范围内，并应用相位
|
||||
let normalizedX = ((x / width) + phaseShift) % 1;
|
||||
let normalizedX = (x / width + phaseShift) % 1;
|
||||
|
||||
// 心形函数需要x映射到[-1.5,1.5]范围，以确保完整显示心形
|
||||
// 这个范围比[-1,1]稍大，确保心形两侧完整显示
|
||||
const scaledX = (normalizedX * 3) - 1.5;
|
||||
const scaledX = normalizedX * 3 - 1.5;
|
||||
|
||||
// 创建参数对象，包括各种变量和常量供表达式使用
|
||||
const scope = {
|
||||
|
|
@ -496,7 +593,11 @@ function createCustomWaveformFunction() {
|
|||
let result = compiledExpression.evaluate(scope);
|
||||
|
||||
// 确保结果在合理范围内
|
||||
if (typeof result !== 'number' || isNaN(result) || !isFinite(result)) {
|
||||
if (
|
||||
typeof result !== "number" ||
|
||||
isNaN(result) ||
|
||||
!isFinite(result)
|
||||
) {
|
||||
result = 0;
|
||||
}
|
||||
|
||||
|
|
@ -505,9 +606,9 @@ function createCustomWaveformFunction() {
|
|||
result = Math.max(-1, Math.min(1, result));
|
||||
|
||||
// 返回适当的振幅
|
||||
return height/2 * result;
|
||||
return (height / 2) * result;
|
||||
} catch (e) {
|
||||
console.error('Error evaluating expression:', e);
|
||||
console.error("Error evaluating expression:", e);
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
|
@ -515,23 +616,31 @@ function createCustomWaveformFunction() {
|
|||
// 立即更新波形显示
|
||||
updateModelValue();
|
||||
} catch (parseError) {
|
||||
console.error('Error parsing expression:', parseError);
|
||||
console.error("Error parsing expression:", parseError);
|
||||
// 解析错误时使用默认正弦波
|
||||
waveformFunctions.custom = (x: number, width: number, height: number, phaseRad: number): number => {
|
||||
return height/2 * Math.sin(2 * Math.PI * (x / width) * 2 + phaseRad);
|
||||
waveformFunctions.custom = (
|
||||
x: number,
|
||||
width: number,
|
||||
height: number,
|
||||
phaseRad: number,
|
||||
): number => {
|
||||
return (
|
||||
(height / 2) * Math.sin(2 * Math.PI * (x / width) * 2 + phaseRad)
|
||||
);
|
||||
};
|
||||
}
|
||||
}).catch(error => {
|
||||
console.error('Error loading mathjs:', error);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error("Error loading mathjs:", error);
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
// 绘制自定义波形
|
||||
function drawCustomWaveformFromExpression() {
|
||||
const canvas = drawingCanvas.value;
|
||||
if (!canvas) return;
|
||||
|
||||
const ctx = canvas.getContext('2d');
|
||||
const ctx = canvas.getContext("2d");
|
||||
if (!ctx) return;
|
||||
|
||||
const width = canvas.width;
|
||||
|
|
@ -539,13 +648,13 @@ function drawCustomWaveformFromExpression() {
|
|||
|
||||
// 清除画布
|
||||
ctx.clearRect(0, 0, width, height);
|
||||
ctx.strokeStyle = '#0f0';
|
||||
ctx.strokeStyle = "#0f0";
|
||||
ctx.lineWidth = 2;
|
||||
|
||||
// 创建自定义函数 - 先创建函数再绘制
|
||||
createCustomWaveformFunction();
|
||||
// 使用波形函数来绘制
|
||||
const phaseRad = phase.value * Math.PI / 180;
|
||||
const phaseRad = (phase.value * Math.PI) / 180;
|
||||
|
||||
// 频率因素，与主波形显示保持一致
|
||||
// 频率越高，显示的周期数就越多
|
||||
|
|
@ -615,7 +724,7 @@ function startDrawing(event: MouseEvent) {
|
|||
const x = event.clientX - rect.left;
|
||||
const y = event.clientY - rect.top;
|
||||
|
||||
const ctx = canvas.getContext('2d');
|
||||
const ctx = canvas.getContext("2d");
|
||||
if (!ctx) return;
|
||||
|
||||
// 清除画布
|
||||
|
|
@ -624,7 +733,7 @@ function startDrawing(event: MouseEvent) {
|
|||
// 开始新的绘制
|
||||
drawPoints.value = [[x, y]];
|
||||
ctx.beginPath();
|
||||
ctx.strokeStyle = '#0f0';
|
||||
ctx.strokeStyle = "#0f0";
|
||||
ctx.lineWidth = 2;
|
||||
ctx.moveTo(x, y);
|
||||
}
|
||||
|
|
@ -635,7 +744,7 @@ function draw(event: MouseEvent) {
|
|||
const canvas = drawingCanvas.value;
|
||||
if (!canvas) return;
|
||||
|
||||
const ctx = canvas.getContext('2d');
|
||||
const ctx = canvas.getContext("2d");
|
||||
if (!ctx) return;
|
||||
|
||||
const rect = canvas.getBoundingClientRect();
|
||||
|
|
@ -658,7 +767,7 @@ function clearCanvas() {
|
|||
const canvas = drawingCanvas.value;
|
||||
if (!canvas) return;
|
||||
|
||||
const ctx = canvas.getContext('2d');
|
||||
const ctx = canvas.getContext("2d");
|
||||
if (!ctx) return;
|
||||
|
||||
ctx.clearRect(0, 0, canvas.width, canvas.height);
|
||||
|
|
@ -667,7 +776,7 @@ function clearCanvas() {
|
|||
|
||||
function applyDrawnWaveform() {
|
||||
if (drawPoints.value.length > 0) {
|
||||
currentWaveformIndex.value = waveforms.indexOf('custom');
|
||||
currentWaveformIndex.value = waveforms.indexOf("custom");
|
||||
updateModelValue();
|
||||
}
|
||||
}
|
||||
|
|
@ -677,9 +786,11 @@ function saveCurrentToSlot(index: number) {
|
|||
waveformSlots.value[index] = {
|
||||
name: waveformNames[currentWaveformIndex.value],
|
||||
type: waveforms[currentWaveformIndex.value],
|
||||
data: drawPoints.value.length > 0 && currentWaveformIndex.value === waveforms.indexOf('custom')
|
||||
data:
|
||||
drawPoints.value.length > 0 &&
|
||||
currentWaveformIndex.value === waveforms.indexOf("custom")
|
||||
? [...drawPoints.value]
|
||||
: null
|
||||
: null,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -692,17 +803,17 @@ function loadWaveformSlot(index: number) {
|
|||
currentWaveformIndex.value = waveformIndex;
|
||||
|
||||
// 如果是自定义波形且有数据，加载数据
|
||||
if (slot.type === 'custom' && slot.data !== null && slot.data.length > 0) {
|
||||
if (slot.type === "custom" && slot.data !== null && slot.data.length > 0) {
|
||||
drawPoints.value = [...slot.data];
|
||||
|
||||
// 更新画布
|
||||
const canvas = drawingCanvas.value;
|
||||
if (canvas) {
|
||||
const ctx = canvas.getContext('2d');
|
||||
const ctx = canvas.getContext("2d");
|
||||
if (ctx) {
|
||||
ctx.clearRect(0, 0, canvas.width, canvas.height);
|
||||
ctx.beginPath();
|
||||
ctx.strokeStyle = '#0f0';
|
||||
ctx.strokeStyle = "#0f0";
|
||||
ctx.lineWidth = 2;
|
||||
|
||||
for (let i = 0; i < slot.data.length; i++) {
|
||||
|
|
@ -730,9 +841,12 @@ function updateModelValue() {
|
|||
phase: phase.value,
|
||||
timebase: timebase.value,
|
||||
waveform: waveforms[currentWaveformIndex.value],
|
||||
customWaveformPoints: currentWaveformIndex.value === waveforms.indexOf('custom') ? [...drawPoints.value] : []
|
||||
customWaveformPoints:
|
||||
currentWaveformIndex.value === waveforms.indexOf("custom")
|
||||
? [...drawPoints.value]
|
||||
: [],
|
||||
};
|
||||
emit('update:modelValue', newValue);
|
||||
emit("update:modelValue", newValue);
|
||||
}
|
||||
|
||||
// 初始化
|
||||
|
|
@ -761,17 +875,23 @@ onMounted(() => {
|
|||
}
|
||||
|
||||
// 加载自定义波形点
|
||||
if (props.modelValue.customWaveformPoints && props.modelValue.customWaveformPoints.length > 0) {
|
||||
if (
|
||||
props.modelValue.customWaveformPoints &&
|
||||
props.modelValue.customWaveformPoints.length > 0
|
||||
) {
|
||||
drawPoints.value = [...props.modelValue.customWaveformPoints];
|
||||
|
||||
// 绘制到画布上
|
||||
const canvas = drawingCanvas.value;
|
||||
if (canvas && currentWaveformIndex.value === waveforms.indexOf('custom')) {
|
||||
const ctx = canvas.getContext('2d');
|
||||
if (
|
||||
canvas &&
|
||||
currentWaveformIndex.value === waveforms.indexOf("custom")
|
||||
) {
|
||||
const ctx = canvas.getContext("2d");
|
||||
if (ctx) {
|
||||
ctx.clearRect(0, 0, canvas.width, canvas.height);
|
||||
ctx.beginPath();
|
||||
ctx.strokeStyle = '#0f0';
|
||||
ctx.strokeStyle = "#0f0";
|
||||
ctx.lineWidth = 2;
|
||||
|
||||
for (let i = 0; i < drawPoints.value.length; i++) {
|
||||
|
|
@ -790,8 +910,14 @@ onMounted(() => {
|
|||
});
|
||||
|
||||
// 监听model变化
|
||||
watch(() => props.modelValue, (newVal) => {
|
||||
if (newVal && newVal.frequency !== undefined && newVal.frequency !== frequency.value) {
|
||||
watch(
|
||||
() => props.modelValue,
|
||||
(newVal) => {
|
||||
if (
|
||||
newVal &&
|
||||
newVal.frequency !== undefined &&
|
||||
newVal.frequency !== frequency.value
|
||||
) {
|
||||
frequency.value = newVal.frequency;
|
||||
frequencyInput.value = formatFrequency(frequency.value);
|
||||
}
|
||||
|
|
@ -801,7 +927,11 @@ watch(() => props.modelValue, (newVal) => {
|
|||
phaseInput.value = phase.value.toString();
|
||||
}
|
||||
|
||||
if (newVal && newVal.timebase !== undefined && newVal.timebase !== timebase.value) {
|
||||
if (
|
||||
newVal &&
|
||||
newVal.timebase !== undefined &&
|
||||
newVal.timebase !== timebase.value
|
||||
) {
|
||||
timebase.value = newVal.timebase;
|
||||
}
|
||||
|
||||
|
|
@ -811,7 +941,9 @@ watch(() => props.modelValue, (newVal) => {
|
|||
currentWaveformIndex.value = index;
|
||||
}
|
||||
}
|
||||
}, { deep: true });
|
||||
},
|
||||
{ deep: true },
|
||||
);
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
|
@ -1002,7 +1134,9 @@ watch(() => props.modelValue, (newVal) => {
|
|||
border-radius: 4px;
|
||||
color: var(--base-content, #a6adbb);
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s ease, color 0.2s ease;
|
||||
transition:
|
||||
background-color 0.2s ease,
|
||||
color 0.2s ease;
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +1,12 @@
|
|||
<template>
|
||||
<div
|
||||
class="motherboard-container"
|
||||
:style="{
|
||||
<div class="motherboard-container" :style="{
|
||||
width: width + 'px',
|
||||
height: height + 'px',
|
||||
position: 'relative',
|
||||
}"
|
||||
>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
:width="width"
|
||||
:height="height"
|
||||
:viewBox="`0 0 800 600`"
|
||||
class="motherboard-svg"
|
||||
>
|
||||
<image
|
||||
href="../equipments/svg/motherboard.svg"
|
||||
width="100%"
|
||||
height="100%"
|
||||
preserveAspectRatio="xMidYMid meet"
|
||||
/>
|
||||
}">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" :width="width" :height="height" :viewBox="`0 0 800 600`"
|
||||
class="motherboard-svg">
|
||||
<image href="../equipments/svg/motherboard.svg" width="100%" height="100%" preserveAspectRatio="xMidYMid meet" />
|
||||
</svg>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -27,13 +14,13 @@
|
|||
<script setup lang="tsx">
|
||||
import MotherBoardCaps from "./MotherBoardCaps.vue";
|
||||
import { useEquipments } from "@/stores/equipments";
|
||||
import {ref, computed, defineComponent, watch } from "vue";
|
||||
import { ref, computed, defineComponent, watchEffect } from "vue";
|
||||
|
||||
// 主板特有属性
|
||||
interface MotherBoardProps {
|
||||
export interface MotherBoardProps {
|
||||
size?: number;
|
||||
jtagAddr?: string;
|
||||
jtagPort?: string;
|
||||
boardAddr?: string;
|
||||
boardPort?: string;
|
||||
}
|
||||
|
||||
const props = withDefaults(defineProps<MotherBoardProps>(), getDefaultProps());
|
||||
|
|
@ -44,11 +31,11 @@ const height = computed(() => 600 * props.size);
|
|||
|
||||
const eqps = useEquipments();
|
||||
|
||||
const bitstreamFile = ref<File | null> ();
|
||||
const bitstreamFile = ref<File | null>();
|
||||
|
||||
watch([props.jtagAddr, props.jtagPort], () => {
|
||||
eqps.jtagIPAddr = props.jtagAddr;
|
||||
eqps.jtagPort = props.jtagPort;
|
||||
watchEffect(() => {
|
||||
eqps.setAddr(props.boardAddr);
|
||||
eqps.setPort(props.boardPort);
|
||||
});
|
||||
|
||||
// 向外暴露方法
|
||||
|
|
@ -63,21 +50,11 @@ defineExpose({
|
|||
// 返回组件定义而不是直接返回JSX
|
||||
return defineComponent({
|
||||
name: "MotherBoardCaps",
|
||||
props: {
|
||||
jtagAddr: {
|
||||
type: String,
|
||||
default: props.jtagAddr,
|
||||
},
|
||||
jtagPort: {
|
||||
type: String,
|
||||
default: props.jtagPort,
|
||||
}
|
||||
},
|
||||
setup(props) {
|
||||
setup() {
|
||||
return () => (
|
||||
<MotherBoardCaps
|
||||
jtagAddr={props.jtagAddr}
|
||||
jtagPort={props.jtagPort}
|
||||
jtagAddr={eqps.boardAddr}
|
||||
jtagPort={eqps.boardPort.toString()}
|
||||
/>
|
||||
);
|
||||
},
|
||||
|
|
@ -87,12 +64,14 @@ defineExpose({
|
|||
</script>
|
||||
|
||||
<script lang="tsx">
|
||||
const eqps = useEquipments();
|
||||
// 添加一个静态方法来获取默认props
|
||||
export function getDefaultProps() {
|
||||
export function getDefaultProps(): MotherBoardProps {
|
||||
console.log(`board监听改动: ${eqps.boardAddr}:${eqps.boardPort}`);
|
||||
return {
|
||||
size: 1,
|
||||
jtagAddr: "127.0.0.1",
|
||||
jtagPort: "1234",
|
||||
boardAddr: eqps.boardAddr,
|
||||
boardPort: eqps.boardPort.toString(),
|
||||
};
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1,31 +1,23 @@
|
|||
<template>
|
||||
<div>
|
||||
<h1 class="font-bold text-center text-2xl">Jtag</h1>
|
||||
<div class="flex">
|
||||
<p class="grow">IDCode: {{ jtagIDCode }}</p>
|
||||
<div class="flex flex-col">
|
||||
<p class="grow">Jtag Addr: {{ props.jtagAddr }}</p>
|
||||
<p class="grow">Jtag Port: {{ props.jtagPort }}</p>
|
||||
<div class="flex justify-between grow">
|
||||
<p>IDCode: 0x{{ jtagIDCode.toString(16).padStart(8, "0") }}</p>
|
||||
<button class="btn btn-circle w-8 h-8" :onclick="getIDCode">
|
||||
<svg
|
||||
class="icon opacity-70"
|
||||
viewBox="0 0 1024 1024"
|
||||
version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
p-id="4865"
|
||||
width="200"
|
||||
height="200"
|
||||
>
|
||||
<svg class="icon opacity-70" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
|
||||
p-id="4865" width="200" height="200">
|
||||
<path
|
||||
d="M894.481158 505.727133c0 49.589418-9.711176 97.705276-28.867468 143.007041-18.501376 43.74634-44.98454 83.031065-78.712713 116.759237-33.728172 33.728172-73.012897 60.211337-116.759237 78.712713-45.311998 19.156292-93.417623 28.877701-143.007041 28.877701s-97.695043-9.721409-142.996808-28.877701c-43.756573-18.501376-83.031065-44.98454-116.76947-78.712713-33.728172-33.728172-60.211337-73.012897-78.712713-116.759237-19.156292-45.301765-28.867468-93.417623-28.867468-143.007041 0-49.579185 9.711176-97.695043 28.867468-142.996808 18.501376-43.74634 44.98454-83.031065 78.712713-116.759237 33.738405-33.728172 73.012897-60.211337 116.76947-78.712713 45.301765-19.166525 93.40739-28.877701 142.996808-28.877701 52.925397 0 104.008842 11.010775 151.827941 32.745798 46.192042 20.977777 86.909395 50.79692 121.016191 88.608084 4.389984 4.860704 8.646937 9.854439 12.781094 14.97097l0-136.263453c0-11.307533 9.168824-20.466124 20.466124-20.466124 11.307533 0 20.466124 9.15859 20.466124 20.466124l0 183.64253c0 5.433756-2.148943 10.632151-5.986341 14.46955-3.847631 3.837398-9.046027 5.996574-14.479783 5.996574l-183.64253-0.020466c-11.307533 0-20.466124-9.168824-20.466124-20.466124 0-11.307533 9.168824-20.466124 20.466124-20.466124l132.293025 0.020466c-3.960195-4.952802-8.063653-9.782807-12.289907-14.479783-30.320563-33.605376-66.514903-60.098773-107.549481-78.753645-42.467207-19.289322-87.850837-29.072129-134.902456-29.072129-87.195921 0-169.172981 33.9533-230.816946 95.597265-61.654198 61.654198-95.597265 143.621025-95.597265 230.816946s33.943067 169.172981 95.597265 230.816946c61.643965 61.654198 143.621025 95.607498 230.816946 95.607498s169.172981-33.9533 230.816946-95.607498c61.654198-61.643965 95.597265-143.621025 95.597265-230.816946 0-11.2973 9.168824-20.466124 20.466124-20.466124C885.322567 485.261009 894.481158 494.429833 894.481158 505.727133z"
|
||||
p-id="4866"
|
||||
></path>
|
||||
p-id="4866"></path>
|
||||
</svg>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="divider"></div>
|
||||
<UploadCard
|
||||
class="bg-base-200"
|
||||
:upload-event="uploadBitstream"
|
||||
:download-event="downloadBitstream"
|
||||
>
|
||||
<UploadCard class="bg-base-200" :upload-event="uploadBitstream" :download-event="downloadBitstream">
|
||||
</UploadCard>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -35,7 +27,7 @@ import { JtagClient } from "@/APIClient";
|
|||
import z from "zod";
|
||||
import UploadCard from "@/components/UploadCard.vue";
|
||||
import { useDialogStore } from "@/stores/dialog";
|
||||
import { toNumber, toString } from "lodash";
|
||||
import { isUndefined, toNumber } from "lodash";
|
||||
import { ref, computed, watch } from "vue";
|
||||
|
||||
interface CapsProps {
|
||||
|
|
@ -43,21 +35,20 @@ interface CapsProps {
|
|||
jtagPort?: string;
|
||||
}
|
||||
|
||||
const props = withDefaults(defineProps<CapsProps>(), {
|
||||
jtagAddr: "127.0.0.1",
|
||||
jtagPort: "1234",
|
||||
});
|
||||
const props = withDefaults(defineProps<CapsProps>(), {});
|
||||
|
||||
const jtagController = new JtagClient();
|
||||
const dialog = useDialogStore();
|
||||
|
||||
// 使用传入的属性或默认值
|
||||
const jtagIDCode = ref("");
|
||||
const jtagIDCode = ref(0);
|
||||
const boardAddress = computed(() => props.jtagAddr);
|
||||
const boardPort = computed(() => toNumber(props.jtagPort));
|
||||
const boardPort = computed(() =>
|
||||
isUndefined(props.jtagPort) ? undefined : toNumber(props.jtagPort),
|
||||
);
|
||||
|
||||
async function uploadBitstream(event: Event, bitstream: File) {
|
||||
if (!boardAddress.value || !boardPort.value) {
|
||||
if (!isUndefined(boardAddress.value) || !isUndefined(boardPort.value)) {
|
||||
dialog.error("开发板地址或端口空缺");
|
||||
return;
|
||||
}
|
||||
|
|
@ -115,7 +106,7 @@ async function getIDCode() {
|
|||
boardAddress.value,
|
||||
boardPort.value,
|
||||
);
|
||||
jtagIDCode.value = toString(resp);
|
||||
jtagIDCode.value = resp;
|
||||
} catch (e) {
|
||||
dialog.error("获取IDCode错误");
|
||||
console.error(e);
|
||||
|
|
|
|||
|
|
@ -1,21 +1,37 @@
|
|||
import { ref, computed } from 'vue'
|
||||
import { defineStore } from 'pinia'
|
||||
import { isUndefined } from 'lodash';
|
||||
import { isString, isUndefined, toNumber } from 'lodash';
|
||||
import z from "zod"
|
||||
import { isNumber } from 'mathjs';
|
||||
|
||||
export const useEquipments = defineStore('equipments', () => {
|
||||
const jtagIPAddr = ref("127.0.0.1")
|
||||
const jtagPort = ref("1234")
|
||||
const boardAddr = ref("127.0.0.1")
|
||||
const boardPort = ref(1234)
|
||||
function setAddr(address: string) {
|
||||
if (z.string().ip("4").safeParse(address).success)
|
||||
boardAddr.value = address;
|
||||
}
|
||||
function setPort(port: string | number) {
|
||||
|
||||
if (isString(port) && port.length != 0) {
|
||||
const portNumber = toNumber(port);
|
||||
if (z.number().nonnegative().max(65535).safeParse(portNumber).success)
|
||||
boardPort.value = portNumber;
|
||||
}
|
||||
else if (isNumber(port)) {
|
||||
if (z.number().nonnegative().max(65535).safeParse(port).success)
|
||||
boardPort.value = port;
|
||||
}
|
||||
}
|
||||
const jtagBitstream = ref<File | undefined>()
|
||||
const remoteUpdateIPAddr = ref("127.0.0.1")
|
||||
const remoteUpdatePort = ref("1234")
|
||||
const remoteUpdateBitstream = ref<File | undefined>()
|
||||
|
||||
return {
|
||||
jtagIPAddr,
|
||||
jtagPort,
|
||||
boardAddr,
|
||||
boardPort,
|
||||
setAddr,
|
||||
setPort,
|
||||
jtagBitstream,
|
||||
remoteUpdateIPAddr,
|
||||
remoteUpdatePort,
|
||||
remoteUpdateBitstream,
|
||||
}
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue