Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
nmsdk
rdk
Commits
d6b0e7b0f864
Commit
bd5f60ad
authored
Apr 18, 2021
by
Alexab
Browse files
Qt build bugs fixed.
--HG-- branch : MockCompsTest
parent
d331c28989ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
GUI/Qt/UGEngineControllWidget.cpp
View file @
d6b0e7b0
...
...
@@ -41,7 +41,9 @@ UGEngineControllWidget::UGEngineControllWidget(QWidget *parent, RDK::UApplicatio
createConfigurationWizardWidget
=
NULL
;
createTestWidget
=
NULL
;
statusPanel
=
NULL
;
#ifndef RDK_DISABLE_EXT_GUI
videoAnalyticsSimpleWidget
=
NULL
;
#endif
graphWindowWidget
=
NULL
;
graphWindow
=
NULL
;
profilingWindow
=
NULL
;
...
...
@@ -186,7 +188,9 @@ UGEngineControllWidget::UGEngineControllWidget(QWidget *parent, RDK::UApplicatio
connect
(
ui
->
actionWatchWindow
,
SIGNAL
(
triggered
(
bool
)),
this
,
SLOT
(
actionWatchWindow
()));
connect
(
ui
->
actionProfiling
,
SIGNAL
(
triggered
(
bool
)),
this
,
SLOT
(
actionProfiling
()));
connect
(
ui
->
actionWatchesFromNewWindow
,
SIGNAL
(
triggered
(
bool
)),
this
,
SLOT
(
actionNewWatches
()));
#ifndef RDK_DISABLE_EXT_GUI
connect
(
ui
->
actionVASimpleSettings
,
SIGNAL
(
triggered
(
bool
)),
this
,
SIGNAL
(
showSimpleSettings
()));
#endif
connect
(
ui
->
actionTcpServer
,
SIGNAL
(
triggered
(
bool
)),
this
,
SLOT
(
actionTcpServer
()));
connect
(
ui
->
actionFtpTest
,
SIGNAL
(
triggered
(
bool
)),
this
,
SLOT
(
actionFtpTest
()));
//connect(ui->action, SIGNAL(triggered(bool)), this, SLOT(action)));
...
...
@@ -202,6 +206,7 @@ UGEngineControllWidget::~UGEngineControllWidget()
delete
ui
;
}
#ifndef RDK_DISABLE_EXT_GUI
void
UGEngineControllWidget
::
setExternVideoAnalyticsSimpleWidget
(
UVideoAnalyticsSimpleSettingsWidget
*
externalWidget
)
{
if
(
externalWidget
!=
NULL
)
...
...
@@ -209,6 +214,7 @@ void UGEngineControllWidget::setExternVideoAnalyticsSimpleWidget(UVideoAnalytics
videoAnalyticsSimpleWidget
=
externalWidget
;
}
}
#endif
void
UGEngineControllWidget
::
showLinksForSingleComponent
(
QString
componentName
)
{
...
...
@@ -668,7 +674,7 @@ void UGEngineControllWidget::actionNewWatches()
addWatchesWidged
();
}
#ifndef RDK_DISABLE_EXT_GUI
void
UGEngineControllWidget
::
actionVASimpleSettings
()
{
if
(
videoAnalyticsSimpleWidget
)
...
...
@@ -676,6 +682,7 @@ void UGEngineControllWidget::actionVASimpleSettings()
videoAnalyticsSimpleWidget
->
show
();
}
}
#endif
void
UGEngineControllWidget
::
startChannel
(
int
chanelIndex
)
{
...
...
GUI/Qt/UGEngineControllWidget.h
View file @
d6b0e7b0
...
...
@@ -27,7 +27,10 @@
#include
"UTcpServerControlWidget.h"
//////////////////////////
#include
"UCurlFtpClientTestWidget.h"
#ifndef RDK_DISABLE_EXT_GUI
#include
"UVideoAnalyticsSimpleSettingsWidget.h"
#endif
namespace
Ui
{
class
UGEngineControllWidget
;
...
...
@@ -82,8 +85,9 @@ public:
/// ( )
void
loadProjectExternal
(
const
QString
&
config_path
);
#ifndef RDK_DISABLE_EXT_GUI
void
setExternVideoAnalyticsSimpleWidget
(
UVideoAnalyticsSimpleSettingsWidget
*
externalWidget
);
#endif
signals:
void
showSimpleSettings
();
...
...
@@ -139,7 +143,9 @@ public slots:
void
actionNewWatches
();
void
actionProfiling
();
void
actionTcpServer
();
#ifndef RDK_DISABLE_EXT_GUI
void
actionVASimpleSettings
();
#endif
void
actionFtpTest
();
private
slots
:
...
...
@@ -171,7 +177,9 @@ private:
UWatch
*
watchWindow
;
QMainWindow
*
tcpServerControlWindow
;
UTcpServerControlWidget
*
tcpServerControlWidget
;
#ifndef RDK_DISABLE_EXT_GUI
UVideoAnalyticsSimpleSettingsWidget
*
videoAnalyticsSimpleWidget
;
#endif
UCurlFtpClientTestWidget
*
curlFtpClientTestWidget
;
///
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment