GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r424:09d21ab89520

Minor refactoring...

Alexandre Leroux -

r424:09d21ab89520

parent child

Context file:

r424:09d21ab89520

Collapse all files

app/src/Main.cpp +5 -2

              #include <Plugin/PluginManager.h>
              #include <QDir>
+             #include <QLoggingCategory>
+             Q_LOGGING_CATEGORY(LOG_Main, "Main")
              namespace {
              /// Name of the directory containing the plugins
                  }
              #endif
              #endif
-                 qCDebug(LOG_PluginManager())
-                     << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());
+                 qCDebug(LOG_Main()) << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());
                  PluginManager pluginManager{};
                  pluginManager.loadPlugins(pluginDir);

app/src/MainWindow.cpp 0 -55

              #include <QToolButton>
              #include <memory.h>
-             //#include <omp.h>
-             //#include <network/filedownloader.h>
-             //#include <qlopdatabase.h>
-             //#include <qlopsettings.h>
-             //#include <qlopgui.h>
-             //#include <spacedata.h>
-             //#include "qlopcore.h"
-             //#include "qlopcodecmanager.h"
-             //#include "cdfcodec.h"
-             //#include "amdatxtcodec.h"
-             //#include <qlopplotmanager.h>
              #include "iostream"
              Q_LOGGING_CATEGORY(LOG_MainWindow, "MainWindow")
                      SIGNAL(tableMenuAboutToBeDisplayed(QMenu *, const QVector<std::shared_ptr<Variable> > &)),
                      m_Ui->view, SLOT(attachVariableMenu(QMenu *, const QVector<std::shared_ptr<Variable> > &)),
                      Qt::DirectConnection);
-                 /*    QLopGUI::registerMenuBar(menuBar());
-                     this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
-                     this->m_progressWidget = new QWidget();
-                     this->m_progressLayout = new QVBoxLayout(this->m_progressWidget);
-                     this->m_progressWidget->setLayout(this->m_progressLayout);
-                     this->m_progressWidget->setWindowModality(Qt::WindowModal);
-                     m_progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
-                     for(int i=0;i<OMP_THREADS;i++)
+                     {
-                         this->m_progress.append(new QProgressBar(this->m_progressWidget));
-                         this->m_progress.last()->setMinimum(0);
-                         this->m_progress.last()->setMaximum(100);
-                         this->m_progressLayout->addWidget(this->m_progress.last());
-                         this->m_progressWidget->hide();
-                         this->m_progressThreadIds[i] = -1;
+                     }
-                     this->m_progressWidget->setWindowTitle("Loading File");
-                     const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
-                             << QLopCore::self()
-                             << QLopPlotManager::self()
-                             << QLopCodecManager::self()
-                             << FileDownloader::self()
-                             << QLopDataBase::self()
-                             << SpaceData::self();
-                     CDFCodec::registerToManager();
-                     AMDATXTCodec::registerToManager();
-                     for(int i=0;i<ServicesToLoad.count();i++)
+                     {
-                         qDebug()<<ServicesToLoad.at(i)->serviceName();
-                         ServicesToLoad.at(i)->initialize(); //must be called before getGUI
-                         QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
-                         if(wdgt)
+                         {
-                             wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
-                             this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
+                         }
-                         PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
-                     }*/
              }
              MainWindow::~MainWindow()
              {
              }
              void MainWindow::changeEvent(QEvent *e)
              {
                  QMainWindow::changeEvent(e);

core/include/Variable/VariableCacheController.h 0 -3

              class Variable;
-             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableCacheController)
              /// This class aims to store in the cache all of the dateTime already requested to the variable.
              class VariableCacheController : public QObject {
                  Q_OBJECT

gui/src/Visualization/VisualizationGraphWidget.cpp +2 -2

                              if (variable->contains(variableDateTimeWithTolerance)) {
                                  qCDebug(LOG_VisualizationGraphWidget())
                                      << tr("TORM: Detection zoom in that need request:");
-                                 // add 10% tolerance for each side
+                                 // add tolerance for each side
                                  tolerance
                                      = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
                                  variableDateTimeWithTolerance.m_TStart -= tolerance;
                          }
                          else {
                              qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: Detection zoom out: ");
-                             // add 10% tolerance for each side
+                             // add tolerance for each side
                              tolerance = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
                              variableDateTimeWithTolerance.m_TStart -= tolerance;
                              variableDateTimeWithTolerance.m_TEnd += tolerance;

plugins/amda/src/AmdaProvider.cpp +1 -2

              AmdaProvider::AmdaProvider()
              {
-                 qCDebug(LOG_NetworkController()) << tr("AmdaProvider::AmdaProvider")
-                                                  << QThread::currentThread();
+                 qCDebug(LOG_AmdaProvider()) << tr("AmdaProvider::AmdaProvider") << QThread::currentThread();
                  if (auto app = sqpApp) {
                      auto &networkController = app->networkController();
                      connect(this, SIGNAL(requestConstructed(QNetworkRequest, QUuid,

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages