HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1497:1e241bda0af5

Product tree features:...

jeandet -

r1497:1e241bda0af5

parent child

Context file:

r1497:1e241bda0af5

app/PySide2-bindings/plugins/SPWC-Amda.py +4 -4

             import traceback
             import os
             from datetime import datetime, timedelta, timezone
             from SciQLopBindings import PyDataProvider, Product, VectorTimeSerie, ScalarTimeSerie, DataSeriesType
             import numpy as np
             import requests
             import copy
             from spwc.amda import AMDA
             amda = AMDA()
             def amda_make_scalar(var=None):
                 if var is None:
                     return ((np.array(), np.array()), DataSeriesType.SCALAR)
                 else:
-                    return ((var.time.copy(),var.data.copy()), DataSeriesType.SCALAR)
+                    return ((var.time,var.data), DataSeriesType.SCALAR)
             def amda_make_vector(var=None):
                 if var is None:
                     return ((np.array(), np.array()), DataSeriesType.VECTOR)
                 else:
-                    return ((var.time.copy(),var.data.copy()), DataSeriesType.VECTOR)
+                    return ((var.time,var.data), DataSeriesType.VECTOR)
             def amda_make_multi_comp(var=None):
                 if var is None:
                     return ((np.array(), np.array()), DataSeriesType.MULTICOMPONENT)
                 else:
-                    return ((var.time.copy(),var.data.copy()), DataSeriesType.MULTICOMPONENT)
+                    return ((var.time,var.data), DataSeriesType.MULTICOMPONENT)
             def amda_make_spectro(var=None):
                 if var is None:
                     return ((np.array(), np.array()), DataSeriesType.SPECTROGRAM)
                 else:
                     min_sampling = float(var.meta.get("DATASET_MIN_SAMPLING","nan"))
                     max_sampling = float(var.meta.get("DATASET_MAX_SAMPLING","nan"))
                     if "PARAMETER_TABLE_MIN_VALUES[1]" in var.meta:
                         min_v = np.array([ float(v) for v in var.meta["PARAMETER_TABLE_MIN_VALUES[1]"].split(',') ])
                         max_v = np.array([ float(v) for v in var.meta["PARAMETER_TABLE_MAX_VALUES[1]"].split(',') ])
                         y = (max_v + min_v)/2.
                     elif "PARAMETER_TABLE_MIN_VALUES[0]" in var.meta:
                         min_v = np.array([ float(v) for v in var.meta["PARAMETER_TABLE_MIN_VALUES[0]"].split(',') ])
                         max_v = np.array([ float(v) for v in var.meta["PARAMETER_TABLE_MAX_VALUES[0]"].split(',') ])
                         y = (max_v + min_v)/2.
                     else:
                         y = np.logspace(1,3,var.data.shape[1])[::-1]
-                    return ((var.time.copy(),var.data.copy()), DataSeriesType.SPECTROGRAM)
+                    return ((var.time,var.data), DataSeriesType.SPECTROGRAM)
                     #return pysciqlopcore.SpectrogramTimeSerie(var.time,y,var.data,min_sampling,max_sampling,True)
             def amda_get_sample(metadata,start,stop):
                 ts_type = amda_make_scalar
                 try:
                     param_id = None
                     for key,value in metadata:
                         if key == 'xml:id':
                             param_id = value
                         elif key == 'type':
                             if value == 'vector':
                                 ts_type = amda_make_vector
                             elif value == 'multicomponent':
                                 ts_type = amda_make_multi_comp
                             elif value == 'spectrogram':
                                 ts_type = amda_make_spectro
                     tstart=datetime.fromtimestamp(start, tz=timezone.utc)
                     tend=datetime.fromtimestamp(stop, tz=timezone.utc)
                     var = amda.get_parameter(start_time=tstart, stop_time=tend, parameter_id=param_id, method="REST")
                     return ts_type(var)
                 except Exception as e:
                     print(traceback.format_exc())
                     print("Error in amda.py ",str(e))
                     return ts_type()
             class AmdaProvider(PyDataProvider):
                 def __init__(self):
                     super(AmdaProvider,self).__init__()
                     if len(amda.component) is 0:
                         amda.update_inventory()
                     parameters = copy.deepcopy(amda.parameter)
                     for name,component in amda.component.items():
                         if 'components' in parameters[component['parameter']]:
                             parameters[component['parameter']]['components'].append(component)
                         else:
                             parameters[component['parameter']]['components']=[component]
                     products = []
                     for key,parameter in parameters.items():
                         path = f"/AMDA/{parameter['mission']}/{parameter.get('observatory','')}/{parameter['instrument']}/{parameter['dataset']}/{parameter['name']}"
                         components = [component['name'] for component in parameter.get('components',[])]
                         metadata = { key:item for key,item in parameter.items() if key is not 'components' }
                         n_components = parameter.get('size',0)
                         if n_components == '3':
                             metadata["type"]="vector"
                         elif parameter.get('display_type','')=="spectrogram":
                             metadata["type"]="spectrogram"
                         elif n_components !=0:
                             metadata["type"]="multicomponent"
                         else:
                             metadata["type"]="scalar"
                         products.append( Product(path, components, metadata))
                     self.register_products(products)
                     for mission in amda.mission:
                         self.set_icon(f'/AMDA/{mission}','satellite')
                 def get_data(self,metadata,start,stop):
                     ts_type = amda_make_scalar
                     try:
                         param_id = metadata['xml:id']
                         ts_type_str = metadata['type']
                         if ts_type_str == 'vector':
                             ts_type = amda_make_vector
                         elif ts_type_str == 'multicomponent':
                             ts_type = amda_make_multi_comp
                         elif ts_type_str == 'spectrogram':
                             ts_type = amda_make_spectro
                         tstart=datetime.fromtimestamp(start, tz=timezone.utc)
                         tend=datetime.fromtimestamp(stop, tz=timezone.utc)
                         var = amda.get_parameter(start_time=tstart, stop_time=tend, parameter_id=param_id, method="REST")
                         return ts_type(var)
                     except Exception as e:
                         print(traceback.format_exc())
                         print("Error in amda.py ",str(e))
                         return ts_type()
             _amda = AmdaProvider()

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 46467fb43b8d07fe4f4a45df949ec4ae858ccf9d		1	Subproject commit 9f4e10a342eece28498d9b732bf59f8d1908b716

gui/src/DataSource/DataSourceWidget.cpp +25 -4

             #include <DataSource/DataSourceWidget.h>
             #include <ui_DataSourceWidget.h>
             #include <DataSource/datasources.h>
+            #include <QCompleter>
             #include <SqpApplication.h>
+            #include <QAction>
             namespace
             {
             /// Number of columns displayed in the tree
             const auto TREE_NB_COLUMNS = 1;
             /// Header labels for the tree
             const auto TREE_HEADER_LABELS = QStringList { QObject::tr("Name") };
             } // namespace
             DataSourceWidget::DataSourceWidget(QWidget* parent)
-                    : QWidget { parent }
+                    : QWidget { parent }, ui { new Ui::DataSourceWidget }
-                    , ui { new Ui::DataSourceWidget }
             {
                 ui->setupUi(this);
                 m_model_proxy.setSourceModel(&(sqpApp->dataSources()));
                 ui->treeView->setModel(&m_model_proxy);
                 ui->treeView->setDragEnabled(true);
                 m_model_proxy.setFilterRole(Qt::ToolTipRole);
                 m_model_proxy.setRecursiveFilteringEnabled(true);
                 // Connection to filter tree
-                connect(ui->filterLineEdit, &QLineEdit::textChanged, &m_model_proxy, static_cast<void (QSortFilterProxyModel::*)(const QString&)>(
+                connect(ui->filterLineEdit, &QLineEdit::textChanged, &m_model_proxy,
+                    static_cast<void (QSortFilterProxyModel::*)(const QString&)>(
                         &QSortFilterProxyModel::setFilterRegExp));
                 sqpApp->dataSources().addIcon("satellite", QVariant(QIcon(":/icones/satellite.svg")));
+                QAction* expandAll = new QAction("Expand all");
+                QAction* collapseAll = new QAction("Collapse all");
+                ui->treeView->addAction(expandAll);
+                ui->treeView->addAction(collapseAll);
+                ui->treeView->setContextMenuPolicy(Qt::ActionsContextMenu);
+                connect(expandAll, &QAction::triggered, [treeView = ui->treeView](bool checked) {
+                    (void)checked;
+                    treeView->expandAll();
+                });
+                connect(collapseAll, &QAction::triggered, [treeView = ui->treeView](bool checked) {
+                    (void)checked;
+                    treeView->collapseAll();
+                });
+                QCompleter* completer = new QCompleter(this);
+                completer->setModel(sqpApp->dataSources().completionModel());
+                completer->setCaseSensitivity(Qt::CaseInsensitive);
+                ui->filterLineEdit->setCompleter(completer);
             }
             DataSourceWidget::~DataSourceWidget() noexcept
             {
                 delete ui;
             }

gui/ui/DataSource/DataSourceWidget.ui +3 0

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>DataSourceWidget</class>
              <widget class="QWidget" name="DataSourceWidget">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>400</width>
                 <height>300</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Data sources</string>
               </property>
               <layout class="QGridLayout" name="gridLayout">
                <item row="0" column="0">
                 <widget class="QLineEdit" name="filterLineEdit"/>
                </item>
                <item row="1" column="0">
                 <widget class="QTreeView" name="treeView">
                  <property name="dragEnabled">
                   <bool>true</bool>
                  </property>
                  <property name="dragDropMode">
                   <enum>QAbstractItemView::DragOnly</enum>
                  </property>
                  <property name="selectionMode">
                   <enum>QAbstractItemView::ExtendedSelection</enum>
                  </property>
+                 <attribute name="headerVisible">
+                  <bool>false</bool>
+                 </attribute>
                 </widget>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

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