修正清除参数会死机问题
This commit is contained in:
+23
-20
@@ -37,17 +37,18 @@ ToolsUI::ToolsUI(QWidget *parent) :
|
||||
senser = new Senser();
|
||||
remotecontrol = new RemoteControl();
|
||||
|
||||
install(index0, 0,QIcon(":/img/warning.png"),tr("Inspector"));
|
||||
install(index1, 1,QIcon(":/img/warning.png"),tr("Log"));
|
||||
install(index2, 2,QIcon(":/img/warning.png"),tr("Replay"));
|
||||
install(index3, 3,QIcon(":/img/warning.png"),tr("Terminal"));
|
||||
install(index4, 4,QIcon(":/img/warning.png"),tr("Servos"));
|
||||
//install(powersystem, 5,QIcon(":/img/warning.png"),tr("PowerSystem"));
|
||||
//install(servosystem, 6,QIcon(":/img/warning.png"),tr("ServoSystem"));
|
||||
install(command, 7,QIcon(":/img/warning.png"),tr("CommandBox"));
|
||||
//install(diagram, 8,QIcon(":/img/warning.png"),tr("Diagram"));
|
||||
install(senser, 9,QIcon(":/img/warning.png"),tr("Senser"));
|
||||
install(remotecontrol,10,QIcon(":/img/warning.png"),tr("RC"));
|
||||
install(index0, 0,tr("Inspector"));
|
||||
install(index1, 1,tr("Log"));
|
||||
install(index2, 2,tr("Replay"));
|
||||
install(index3, 3,tr("Terminal"));
|
||||
install(index4, 4,tr("Servos"));
|
||||
//install(powersystem, 5,tr("PowerSystem"));
|
||||
//install(servosystem, 6,tr("ServoSystem"));
|
||||
install(command, 7,tr("CommandBox"));
|
||||
//install(diagram, 8,tr("Diagram"));
|
||||
install(senser, 9,tr("Senser"));
|
||||
install(senser, 9,tr("Senser"));
|
||||
install(remotecontrol,9,tr("RC"));
|
||||
|
||||
|
||||
|
||||
@@ -106,12 +107,11 @@ void ToolsUI::setPushButtonState(QWidget *w,state s)
|
||||
}
|
||||
|
||||
|
||||
void ToolsUI::install(ToolsWidget *widget,int key, QIcon icon, QString name)
|
||||
void ToolsUI::install(ToolsWidget *widget,int key, QString name)
|
||||
{
|
||||
if(!ToolsList.keys().contains(key))
|
||||
//if(!ToolsList.keys().contains(ToolsList.size()))
|
||||
if(!ToolsList.values().contains(widget))
|
||||
{
|
||||
//QWidget *widget = new QWidget(ui->frame);
|
||||
|
||||
int h = 50;
|
||||
int w = 120;
|
||||
|
||||
@@ -119,20 +119,23 @@ void ToolsUI::install(ToolsWidget *widget,int key, QIcon icon, QString name)
|
||||
btn->setText(name);
|
||||
btn->setFixedSize(w,h);
|
||||
|
||||
btnList.insert(key,btn);
|
||||
btnList.insert(ToolsList.size(),btn);
|
||||
|
||||
connect(btn,&QPushButton::clicked,
|
||||
this,&ToolsUI::btnClicked);
|
||||
|
||||
ui->gridLayout_Indexs->addWidget(btn,key,1);
|
||||
|
||||
ui->gridLayout_Indexs->addWidget(btn,ToolsList.size(),1);
|
||||
|
||||
widget->setParent(ui->frame);
|
||||
widget->setWindowTitle(name);
|
||||
widget->setWindowIcon(icon);
|
||||
widget->setIcon(widget->Icon());
|
||||
widget->hide();
|
||||
ToolsList.insert(key,widget);
|
||||
ToolsList.insert(ToolsList.size(),widget);
|
||||
}
|
||||
else
|
||||
{
|
||||
qDebug() << "重复出现" << name;
|
||||
}
|
||||
}
|
||||
|
||||
void ToolsUI::btnClicked()
|
||||
|
||||
Reference in New Issue
Block a user