This instance will be upgraded to Heptapod 0.23.2 on 2021-08-05 at 11:00 UTC+2 (a few minutes of down time)

Commit 38966389 authored by vlad_burin's avatar vlad_burin
Browse files

Merge conflict resolved

--HG--
branch : StandaloneRun
parent 8f1ded7665fe
......@@ -259,6 +259,46 @@ private:
};
class RDK_LIB_TYPE UProjectRunThread: public QThread
{
Q_OBJECT
public:
UProjectRunThread(UProjectDeployer* deployer);
~UProjectRunThread();
void run() override;
std::string GetLastError();
int GetCalcState();
private:
UProjectDeployer* Deployer;
std::string error_string;
int calc_state;
private:
/// :
/// 1.
/// 2. ?
/// 3.
int PrepProject(std::string &response);
///
int OpenProject(std::string &response);
///
int RunProject();
///
int FinishProject();
};
class RDK_LIB_TYPE UProjectDeployerQt: public UProjectDeployer
{
......@@ -370,6 +410,9 @@ QDateTime processing_end_datetime;
UProjectResultsUploadingThread *projectResultsUploadingThread;
// standalone ( )
int serverStandaloneTask;
TemplateType template_type;
protected://
......@@ -382,6 +425,9 @@ public: //
/// , ( )
virtual int StartProjectDeployment(int deploy_task_id);
/// , ( ) ( )
virtual int StartProjectRun(int task_id);
/// :
/// 1.
/// 2. ?
......@@ -439,6 +485,11 @@ virtual int GetUploadState();
///
virtual void UpdateTaskStateInDb(int task_id, const DatabaseTaskStatus &status, float progress=-1.0f, const QString &start_time="", const QString& end_time="");
///
virtual void SetStandaloneTask(int task);
virtual int GetStandaloneTask();
public: //
///
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment