wangbo
/
CableTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改校准页面

Browse Source
main
“wangbo” 8 months ago
parent 3559b6981b
commit 74eb158339
3 changed files with 77 additions and 42 deletions
Show Stats Download Patch File Download Diff File

10
CableTool/common.h
Unescape Escape View File

@ -428,13 +428,13 @@ typedef struct
/* 校准参数信息. */
typedef struct
{
uint16_t ADCRatio[DAU_PORT_POWER_CNT];
uint32_t ADCBase_elec[DAU_PORT_POWER_CNT][DAU_POWER_ADJ_CNT];
uint16_t ADCAdj[DAU_PORT_POWER_CNT][DAU_POWER_ADJ_CNT];
float ADCBase[DAU_PORT_POWER_CNT][DAU_POWER_ADJ_CNT];
uint16_t ADCRatio[DAU_PORT_POWER_CNT]; // 变比
uint32_t ADCBase_elec[DAU_PORT_POWER_CNT][DAU_POWER_ADJ_CNT]; // 分段点(1A/2A/5A/10A/30A)
uint16_t ADCAdj[DAU_PORT_POWER_CNT][DAU_POWER_ADJ_CNT]; // 斜率(校准系数)
float ADCBase[DAU_PORT_POWER_CNT][DAU_POWER_ADJ_CNT]; // 采样值(对应分段点的1/2/5/10/30)
uint16_t vin;
uint16_t vin_adj;
uint8_t ADC_turns[DAU_PORT_POWER_CNT];
uint8_t ADC_turns[DAU_PORT_POWER_CNT]; // 匝数
} dev_adj_t;
/* 校准命令信息. */

103
CableTool/widget.cpp
Unescape Escape View File

@ -60,8 +60,6 @@ Widget::Widget(QWidget *parent)
energyMode[2] = "节能模式";
energyMode[3] = "休眠模式";
//usartProtocol = new Protocol;
crc32_table_init();
/* 配置校准页面表格 */
@ -80,33 +78,23 @@ Widget::Widget(QWidget *parent)
"padding:4px;"
"}"
);
/* 打开配置文件, 恢复关闭前的状态. */
QString file = QCoreApplication::applicationDirPath()+"/CableTool.ini";
settings = new QSettings(file, QSettings::IniFormat, this);
#if 0
for(int i = 0; i < ui->comboPort->count(); i++)
/* 只可以配置变比. */
readOnlyDelegate = new ReadOnlyDelegate(this);
for(int i = 0; i < ui->adjustTable->columnCount(); i++)
{
if (!QString::compare(ui->comboPort->itemText(i), settings->value("usartBoxName", "COM1").toString(), Qt::CaseSensitive))
if (0 == i || 2 == i || 3 == i || 4 == i || 7 == i || 10 == i || 13 == i || 16 == i)
{
ui->comboPort->setCurrentIndex(i);
continue;
}
ui->adjustTable->setItemDelegateForColumn(i, readOnlyDelegate);
}
#endif
ui->comboBaud->setCurrentIndex(settings->value("baudBoxIndex", 6).toInt());
filePath = settings->value("updateFile", "").toString();
adjFilePath = settings->value("adjFile", "").toString();
waveFilePath = settings->value("waveFile", "").toString();
QFileInfo fileinfo = QFileInfo(filePath);
ui->fileNameEdit->setText(fileinfo.fileName());
ui->fileNameEdit->setReadOnly(true);
ui->fileTypeBox->setCurrentIndex(settings->value("updateFileType", 0).toInt());
ui->freChBox->setCurrentIndex(settings->value("freChIndex", 0).toInt());
//searchUsablePort();
for(int i = 0; i < ui->adjustTable->rowCount(); i++)
{
QCheckBox *checkBox = new QCheckBox();
ui->adjustTable->setCellWidget(i, 0, checkBox);
}
readOnlyDelegate = new ReadOnlyDelegate(this);
/* 配置历史数据页面表格 */
//如下代码设置横向表格头的间隔线，有四个方向的间隔线,不需要间隔线的可以设置为0px
@ -138,10 +126,44 @@ Widget::Widget(QWidget *parent)
ui->historyDataTable->horizontalHeader()->resizeSection(10, 110);
ui->historyDataTable->horizontalHeader()->resizeSection(11, 110);
/* 打开配置文件, 恢复关闭前的状态. */
QString file = QCoreApplication::applicationDirPath()+"/CableTool.ini";
settings = new QSettings(file, QSettings::IniFormat, this);
#if 0
for(int i = 0; i < ui->comboPort->count(); i++)
{
if (!QString::compare(ui->comboPort->itemText(i), settings->value("usartBoxName", "COM1").toString(), Qt::CaseSensitive))
{
ui->comboPort->setCurrentIndex(i);
}
}
#endif
ui->comboBaud->setCurrentIndex(settings->value("baudBoxIndex", 6).toInt());
filePath = settings->value("updateFile", "").toString();
adjFilePath = settings->value("adjFile", "").toString();
waveFilePath = settings->value("waveFile", "").toString();
QFileInfo fileinfo = QFileInfo(filePath);
ui->fileNameEdit->setText(fileinfo.fileName());
ui->fileNameEdit->setReadOnly(true);
ui->fileTypeBox->setCurrentIndex(settings->value("updateFileType", 0).toInt());
ui->freChBox->setCurrentIndex(settings->value("freChIndex", 0).toInt());
}
Widget::~Widget()
{
for(int i = 0; i < ui->frequencyTable->columnCount(); i++)
{
for(int j = 0; j < ui->frequencyTable->rowCount(); j++)
{
delete ui->frequencyTable->item(j, i);
}
}
for(int i = 0; i < ui->adjustTable->rowCount(); i++)
{
delete ui->adjustTable->cellWidget(i, 0);
}
//delete usartProtocol;
deinitSerial();
delete settings;
@ -988,6 +1010,8 @@ int Widget::protoHistoryData(char * data)
mul_head_t *header = reinterpret_cast<mul_head_t*>(data + sizeof(proto_head_t));
fd_data_t *pHistoryData;
uint32_t cnt = 0;
qDebug() << "index:" << header->index << "len:" << header->len << endl;
/* 数据头校验. */
if (header->index != dataIndex
|| header->len > UPDATE_DATA_SIZE)
@ -2220,26 +2244,26 @@ void Widget::on_ratioSetButton_clicked()
if (40 == ratio)
{
ui->adjustTable->item(i, 4)->setText(QString::number(1000));
ui->adjustTable->item(i, 7)->setText(QString::number(5000));
ui->adjustTable->item(i, 10)->setText(QString::number(10000));
ui->adjustTable->item(i, 13)->setText(QString::number(50000));
ui->adjustTable->item(i, 16)->setText(QString::number(100000));
ui->adjustTable->item(i, 7)->setText(QString::number(2000));
ui->adjustTable->item(i, 10)->setText(QString::number(5000));
ui->adjustTable->item(i, 13)->setText(QString::number(10000));
ui->adjustTable->item(i, 16)->setText(QString::number(30000));
}
else if(60 == ratio)
{
ui->adjustTable->item(i, 4)->setText(QString::number(1000));
ui->adjustTable->item(i, 7)->setText(QString::number(5000));
ui->adjustTable->item(i, 10)->setText(QString::number(10000));
ui->adjustTable->item(i, 13)->setText(QString::number(50000));
ui->adjustTable->item(i, 16)->setText(QString::number(100000));
ui->adjustTable->item(i, 7)->setText(QString::number(2000));
ui->adjustTable->item(i, 10)->setText(QString::number(5000));
ui->adjustTable->item(i, 13)->setText(QString::number(10000));
ui->adjustTable->item(i, 16)->setText(QString::number(30000));
}
else if(200 == ratio)
{
ui->adjustTable->item(i, 4)->setText(QString::number(1000));
ui->adjustTable->item(i, 7)->setText(QString::number(10000));
ui->adjustTable->item(i, 10)->setText(QString::number(50000));
ui->adjustTable->item(i, 13)->setText(QString::number(100000));
ui->adjustTable->item(i, 16)->setText(QString::number(200000));
ui->adjustTable->item(i, 7)->setText(QString::number(3000));
ui->adjustTable->item(i, 10)->setText(QString::number(10000));
ui->adjustTable->item(i, 13)->setText(QString::number(30000));
ui->adjustTable->item(i, 16)->setText(QString::number(100000));
}
else if(400 == ratio)
{
@ -2302,3 +2326,12 @@ void Widget::on_adjButton_clicked()
buttonEnable(false);
sendMsgDeviceAdjustMode(DEBUG_PRV_ADJ_AUTO);
}
void Widget::on_tabWidget_tabBarClicked(int index)
{
qDebug() << "index" << index << endl;
if (index == 6)
{
uiAdjustInfoRefresh();
}
}

2
CableTool/widget.h
Unescape Escape View File

@ -92,6 +92,8 @@ private slots:
void on_adjButton_clicked();
void on_tabWidget_tabBarClicked(int index);
private:
QString toHexadecimal(const QByteArray &byteArray);

Write Preview
Loading…
Cancel
Save