##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Remove connection for progress from NC -> VC to NC -> Provider.
perrinel -
r425:d987dda795cf
parent child
Show More
Show file before | Show file after | Hide comments
@@ -47,6 +47,12 signals:
47 void dataProvided(QUuid identifier, std::shared_ptr<IDataSeries> dateSerie,
47 void dataProvided(QUuid identifier, std::shared_ptr<IDataSeries> dateSerie,
48 const SqpDateTime &dateTime);
48 const SqpDateTime &dateTime);
49
49
50 /**
51 * @brief dataProvided send dataSeries under dateTime and that corresponds of the data
52 * identified by identifier
53 */
54 void dataProvidedProgress(QUuid identifier, double progress);
55
50
56
51 /**
57 /**
52 * @brief requestConstructed send a request for the data identified by identifier
58 * @brief requestConstructed send a request for the data identified by identifier
Show file before | Show file after | Hide comments
@@ -144,6 +144,8 void VariableController::createVariable(const QString &name, const QVariantHash
144 };
144 };
145
145
146 connect(provider.get(), &IDataProvider::dataProvided, addDateTimeAcquired);
146 connect(provider.get(), &IDataProvider::dataProvided, addDateTimeAcquired);
147 connect(provider.get(), &IDataProvider::dataProvidedProgress, this,
148 &VariableController::onVariableRetrieveDataInProgress);
147 this->onRequestDataLoading(newVariable, dateTime);
149 this->onRequestDataLoading(newVariable, dateTime);
148 }
150 }
149 }
151 }
Show file before | Show file after | Hide comments
@@ -106,11 +106,6 SqpApplication::SqpApplication(int &argc, char **argv)
106 impl->m_NetworkControllerThread.start();
106 impl->m_NetworkControllerThread.start();
107 impl->m_VariableControllerThread.start();
107 impl->m_VariableControllerThread.start();
108 impl->m_VisualizationControllerThread.start();
108 impl->m_VisualizationControllerThread.start();
109
110 // Core connections:
111 // NetworkController <-> VariableController
112 connect(&sqpApp->networkController(), &NetworkController::replyDownloadProgress,
113 &sqpApp->variableController(), &VariableController::onVariableRetrieveDataInProgress);
114 }
109 }
115
110
116 SqpApplication::~SqpApplication()
111 SqpApplication::~SqpApplication()
Show file before | Show file after | Hide comments
@@ -48,6 +48,10 AmdaProvider::AmdaProvider()
48 &networkController,
48 &networkController,
49 SLOT(onProcessRequested(QNetworkRequest, QUuid,
49 SLOT(onProcessRequested(QNetworkRequest, QUuid,
50 std::function<void(QNetworkReply *, QUuid)>)));
50 std::function<void(QNetworkReply *, QUuid)>)));
51
52
53 connect(&sqpApp->networkController(), SIGNAL(replyDownloadProgress(QUuid, double)), this,
54 SIGNAL(dataProvidedProgress(QUuid, double)));
51 }
55 }
52 }
56 }
53
57
General Comments 0
You need to be logged in to leave comments. Login now