Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MicroCART
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
Distributed Autonomous Networked Control Lab
MicroCART
Commits
2447b64a
Commit
2447b64a
authored
7 years ago
by
burneykb
Browse files
Options
Downloads
Patches
Plain Diff
couple of fixes in mainwindow.cpp
parent
d9d43eae
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
groundStation/gui/MicroCART/mainwindow.cpp
+3
-3
3 additions, 3 deletions
groundStation/gui/MicroCART/mainwindow.cpp
groundStation/gui/MicroCART/quaditem.h
+2
-1
2 additions, 1 deletion
groundStation/gui/MicroCART/quaditem.h
with
5 additions
and
4 deletions
groundStation/gui/MicroCART/mainwindow.cpp
+
3
−
3
View file @
2447b64a
...
...
@@ -51,7 +51,7 @@ MainWindow::MainWindow(QWidget *parent) :
this
,
SLOT
(
updateTracker
(
float
,
float
,
float
,
float
,
float
,
float
)));
connect
(
trackerWorker
,
SIGNAL
(
finished
(
float
,
float
,
float
,
float
,
float
,
float
)),
this
,
SLOT
(
quad
->
updateQuad
(
float
,
float
,
float
,
float
,
float
,
float
)));
quad
,
SLOT
(
quad
->
updateQuad
(
float
,
float
,
float
,
float
,
float
,
float
)));
/* Create another worker for the control graph */
QThread
*
cwThread
=
new
QThread
(
this
);
...
...
@@ -144,7 +144,7 @@ void MainWindow::updateTracker(float x, float y, float z, float p, float r, floa
void
MainWindow
::
on_pbStart_clicked
()
{
QProcessEnvironment
::
systemEnvironment
().
insert
(
"UCART_SOCKET"
,
ui
->
socketPath
->
text
());
this
->
backendPid
=
startBackend
(
ui
->
backendPath
->
text
().
toStdString
().
c_str
(),
&
backendPipe
);
this
->
backendPid
=
startBackend
(
ui
->
backendPath
_2
->
text
().
toStdString
().
c_str
(),
&
backendPipe
);
ui
->
pbStart
->
setEnabled
(
false
);
ui
->
pbStop
->
setEnabled
(
true
);
backendState
=
1
;
...
...
@@ -178,7 +178,7 @@ void MainWindow::on_chooseBackend_clicked()
{
QString
backendPath
=
QFileDialog
::
getOpenFileName
(
this
,
tr
(
"Path to Backend Executable"
));
ui
->
backendPath
->
setText
(
backendPath
);
ui
->
backendPath
_2
->
setText
(
backendPath
);
}
...
...
This diff is collapsed.
Click to expand it.
groundStation/gui/MicroCART/quaditem.h
+
2
−
1
View file @
2447b64a
...
...
@@ -9,8 +9,9 @@
#include
<QtGui>
#include
<QTransform>
class
QuadItem
:
public
QGraphicsItem
class
QuadItem
:
public
QObject
,
public
QGraphicsItem
{
Q_OBJECT
public:
QuadItem
();
QRectF
boundingRect
()
const
;
...
...
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