修改曲线,通讯数据强度,速率

This commit is contained in:
hm
2020-10-13 18:41:23 +08:00
parent e00b10e3db
commit 56f025af20
21 changed files with 336 additions and 173 deletions
+22 -64
View File
@@ -56,66 +56,6 @@ PowerSystem::PowerSystem(QWidget *parent) :
setColor(ui->checkBox_20,state::success);
setColor(ui->checkBox_21,state::success);
/*
ui->comboBox_Full->addItem("基准档",0);
ui->comboBox_Full->addItem("1档",1);
ui->comboBox_Full->addItem("2档",2);
ui->comboBox_Full->addItem("3档",3);
ui->comboBox_Full->addItem("4档",4);
ui->comboBox_Full->addItem("5档",5);
ui->comboBox_Full->addItem("6档",6);
ui->comboBox_Full->addItem("7档",7);
ui->comboBox_Full->addItem("8档",8);
ui->comboBox_Full->addItem("9档",9);
ui->comboBox_Full->setCurrentIndex(0);
ui->comboBox_Half->addItem("基准档",0);
ui->comboBox_Half->addItem("1档",1);
ui->comboBox_Half->addItem("2档",2);
ui->comboBox_Half->addItem("3档",3);
ui->comboBox_Half->addItem("4档",4);
ui->comboBox_Half->addItem("5档",5);
ui->comboBox_Half->addItem("6档",6);
ui->comboBox_Half->addItem("7档",7);
ui->comboBox_Half->addItem("8档",8);
ui->comboBox_Half->addItem("9档",9);
ui->comboBox_Half->setCurrentIndex(0);
ui->comboBox_rate->addItem("10000",10000);
ui->comboBox_rate->addItem("15000",15000);
ui->comboBox_rate->addItem("20000",20000);
ui->comboBox_rate->addItem("25000",25000);
ui->comboBox_rate->addItem("30000",30000);
ui->comboBox_rate->addItem("35000",35000);
ui->comboBox_rate->addItem("40000",40000);
ui->comboBox_rate->addItem("45000",45000);
ui->comboBox_rate->setEditable(true);
ui->comboBox_rate->setCurrentIndex(-1);
ui->comboBox_TestPoint->addItem("核心机主燃油泵",0);
ui->comboBox_TestPoint->addItem("加力主燃油泵",1);
ui->comboBox_TestPoint->addItem("加力点火燃油泵",2);
ui->comboBox_TestPoint->addItem("尾喷口舵机",3);
ui->comboBox_TestPoint->addItem("点火器",4);
ui->comboBox_TestPoint->addItem("启动控制器1",5);
ui->comboBox_TestPoint->addItem("启动控制器2",6);
ui->comboBox_TestPoint->addItem("核心机点火油阀",7);
ui->comboBox_TestPoint->addItem("核心机优先油阀",8);
ui->comboBox_TestPoint->addItem("核心机轻吹油阀",9);
ui->comboBox_TestPoint->addItem("核心机启动气阀",10);
ui->comboBox_TestPoint->addItem("核心机主油阀",11);
ui->comboBox_TestPoint->addItem("加力主油阀",12);
ui->comboBox_TestPoint->addItem("加力轻吹阀",13);
ui->comboBox_TestPoint->addItem("加力点火快速阀",14);
ui->comboBox_TestPoint->addItem("手动转速控制",15);
ui->comboBox_TestPoint->setCurrentIndex(-1);
ui->comboBox_TestValue->show();
ui->comboBox_TestValue->setCurrentIndex(-1);
*/
ScopeRPM = new Scope(ui->frame_scope);
ScopeTemp = new Scope(ui->frame_scope);
@@ -127,6 +67,16 @@ PowerSystem::PowerSystem(QWidget *parent) :
ScopeAlt->hideButton(true);
ScopeMa->hideButton(true);
ScopeRPM->chartView->addSeries(tr("物理转速"));
ScopeRPM->chartView->addSeries(tr("期望物理转速"));
ScopeTemp->chartView->addSeries(tr("排气温度T5"));
ScopeAlt->chartView->addSeries(tr("海拔"));
ScopeMa->chartView->addSeries(tr("马赫"));
}
PowerSystem::~PowerSystem()
@@ -160,18 +110,14 @@ void PowerSystem::contextMenuEvent(QContextMenuEvent *event)
{
QMenu *menu = new QMenu(this);
QAction *pAction = new QAction("float",this);
connect(pAction,SIGNAL(triggered(bool)),
this,SLOT(setFloat()));
menu->addAction(pAction);
menu->move(cursor().pos());
menu->show();
}
@@ -319,5 +265,17 @@ void PowerSystem::setTurbineState(mavlink_turbinestate_t *t)
//qDebug() << t->Cmd;
/*
ScopeRPM->chartView->setSerieData(tr("物理转速"),t->RPM_mea);
ScopeRPM->chartView->setSerieData(tr("期望物理转速"),t->RPM_des);
ScopeTemp->chartView->setSerieData(tr("排气温度T5"),t->T5);
ScopeAlt->chartView->setSerieData(tr("海拔"),10);
ScopeMa->chartView->setSerieData(tr("马赫"),t->tas_ap);
*/
}