HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1460:ffe37c282008

Set revision to 1.1.0 some work to bring back catalogs...

jeandet -

r1460:ffe37c282008

parent child

Context file:

r1460:ffe37c282008

CMakeLists.txt +1 -1

              cmake_minimum_required(VERSION 3.6)
-             set(SCIQLOP_VERSION 1.0.0)
+             set(SCIQLOP_VERSION 1.1.0)
              project(SciQLOP
                  VERSION ${SCIQLOP_VERSION}
                  DESCRIPTION "SciQLOP (SCIentific Qt application for Learning from Observations of Plasmas) is an ergonomic and powerful tool enabling visualization and analysis of in situ spacecraft plasma data."

app/src/MainWindow.cpp +5 -5

              #include "ui_MainWindow.h"
              #include <Catalogue/CatalogueController.h>
-             //#include <Catalogue/CatalogueExplorer.h>
+             #include <Catalogue2/browser.h>
              #include <DataSource/DataSourceController.h>
              #include <DataSource/DataSourceWidget.h>
              #include <Settings/SqpSettingsDialog.h>
                          , m_LastOpenRightInspectorSize {}
                          , m_GeneralSettingsWidget { new SqpSettingsGeneralWidget { mainWindow } }
                          , m_SettingsDialog { new SqpSettingsDialog { mainWindow } }
-                 //, m_CatalogExplorer { new CatalogueExplorer { mainWindow } }
+                         , m_CatalogExplorer { new CataloguesBrowser { mainWindow } }
                  {
                  }
                  /// Settings dialog. MainWindow has the ownership
                  SqpSettingsDialog* m_SettingsDialog;
                  /// Catalogue dialog. MainWindow has the ownership
-                 // CatalogueExplorer* m_CatalogExplorer;
+                 CataloguesBrowser* m_CatalogExplorer;
                  bool checkDataToSave(QWidget* parentWidget);
              };
                  // Catalog
                  mainToolBar->addSeparator();
-                 //    mainToolBar->addAction(QIcon(":/icones/catalogue.png"), "Catalogues",
-                 //        [this]() { impl->m_CatalogExplorer->show(); });
+                 mainToolBar->addAction(QIcon(":/icones/catalogue.png"), "Catalogues",
+                     [this]() { impl->m_CatalogExplorer->show(); });
                  // //////// //
                  // Settings //

core +1 -1

		@@ -1,1 +1,1
1		Subproject commit 854c0145877d96f95e0fb6ba08e32cb15cd49cf9
	1	Subproject commit 39bf3ff40b41fc01170241f3e471c708c866118b

gui/include/Catalogue2/browser.h +9 -6

              #ifndef BROWSER_H
              #define BROWSER_H
-             #include <QWidget>
              #include <Catalogue/CatalogueController.h>
+             #include <QWidget>
-             namespace Ui {
+             namespace Ui
+             {
              class Browser;
              }
-             class Browser : public QWidget
+             class CataloguesBrowser : public QWidget
              {
                  Q_OBJECT
              public:
-                 explicit Browser(QWidget *parent = nullptr);
-                 ~Browser();
+                 explicit CataloguesBrowser(QWidget* parent = nullptr);
+                 ~CataloguesBrowser();
              private slots:
                  void repositorySelected(const QString& repo);
                  void catalogueSelected(const CatalogueController::Catalogue_ptr& catalogue);
                  void eventSelected(const CatalogueController::Event_ptr& event);
-                 void productSelected(const CatalogueController::Product_t& product, const CatalogueController::Event_ptr& event);
+                 void productSelected(
+                     const CatalogueController::Product_t& product, const CatalogueController::Event_ptr& event);
              private:
-                 Ui::Browser *ui;
              };

gui/src/Catalogue2/browser.cpp +13 -10

              #include "ui_browser.h"
              #include <SqpApplication.h>
-             Browser::Browser(QWidget* parent) : QWidget(parent), ui(new Ui::Browser)
+             CataloguesBrowser::CataloguesBrowser(QWidget* parent)
+                     : QWidget(parent, Qt::Window), ui(new Ui::Browser)
              {
                  ui->setupUi(this);
                  connect(ui->repositories, &RepositoriesTreeView::repositorySelected, this,
-                     &Browser::repositorySelected);
+                     &CataloguesBrowser::repositorySelected);
                  connect(ui->repositories, &RepositoriesTreeView::catalogueSelected, this,
-                     &Browser::catalogueSelected);
-                 connect(ui->events, &EventsTreeView::eventSelected, this, &Browser::eventSelected);
-                 connect(ui->events, &EventsTreeView::productSelected, this, &Browser::productSelected);
+                     &CataloguesBrowser::catalogueSelected);
+                 connect(ui->events, &EventsTreeView::eventSelected, this, &CataloguesBrowser::eventSelected);
+                 connect(
+                     ui->events, &EventsTreeView::productSelected, this, &CataloguesBrowser::productSelected);
              }
-             Browser::~Browser()
+             CataloguesBrowser::~CataloguesBrowser()
              {
                  delete ui;
              }
-             void Browser::repositorySelected(const QString& repo)
+             void CataloguesBrowser::repositorySelected(const QString& repo)
              {
                  this->ui->Infos->setCurrentIndex(0);
                  this->ui->events->setEvents(sqpApp->catalogueController().events(repo));
                      QString::number(sqpApp->catalogueController().events(repo).size()));
              }
-             void Browser::catalogueSelected(const CatalogueController::Catalogue_ptr& catalogue)
+             void CataloguesBrowser::catalogueSelected(const CatalogueController::Catalogue_ptr& catalogue)
              {
                  this->ui->Infos->setCurrentIndex(1);
                  this->ui->events->setEvents(sqpApp->catalogueController().events(catalogue));
                      QString::number(sqpApp->catalogueController().events(catalogue).size()));
              }
-             void Browser::eventSelected(const CatalogueController::Event_ptr& event)
+             void CataloguesBrowser::eventSelected(const CatalogueController::Event_ptr& event)
              {
                  this->ui->Infos->setCurrentIndex(2);
                  this->ui->Event->setEvent(event);
              }
-             void Browser::productSelected(const CatalogueController::Product_t& product, const CatalogueController::Event_ptr& event)
+             void CataloguesBrowser::productSelected(
+                 const CatalogueController::Product_t& product, const CatalogueController::Event_ptr& event)
              {
                  this->ui->Infos->setCurrentIndex(2);
                  this->ui->Event->setProduct(product,event);

gui/tests/catalogue/browser/main.cpp +1 -1

                  QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
                  SqpApplication a { argc, argv };
-                 Browser w;
+                 CataloguesBrowser w;
                  sqpApp->catalogueController().add("test");
                  sqpApp->catalogueController().add("stuff");
                  sqpApp->catalogueController().add("default");

meson.build +1 -1

              project('SciQLOP', 'cpp',default_options : ['cpp_std=c++17'], meson_version:'>=0.47.0')
-             add_global_arguments('-DSCIQLOP_VERSION="1.0.0"', language : 'cpp')
+             add_global_arguments('-DSCIQLOP_VERSION="1.1.0"', language : 'cpp')
              qt5 = import('qt5')
              qt5core = dependency('qt5', modules : 'Core')

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