diff --git a/bin/Release/assets/config/regaddrsShow.json b/bin/Release/assets/config/regaddrsShow.json index fff2e0a..edef5e8 100644 --- a/bin/Release/assets/config/regaddrsShow.json +++ b/bin/Release/assets/config/regaddrsShow.json @@ -58,14 +58,14 @@ "addrYC":[ ["电网状态", "0x1007", "--", ""], ["启停状态", "0x1006", "--", ""], - ["手动/自动状态", "0x103D", "--", ""], ["A相电压", "0x0013", "0.0", " V", "1"], ["A相电流", "0x001C", "0.0", " A"], ["B相电压", "0x0014", "0.0", " V", "1"], ["B相电流", "0x001D", "0.0", " A"], ["C相电压", "0x0015", "0.0", " V", "1"], ["C相电流", "0x001E", "0.0", " A"], - ["总有功功率", "0x0028", "0.0", " kW"] + ["总有功功率", "0x0028", "0.0", " kW"], + ["手动/自动状态", "0x103D", "--", ""] ], "addrCurve": ["0x0013", "0x001C", "0x0028"], "valstr": { diff --git a/src/app/Station.cpp b/src/app/Station.cpp index 440a7bc..982a16e 100644 --- a/src/app/Station.cpp +++ b/src/app/Station.cpp @@ -214,10 +214,10 @@ void Station::setGarewayParams() string Station::getGatewayMode() { - // 0:手动,1:峰谷套利,2:增网配容,3:应急供电,4:并网保电,5:自定时段 + // 0:手动,1:峰谷套利,2:配网增容,3:应急供电,4:并网保电,5:自定时段 if (gatewayParam.mode == 0) { return "手动"; } else if (gatewayParam.mode == 1) { return "峰谷套利"; } - else if (gatewayParam.mode == 2) { return "增网配容"; } + else if (gatewayParam.mode == 2) { return "配网增容"; } else if (gatewayParam.mode == 3) { return "应急供电"; } else if (gatewayParam.mode == 4) { return "并网保电"; } else if (gatewayParam.mode == 5) { return "自定时段"; } diff --git a/src/main.cpp b/src/main.cpp index 5a9cfce..392034e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -190,8 +190,8 @@ int main(int argc, char** argv) if (Config::option.windowEnabled) { QApplication qapp(argc, argv); - - QFontDatabase::addApplicationFont(QCoreApplication::applicationDirPath() + "/assets/fonts/优设标题黑.ttf"); + QString fontFile = QCoreApplication::applicationDirPath() + "/assets/fonts/优设标题黑.ttf"; + QFontDatabase::addApplicationFont(fontFile); QFont font("微软雅黑", 10, 600); QApplication::setFont(font); MainApp mainApp; diff --git a/src/qt/MainApp.cpp b/src/qt/MainApp.cpp index 7cb4272..34bb9c0 100644 --- a/src/qt/MainApp.cpp +++ b/src/qt/MainApp.cpp @@ -158,6 +158,7 @@ std::shared_ptr MainApp::getWorkWidget(std::string name) void MainApp::setWorkspaceWidget(std::shared_ptr widget) { + widgetWorkspace = widget; } void MainApp::setLabelDateTime()