hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

航线属性修改，添加地面站ID

Browse Source
This commit is contained in:
hm
2020-11-21 18:19:28 +08:00
parent a41f3e3060
commit 4254a1f256
43 changed files with 2531 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/ComponentUI/Inputter/Inputter.cpp
+3 -1
View File
@@ -56,6 +56,8 @@ Inputter::~Inputter()
bool Inputter::event(QEvent *event)
{
qDebug() << event;
if(event->type() == QEvent::Leave)
{
//this->close();
@@ -64,7 +66,7 @@ bool Inputter::event(QEvent *event)
}
void Inputter::keyPressEvent(QKeyEvent *event) //键盘按下事件
void Inputter::keyReleaseEvent(QKeyEvent *event) //键盘按下事件
{
qInfo() << "inputter key" << event;
//qDebug() << event;
App/ComponentUI/Inputter/Inputter.h
+1 -1
View File
@@ -39,7 +39,7 @@ signals:
protected:
bool event(QEvent *event);
void keyPressEvent(QKeyEvent *event);
void keyReleaseEvent(QKeyEvent *event);
private slots:
void DoubleClickTimeout();
App/ComponentUI/Inputter/Inputter.qss
+4
View File
@@ -32,6 +32,10 @@ QLineEdit {
background-color: #FFFFFF
}
.QLabel {
padding: 3px;
font :15px;
}
App/ComponentUI/Inputter/Inputter.ui
+18 -18
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>404</width>
<height>683</height>
<width>372</width>
<height>604</height>
</rect>
</property>
<property name="windowTitle">
@@ -89,7 +89,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -108,7 +108,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -127,7 +127,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -146,7 +146,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>160</height>
</size>
</property>
<property name="maximumSize">
@@ -165,7 +165,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -184,7 +184,7 @@
<property name="minimumSize">
<size>
<width>160</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -203,7 +203,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -222,7 +222,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -241,7 +241,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -260,7 +260,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -279,7 +279,7 @@
<property name="minimumSize">
<size>
<width>160</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -298,7 +298,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -330,7 +330,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -349,7 +349,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
@@ -368,7 +368,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>160</height>
</size>
</property>
<property name="maximumSize">
@@ -387,7 +387,7 @@
<property name="minimumSize">
<size>
<width>80</width>
<height>40</height>
<height>80</height>
</size>
</property>
<property name="maximumSize">
App/ComponentUI/MultiSelector/MultiSelector.qss
-5
View File
@@ -21,11 +21,6 @@
}
.QLabel {
background-color: #FFFFFF;
border-width: 2px;
border-color: darkkhaki;
border-style: solid;
border-radius: 5;
padding: 3px;
font :15px;
}
App/ComponentUI/MultiSelector/Multiselector.ui
+33 -4
View File
@@ -24,12 +24,41 @@
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
<number>9</number>
</property>
<property name="spacing">
<number>1</number>
<property name="horizontalSpacing">
<number>6</number>
</property>
<item row="0" column="0">
<property name="verticalSpacing">
<number>9</number>
</property>
<item row="1" column="0">
<widget class="QPushButton" name="pushButton_Cancel">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="pushButton_Confirm">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Confirm</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QListWidget" name="listWidget"/>
</item>
</layout>
App/ComponentUI/MultiSelector/multiselector.cpp
+30
View File
@@ -101,8 +101,10 @@ void MultiSelector::reBuildList(void)
QString Seq = w.at(0);
QString Type = w.at(1);
QWidget *widget = new QWidget(ui->listWidget);
/*
QLabel *seq = new QLabel(widget);
QLabel *type = new QLabel(widget);
@@ -129,8 +131,18 @@ void MultiSelector::reBuildList(void)
//将widget作为列表的item
QListWidgetItem *ITEM = new QListWidgetItem();
//ITEM->SET
//ITEM->setText(Item);
//ITEM->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
*/
QListWidgetItem *ITEM = new QListWidgetItem();
ITEM->setText(tr("[%1] [%2]").arg(Seq).arg(Type));
ITEM->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
ui->listWidget->addItem(ITEM);
ui->listWidget->setItemWidget(ITEM, widget);
@@ -157,3 +169,21 @@ void MultiSelector::on_ListDoubleClicked(QModelIndex index)
void MultiSelector::on_pushButton_Cancel_clicked()
{
this->close();
}
void MultiSelector::on_pushButton_Confirm_clicked()
{
qDebug() << "selector index" << ui->listWidget->currentIndex();
emit confirmValue(ui->listWidget->currentRow());
this->deleteLater();
this->close();
}
App/ComponentUI/MultiSelector/multiselector.h
+4
View File
@@ -52,6 +52,10 @@ private slots:
void reBuildList(void);
void on_pushButton_Cancel_clicked();
void on_pushButton_Confirm_clicked();
protected:
bool event(QEvent *event);
App/ComponentUI/Selector/Selector.cpp
+13
View File
@@ -153,3 +153,16 @@ void Selector::on_ListDoubleClicked(QModelIndex index)
this->close();
}
void Selector::on_pushButton_Cancel_clicked()
{
this->close();
}
void Selector::on_pushButton_Confirm_clicked()
{
//qDebug() << "selector index" << ui->listWidget->currentIndex();
emit confirmValue(ui->listWidget->item(ui->listWidget->currentRow())->text());
this->deleteLater();
this->close();
}
App/ComponentUI/Selector/Selector.h
+4
View File
@@ -51,6 +51,10 @@ private slots:
void reBuildList(void);
void on_pushButton_Cancel_clicked();
void on_pushButton_Confirm_clicked();
protected:
bool event(QEvent *event);
App/ComponentUI/Selector/Selector.ui
+30 -1
View File
@@ -24,11 +24,40 @@
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
<number>9</number>
</property>
<property name="verticalSpacing">
<number>9</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QListWidget" name="listWidget"/>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="pushButton_Cancel">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="pushButton_Confirm">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
<property name="text">
<string>Confirm</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>