重新上传

This commit is contained in:
feiyangqingyun
2021-01-16 12:41:38 +08:00
parent 9cf0de0f8d
commit e8195be0e3
149 changed files with 1545 additions and 6219 deletions

View File

@@ -180,7 +180,7 @@ void ButtonDefence::setButtonStyle(const ButtonDefence::ButtonStyle &buttonStyle
} else if (buttonStyle == ButtonStyle_Msg2) {
type = "msg2";
} else {
type = "custom";
type = "circle";
}
setButtonStatus(buttonStatus);

View File

@@ -14,13 +14,7 @@
#include <QWidget>
#ifdef quc
#if (QT_VERSION < QT_VERSION_CHECK(5,7,0))
#include <QtDesigner/QDesignerExportWidget>
#else
#include <QtUiPlugin/QDesignerExportWidget>
#endif
class QDESIGNER_WIDGET_EXPORT ButtonDefence : public QWidget
class Q_DECL_EXPORT ButtonDefence : public QWidget
#else
class ButtonDefence : public QWidget
#endif
@@ -37,16 +31,14 @@ class ButtonDefence : public QWidget
Q_PROPERTY(ButtonStatus buttonStatus READ getButtonStatus WRITE setButtonStatus)
public:
//防区样式 圆形、警察、气泡、气泡2、消息、消息2、自定义
//如果设置的自定义的,则图片拓展名 btn_defence_alarm_custom
//防区样式 圆形、警察、气泡、气泡2、消息、消息2
enum ButtonStyle {
ButtonStyle_Circle = 0,
ButtonStyle_Police = 1,
ButtonStyle_Bubble = 2,
ButtonStyle_Bubble2 = 3,
ButtonStyle_Msg = 4,
ButtonStyle_Msg2 = 5,
ButtonStyle_Custom = 6
ButtonStyle_Msg2 = 5
};
//防区状态 布防、撤防、报警、旁路、故障

View File

@@ -31,7 +31,7 @@ void frmButtonDefence::initForm()
btn3->setText("#3");
btn3->setGeometry(85, 5, 35, 35);
btnStyle << ui->btnCircle << ui->btnPolice << ui->btnBubble << ui->btnBubble2 << ui->btnMsg << ui->btnMsg2 << ui->btnCustom;
btnStyle << ui->btnCircle << ui->btnPolice << ui->btnBubble << ui->btnBubble2 << ui->btnMsg << ui->btnMsg2;
foreach (QPushButton *btn, btnStyle) {
connect(btn, SIGNAL(clicked(bool)), this, SLOT(changeStyle()));
}
@@ -50,16 +50,6 @@ void frmButtonDefence::changeStyle()
btn1->setButtonStyle(style);
btn2->setButtonStyle(style);
btn3->setButtonStyle(style);
if (index == 6) {
btn1->setText("");
btn2->setText("");
btn3->setText("");
} else {
btn1->setText("#1");
btn2->setText("#2");
btn3->setText("#3");
}
}
void frmButtonDefence::changeStatus()
@@ -79,10 +69,3 @@ void frmButtonDefence::on_ckCanMove_stateChanged(int arg1)
btn2->setCanMove(canMove);
btn3->setCanMove(canMove);
}
void frmButtonDefence::on_btnPoint_clicked()
{
qDebug() << "btn1" << "x" << btn1->geometry().x() << "y" << btn1->geometry().y();
qDebug() << "btn2" << "x" << btn2->geometry().x() << "y" << btn2->geometry().y();
qDebug() << "btn3" << "x" << btn3->geometry().x() << "y" << btn3->geometry().y();
}

View File

@@ -25,8 +25,6 @@ private slots:
void changeStatus();
void on_ckCanMove_stateChanged(int arg1);
void on_btnPoint_clicked();
private:
Ui::frmButtonDefence *ui;
ButtonDefence *btn1;

View File

@@ -87,13 +87,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnCustom">
<property name="text">
<string>自定义</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
@@ -136,13 +129,6 @@
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ckCanMove">
<property name="text">
@@ -150,13 +136,6 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnPoint">
<property name="text">
<string>坐标</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
@@ -176,21 +155,6 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>btnCircle</tabstop>
<tabstop>btnPolice</tabstop>
<tabstop>btnBubble</tabstop>
<tabstop>btnBubble2</tabstop>
<tabstop>btnMsg</tabstop>
<tabstop>btnMsg2</tabstop>
<tabstop>btnCustom</tabstop>
<tabstop>btnArming</tabstop>
<tabstop>btnDisarming</tabstop>
<tabstop>btnAlarm</tabstop>
<tabstop>btnBypass</tabstop>
<tabstop>btnError</tabstop>
<tabstop>ckCanMove</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@@ -31,10 +31,5 @@
<file>image/btn_defence_error_msg2.png</file>
<file>image/btn_defence_error_police.png</file>
<file>image/bg_call.jpg</file>
<file>image/btn_defence_alarm_custom.png</file>
<file>image/btn_defence_arming_custom.png</file>
<file>image/btn_defence_bypass_custom.png</file>
<file>image/btn_defence_disarming_custom.png</file>
<file>image/btn_defence_error_custom.png</file>
</qresource>
</RCC>