zcy
/
proto-debuger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

master
zcy 2021-08-29 23:50:41 +08:00
parent 59c41d202a
commit 916c23a1ec
8 changed files with 73 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
protoDebuger/CMakeLists.txt
View File

@ -64,11 +64,8 @@ set (UIS
set(Resourcestylte "${CMAKE_CURRENT_LIST_DIR}/qss.qrc")
list(APPEND RESOURCES ${Resourcestylte})
<<<<<<< .merge_file_a04720
include(D:\\project\\c++qt\\qsswraper\\CMakeLists.txt)
=======
include(D:\\project\\qt\\qsswraper\\CMakeLists.txt)
>>>>>>> .merge_file_a09540
QT5_WRAP_CPP(MOC ${SOURCES} ) # moc预编译代码
QT5_WRAP_CPP(MOCHEADER ${HEADERS} ) # moc预编译代码

33
protoDebuger/NetSelect.qml
View File

@ -4,13 +4,15 @@ import QtQuick.Layouts 1.0
import QtQml 2.3
Item {
id: element
Item {
objectName: "NetSelect"
width: 800
height: 600
visible: true
ColorAnimation {
from: "white"
to: "black"
@ -24,6 +26,7 @@ Item {
anchors.fill: parent
scale: 1
transformOrigin: Item.Center
Column {
anchors.fill: parent
spacing: 6
@ -190,13 +193,10 @@ Item {
Number(port.text),
radioSelectWebsocket.checked,
type_network)
if(ret != 0){
tip.fail("网络连接失败")
return
}
tip.success("网络连接成功")
button_network.text = "关闭网络"
}else
button_network.text = "正在连接"
}else (button_network.text == "关闭连接")
{
DataWrap.closeNetwork();
button_network.text = "打开网络"
@ -239,4 +239,19 @@ Item {
}
}
}
Connections {
target: DataWrap
onSendToQml: {
button_network.text = "关闭连接"
tip.success("网络连接成功")
}
}
Connections {
target: DataWrap
onDisConnected: {
button_network.text = "打开连接"
tip.success("网络连接失败")
}
}
}

2
protoDebuger/main.cpp
View File

@ -22,6 +22,8 @@ int main(int argc, char *argv[])
freopen("CONOUT$","w",stdout);
QApplication app(argc, argv);
QQmlApplicationEngine engine;
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
printf("hello world");

8
protoDebuger/mainwindow.cpp
View File

@ -7,6 +7,7 @@
#include <QQmlContext>
#include "sharedata.h"
#include <QLayout>
#include <QQmlApplicationEngine>
QmlShareData gGlobal;
@ -17,10 +18,15 @@ MainWindow::MainWindow(QWidget *parent) :
{
ui->setupUi(this);
QQuickWidget *m_quickWidget=new QQuickWidget();
QQmlEngine *engine = m_quickWidget->engine();
QQmlContext* ctx = engine->rootContext();
ctx->setContextProperty("DataWrap", &gGlobal);
QUrl source("qrc:/main.qml");
m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView );
m_quickWidget->setSource(source);
m_quickWidget->rootContext()->setContextProperty("DataWrap",&gGlobal);
// m_quickWidget->rootContext()->setContextProperty("DataWrap",&gGlobal);
this->setStyleSheet("margin: 0px;");
gGlobal.SetQuickView(m_quickWidget);
ui->centralwidget->layout()->addWidget(m_quickWidget);

16
protoDebuger/network_controller.cpp
View File

@ -26,9 +26,13 @@ NetworkController::NetworkController(NetworkController::NetworkType type,
QObject::connect(mTcp, SIGNAL(connected()), this, SLOT(on_conected()));
QObject::connect(mTcp, SIGNAL(readyRead()), this, SLOT(on_ready_read()));
QObject::connect(mTcp, SIGNAL(disconnected()), this, SLOT(on_disconect()));
QObject::connect(mTcp, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
this, SLOT(tcpsock_stateChanged(QAbstractSocket::SocketState)));
mTcp->connectToHost(ip,port,QIODevice::ReadWrite,QAbstractSocket::IPv4Protocol);
qDebug()<<mTcp->state();
if(mTcp->state() == QAbstractSocket::ConnectedState)
mState = true;
}
@ -112,7 +116,6 @@ int NetworkController::Close()
return 0;
}
NetworkController::~NetworkController()
{
if(mState){
@ -125,9 +128,9 @@ NetworkController::~NetworkController()
if(mUDP != nullptr)
delete mUDP;
}
}
bool NetworkController::State()
{
return this->mState;
@ -137,6 +140,15 @@ void NetworkController::on_conected()
{
qDebug()<<"connected";
mState = true;
emit(on_connected());
}
void NetworkController::tcpsock_stateChanged(QAbstractSocket::SocketState state)
{
qDebug()<<state;
if(state == QAbstractSocket::SocketState::UnconnectedState){
emit(on_disconnectd());
}
}
void NetworkController::on_ready_read()

6
protoDebuger/network_controller.h
View File

@ -35,13 +35,17 @@ public:
~NetworkController();
bool State();
public slots:
void on_conected();
void on_ready_read();
void on_disconect();
void on_server_accept();
void on_accept_error(QAbstractSocket::SocketError socketError);
private slots:
void on_conected();
void tcpsock_stateChanged(QAbstractSocket::SocketState);
signals:
void on_disconnectd();
void on_connected();
void on_data_recv();
void on_conection_ok();
void on_conection_close();

16
protoDebuger/sharedata.cpp
View File

@ -92,12 +92,10 @@ int QmlShareData::openNetwork(QString ip, unsigned int port, bool is_ws,int type
m_network_ = nullptr;
m_network_ = new NetworkController(NetworkController::TYPE_TCP_CLIENT,ip,port);
}
connect(m_network_,SIGNAL(on_connected()),this,SLOT(on_network_conected()));
connect(m_network_,SIGNAL(on_disconnectd()),this,SLOT(on_network_disconected()));
connect(m_network_,SIGNAL(on_data_recv()),this,SLOT(on_network_data_recv()));
if(m_network_->State())
return 0;
else{
return -1;
}
}
if((type == NetworkController::TYPE_UDP_CLIENT) ||
(type == NetworkController::TYPE_UDP_SERVER)){
@ -190,4 +188,14 @@ void QmlShareData::on_network_data_recv(){
}
}
void QmlShareData::on_network_conected()
{
emit(sendToQml(11));
}
void QmlShareData::on_network_disconected()
{
emit(disConnected());
}

6
protoDebuger/sharedata.h
View File

@ -53,8 +53,14 @@ public:
signals:
void txtchanged();
void valueFromCpp(int val);
void sendToQml(int count);
void disConnected();
public slots:
void on_network_data_recv();
void on_network_conected();
void on_network_disconected();
private:
NetworkController *m_network_;
SerialController *m_serial_controller_;