Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Qt UI Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Design Studio
QML Viewer Projects
Qt UI Viewer
Commits
b5c1676f
Commit
b5c1676f
authored
1 year ago
by
Burak Hançerli
Browse files
Options
Downloads
Patches
Plain Diff
QDS-11882
Add clear feedback when receiving a new project from the Design Studio
parent
426e9ac5
No related branches found
No related tags found
1 merge request
!34
QDS-11882 Add clear feedback when receiving a new project from the Design Studio
Pipeline
#67004
passed
1 year ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/backend.cpp
+8
-3
8 additions, 3 deletions
src/backend.cpp
src/dsConnector.cpp
+12
-0
12 additions, 0 deletions
src/dsConnector.cpp
src/dsConnector.h
+3
-0
3 additions, 0 deletions
src/dsConnector.h
with
23 additions
and
3 deletions
src/backend.cpp
+
8
−
3
View file @
b5c1676f
...
...
@@ -288,9 +288,6 @@ void Backend::openCamera()
void
Backend
::
initializeProjectManager
()
{
if
(
m_projectManager
)
return
;
m_projectManager
.
reset
(
new
ProjectManager
(
autoScaleProject
()));
connect
(
m_projectManager
.
data
(),
&
ProjectManager
::
closingProject
,
this
,
[
&
]
{
emit
popupClose
();
...
...
@@ -307,6 +304,13 @@ void Backend::initDesignStudioConnector()
this
,
&
Backend
::
networkUpdated
);
connect
(
m_designStudioConnector
.
data
(),
&
DesignStudioConnector
::
projectIncoming
,
this
,
[
&
]
{
qDebug
()
<<
"Project incoming from Design Studio"
;
m_projectManager
.
reset
();
emit
popupOpen
();
updatePopup
(
"Receiving project..."
);
});
connect
(
m_designStudioConnector
.
data
(),
&
DesignStudioConnector
::
projectReceived
,
this
,
...
...
@@ -336,6 +340,7 @@ void Backend::initDesignStudioConnector()
}
emit
popupClose
();
m_designStudioConnector
->
sendProjectReceived
();
});
qDebug
()
<<
"Design Studio Connector is initialized"
;
...
...
This diff is collapsed.
Click to expand it.
src/dsConnector.cpp
+
12
−
0
View file @
b5c1676f
...
...
@@ -42,6 +42,7 @@ void DesignStudioConnector::receiveProject()
m_projectData
.
clear
();
m_projectData
.
append
(
data
);
m_receivingData
=
true
;
emit
projectIncoming
();
}
else
if
(
m_receivingData
)
{
if
(
data
.
contains
(
"::qmlrc-end::"
))
{
qDebug
()
<<
"TCP:: Received project end delimeter"
;
...
...
@@ -111,3 +112,14 @@ void DesignStudioConnector::updateIpv4Addr()
emit
networkStatusUpdated
(
"
\n
Local IP: "
+
m_ipv4Addr
+
"
\n
Waiting for Design Studio to connect..."
);
}
void
DesignStudioConnector
::
sendProjectReceived
()
{
if
(
!
m_tcpSocket
)
{
qDebug
()
<<
"TCP:: Socket is not connected"
;
return
;
}
m_tcpSocket
->
write
(
"::qmlrc-received::"
);
m_tcpSocket
->
flush
();
}
This diff is collapsed.
Click to expand it.
src/dsConnector.h
+
3
−
0
View file @
b5c1676f
...
...
@@ -38,6 +38,8 @@ class DesignStudioConnector : public QObject
public:
explicit
DesignStudioConnector
(
QObject
*
parent
=
nullptr
);
void
sendProjectReceived
();
private:
// Tcp connection members
QTcpServer
m_tcpServer
;
...
...
@@ -60,6 +62,7 @@ private:
signals:
void
networkStatusUpdated
(
QString
);
void
projectReceived
(
QByteArray
);
void
projectIncoming
();
};
#endif // DSCONNECTOR_H
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment