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
898f317ffe2a
Commit
fecf6727
authored
Apr 21, 2021
by
vlad_burin
Browse files
Upload result to mount storage returned
--HG-- branch : StandaloneRun
parent
8045b5237ff3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Core/Application/Qt/UProjectDeployerQt.cpp
View file @
898f317f
...
...
@@ -948,9 +948,9 @@ bool UProjectDeployProcessingThread::VerifyData()
}
//====================================================================
UProjectResultsUploadingThread
::
UProjectResultsUploadingThread
(
bool
standalone
)
UProjectResultsUploadingThread
::
UProjectResultsUploadingThread
()
{
this
->
standalone
=
standalone
;
}
UProjectResultsUploadingThread
::~
UProjectResultsUploadingThread
()
...
...
@@ -1027,14 +1027,12 @@ void UProjectResultsUploadingThread::run()
return
;
}
if
(
!
standalone
)
if
(
!
CopyResultsToRemoteStorageDir
()
)
{
if
(
!
CopyResultsToRemoteStorageDir
())
{
uploadState
=
DS_Error
;
return
;
}
uploadState
=
DS_Error
;
return
;
}
/*
uploadState = DS_PackResults;
if(!ZipResults())
...
...
@@ -2551,7 +2549,7 @@ bool UProjectDeployerQt::FinishCalculation()
/// ( Results) ,
///
bool
UProjectDeployerQt
::
UploadCalculationResults
(
bool
standalone
)
bool
UProjectDeployerQt
::
UploadCalculationResults
()
{
// ,
// , ...
...
...
@@ -2620,7 +2618,7 @@ bool UProjectDeployerQt::UploadCalculationResults(bool standalone)
{
delete
projectResultsUploadingThread
;
}
projectResultsUploadingThread
=
new
UProjectResultsUploadingThread
(
standalone
);
projectResultsUploadingThread
=
new
UProjectResultsUploadingThread
();
projectResultsUploadingThread
->
SetDatabasePath
(
db_path
);
projectResultsUploadingThread
->
SetRemoteFtpPath
(
QString
(
ftp_remote_path
.
c_str
()));
projectResultsUploadingThread
->
SetProjectResultsDirPath
(
results_dir_path
);
...
...
@@ -3240,7 +3238,7 @@ void UProjectRunThread::FinishProject()
void
UProjectRunThread
::
UploadResults
()
{
if
(
!
Deployer
->
UploadCalculationResults
(
true
))
if
(
!
Deployer
->
UploadCalculationResults
())
{
WriteLog
(
Deployer
->
GetLastError
());
projectRunState
=
ProjectRunState
::
PS_Termination
;
...
...
Core/Application/Qt/UProjectDeployerQt.h
View file @
898f317f
...
...
@@ -208,7 +208,7 @@ class RDK_LIB_TYPE UProjectResultsUploadingThread: public QThread
Q_OBJECT
public:
UProjectResultsUploadingThread
(
bool
standalone
=
false
);
UProjectResultsUploadingThread
();
~
UProjectResultsUploadingThread
();
void
run
()
override
;
...
...
@@ -246,7 +246,6 @@ private slots:
void
processReadyReadStandardOutput
();
private:
bool
standalone
;
QString
projectResultsDir
;
QString
storageResultsDir
;
QString
databasePath
;
...
...
@@ -500,7 +499,7 @@ virtual bool ProcessCalculationLog(std::string &error);
virtual
bool
FinishCalculation
();
/// ( Results) ,
///
virtual
bool
UploadCalculationResults
(
bool
standalone
);
virtual
bool
UploadCalculationResults
();
/// ,
/// , ..
virtual
bool
CloseSolver
();
...
...
Core/Application/UProjectDeployer.h
View file @
898f317f
...
...
@@ -106,7 +106,7 @@ virtual bool ProcessCalculationLog(std::string &error);
virtual
bool
FinishCalculation
()
{
return
false
;};
/// ( Results) ,
///
virtual
bool
UploadCalculationResults
(
bool
standalone
=
false
)
{
return
false
;};
virtual
bool
UploadCalculationResults
()
{
return
false
;};
/// ,
/// , ..
virtual
bool
CloseSolver
()
{
return
false
;};
...
...
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