HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/QLop Commit - r14:0e9217f77498

Fixed bug ...

jeandet -

r14:0e9217f77498 default

parent child

Context file:

r14:0e9217f77498

src/Cassini/exptimetabledownloader.cpp created 644 +100 0

@@ -0,0 +1,100
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22
	23	#include "exptimetabledownloader.h"
	24	#include <QFile>
	25	#include <QString>
	26	#include <QStringList>
	27	#include <QDate>
	28	#include <QDateTime>
	29	#include <QDebug>
	30
	31	ExpTimeTableDownLoader::ExpTimeTableDownLoader(QObject *parent) : QObject(parent)
	32	{
	33
	34	}
	35
	36	ExpTimeTableDownLoader::~ExpTimeTableDownLoader()
	37	{
	38
	39	}
	40
	41	bool ExpTimeTableDownLoader::parseFile(const QString &fileName)
	42	{
	43	QFile file(fileName);
	44	if (!file.open(QIODevice::ReadOnly))
	45	return false;
	46	m_intervals.clear();
	47	while (!file.atEnd())
	48	{
	49	QString line = file.readLine();
	50	ExpXmlDownLoaderIntervals interval;
	51	line = line.trimmed();
	52	if(!line.contains("AMDA Search:") && (line[0]!='#') && (line.count()>0))
	53	{
	54	QStringList lineST = line.split(" ");
	55	interval.start = lineST.at(0);
	56	interval.stop = lineST.at(1);
	57	m_intervals.append(interval);
	58	}
	59	}
	60	makeDownloadList();
	61	return true;
	62	}
	63
	64	void ExpTimeTableDownLoader::addDaysToDownload(QList<QDate> days)
	65	{
	66	for(int i=0;i<days.count();i++)
	67	{
	68	if(!m_FilesToDownload.contains(days.at(i)))
	69	{
	70	m_FilesToDownload.append(days.at(i));
	71	}
	72	}
	73	}
	74
	75	const QList<QDate> &ExpTimeTableDownLoader::daysToDownload()
	76	{
	77	return m_FilesToDownload;
	78	}
	79
	80	void ExpTimeTableDownLoader::makeDownloadList()
	81	{
	82	for(int i=0;i<m_intervals.count();i++)
	83	{
	84	QList<QDate> daysToDl;
	85	QDateTime start,stop;
	86	start=start.fromString(m_intervals[i].start,Qt::ISODate);
	87	stop=stop.fromString(m_intervals[i].stop,Qt::ISODate);
	88	int days=start.daysTo(stop);
	89	daysToDl.append(start.date());
	90	if(days)
	91	{
	92	for(int j=0;j<days;j++)
	93	{
	94	daysToDl.append(start.addDays(j+1).date());
	95	}
	96	}
	97	addDaysToDownload(daysToDl);
	98	}
	99	qDebug()<<m_FilesToDownload.count();
	100	}

src/Cassini/exptimetabledownloader.h created 644 +47 0

@@ -0,0 +1,47
	1	/*------------------------------------------------------------------------------
	2	-- This file is a part of the QLop Software
	3	-- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
	4	--
	5	-- This program is free software; you can redistribute it and/or modify
	6	-- it under the terms of the GNU General Public License as published by
	7	-- the Free Software Foundation; either version 2 of the License, or
	8	-- (at your option) any later version.
	9	--
	10	-- This program is distributed in the hope that it will be useful,
	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	-- GNU General Public License for more details.
	14	--
	15	-- You should have received a copy of the GNU General Public License
	16	-- along with this program; if not, write to the Free Software
	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18	-------------------------------------------------------------------------------*/
	19	/*-- Author : Alexis Jeandet
	20	-- Mail : alexis.jeandet@member.fsf.org
	21	----------------------------------------------------------------------------*/
	22	#ifndef EXPTIMETABLEDOWNLOADER_H
	23	#define EXPTIMETABLEDOWNLOADER_H
	24
	25	#include <QObject>
	26	#include "expxmldownloader.h"
	27
	28	class ExpTimeTableDownLoader : public QObject
	29	{
	30	Q_OBJECT
	31	public:
	32	explicit ExpTimeTableDownLoader(QObject *parent = 0);
	33	~ExpTimeTableDownLoader();
	34	bool parseFile(const QString &fileName);
	35	const QList<QDate>& daysToDownload();
	36	signals:
	37
	38	public slots:
	39	private:
	40
	41	QList<ExpXmlDownLoaderIntervals> m_intervals;
	42	QList<QDate> m_FilesToDownload;
	43	void makeDownloadList();
	44	void addDaysToDownload(QList<QDate> days);
	45	};
	46
	47	#endif // EXPTIMETABLEDOWNLOADER_H

QLop.pro +6 -2

             QMAKE_CXXFLAGS += -O5 -fopenmp
             QMAKE_LFLAGS += -O5 -fopenmp
+            #QMAKE_CXXFLAGS += -O0 -fopenmp
+            #QMAKE_LFLAGS += -O0 -fopenmp
             SOURCES += src/main.cpp\
                     src/mainwindow.cpp \
                 src/Core/Widgets/qcustomplotvect.cpp \
                 src/Core/qlopdatabase.cpp \
                 src/Core/Widgets/qlopdatabaseviewer.cpp \
-                src/Core/Widgets/qlopdatabaseviewermodel.cpp
+                src/Core/Widgets/qlopdatabaseviewermodel.cpp \
+                src/Cassini/exptimetabledownloader.cpp
             HEADERS  += src/mainwindow.h \
                 src/SocExplorerPlot.h \
                 src/Core/Widgets/qcustomplotvect.h \
                 src/Core/qlopdatabase.h \
                 src/Core/Widgets/qlopdatabaseviewer.h \
-                src/Core/Widgets/qlopdatabaseviewermodel.h
+                src/Core/Widgets/qlopdatabaseviewermodel.h \
+                src/Cassini/exptimetabledownloader.h
             FORMS    += src/mainwindow.ui \
                 src/Core/Widgets/downloadhistory.ui \

linux/QLop.spec +6 -3

-            %global upstream_name qlop-0.1-1
+            %global upstream_name qlop-0.2-1
             Name:           qlop
-            Version:        0.1
+            Version:        0.2
             Release:        1%{?dist}
             Summary:        QLop is an interactive plotting software, this is an early development preview of what this software will be.
             Group:          Development/Tools
             Requires(post): qt5-pythonqt
             Requires(post): fftw
-            Provides:  qlop = 0.1-1
+            Provides:  qlop = 0.2-1
             %description
             QLop is an interactive plotting software, this is an early development preview of what this software will be.
             %changelog
+            * Wed Apr 29  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.2
+            - Update source to r14
             * Wed Apr 8  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.1
             - Initial Fedora packaging

src/Cassini/cassinidatadownloader.cpp +18 0

@@ -33,8 +33,10 CassiniDataDownloader::CassiniDataDownlo
33	{	33	{
34	ui->setupUi(this);	34	ui->setupUi(this);
35	m_xmlLoader = new ExpXmlDownLoader();	35	m_xmlLoader = new ExpXmlDownLoader();
		36	m_TTDownLoader = new ExpTimeTableDownLoader();
36	connect(this->ui->calendar,SIGNAL(activated(QDate)),this,SLOT(downloadData(QDate)));	37	connect(this->ui->calendar,SIGNAL(activated(QDate)),this,SLOT(downloadData(QDate)));
37	connect(this->ui->LoadXmlFileQpb,SIGNAL(clicked()),this,SLOT(loadXmlFile()));	38	connect(this->ui->LoadXmlFileQpb,SIGNAL(clicked()),this,SLOT(loadXmlFile()));
		39	connect(this->ui->LoadTimeTableQpb,SIGNAL(clicked()),this,SLOT(loadTimeTableFile()));
38	}	40	}
39		41
40	CassiniDataDownloader::~CassiniDataDownloader()	42	CassiniDataDownloader::~CassiniDataDownloader()
@@ -89,3 +91,19 void CassiniDataDownloader::loadXmlFile(
89	}	91	}
90	}	92	}
91	}	93	}
		94
		95	void CassiniDataDownloader::loadTimeTableFile()
		96	{
		97	QString file=QFileDialog::getOpenFileName();
		98	if(QFile::exists(file))
		99	{
		100	if(m_TTDownLoader->parseFile(file))
		101	{
		102	QList<QDate> daysToDl = m_TTDownLoader->daysToDownload();
		103	for(int i=0;i<daysToDl.count();i++)
		104	{
		105	downloadData(daysToDl.at(i));
		106	}
		107	}
		108	}
		109	}

src/Cassini/cassinidatadownloader.h +4 0

             #include <QWidget>
             #include <QDate>
             #include <expxmldownloader.h>
+            #include "exptimetabledownloader.h"
             namespace Ui {
             class CassiniDataDownloader;
                 explicit CassiniDataDownloader(QWidget *parent = 0);
                 ~CassiniDataDownloader();
+            public slots:
             protected:
                 void changeEvent(QEvent *e);
             private slots:
                 void downloadData(const QDate & date );
+                void loadTimeTableFile();
                 void loadXmlFile();
             private:
                 Ui::CassiniDataDownloader *ui;
                 ExpXmlDownLoader* m_xmlLoader;
+                ExpTimeTableDownLoader* m_TTDownLoader;
             };
             #endif // CASSINIDATADOWNLOADER_H

src/Cassini/cassinidatadownloader.ui +9 -2

                        </property>
                       </widget>
                      </item>
-                     <item row="1" column="0">
+                     <item row="2" column="0">
                       <widget class="QGroupBox" name="groupBox">
                        <property name="styleSheet">
                         <string notr="true">QGroupBox {
                        <layout class="QVBoxLayout" name="verticalLayout"/>
                       </widget>
                      </item>
-                     <item row="2" column="0">
+                     <item row="3" column="0">
                       <widget class="QPushButton" name="startDownloadQpb">
                        <property name="text">
                         <string>Start Download</string>
                        </property>
                       </widget>
                      </item>
+                     <item row="1" column="0">
+                      <widget class="QPushButton" name="LoadTimeTableQpb">
+                       <property name="text">
+                        <string>Load a Time Table</string>
+                       </property>
+                      </widget>
+                     </item>
                     </layout>
                    </widget>
                   </widget>

src/Cassini/cassinidatafile.cpp +5 -1

                     ch1V->unit="nT";
                     ch2V->unit="nT";
                     ch3V->unit="nT";
+                    ch1V->source=fileName;
+                    ch2V->source=fileName;
+                    ch3V->source=fileName;
                     data.append(ch1V);
                     data.append(ch2V);
                     data.append(ch3V);
                             {
                                 double key = ch1V->data->at(i).key;
                                 QDateTime date = QDateTime::fromMSecsSinceEpoch(key*1000);
-                                out << date.toString(Qt::ISODate)+QString(".%1").arg(date.time().msec(),3);
+                                out << date.toString(Qt::ISODate)+(QString(".%1").arg(date.time().msec(),3)).replace(" ","0");
                                 out << QString("%1%2%3").arg(ch1V->data->at(i).value, 11, 'f', 3).arg(ch2V->data->at(i).value, 11, 'f', 3).arg(ch3V->data->at(i).value, 11, 'f', 3);
                                 out << "\r\n";
                             }
                         delete ch1V;
                         delete ch2V;
                         delete ch3V;
+                        emit fileWritten();
                     }
                 }
             }

src/Cassini/cassinidatafile.h +1 0

               void saveFile(const QString& fileName,QLopDataList data);
               void run();
             signals:
+              void fileWritten();
             public slots:
             private :

src/Cassini/cassinitools.cpp +25 -1

             #include <QAction>
             #include <fftw3.h>
             #include <omp.h>
+            #include <qlopdatabase.h>
             CassiniTools* CassiniTools::_self=NULL;
             QDockWidget* CassiniTools::m_gui=NULL;
             int CassiniTools::m_fftPlot=-1;
             SocExplorerPlotActions* CassiniTools::ExportAction=NULL;
             Qt::GlobalColor QLopColours[]= {Qt::black,
                                             Qt::red,
                                             Qt::blue,
             {
                 m_dataFile = new CassiniDataFile();
                 connect(m_dataFile,SIGNAL(dataReady(QLopDataList)),this,SLOT(dataReady(QLopDataList)));
+                connect(m_dataFile,SIGNAL(fileWritten()),this,SLOT(fileWritten()));
                 m_serviceName="CassiniTools";
                 m_noGui=noGUI;
                 fftw_init_threads();
                             fftw_free(in);
                             for(int i=0;i<ch1V->data->count()/2;i++)
                             {
-            //                    (*FFTout->data)[i].value=sqrt((out[i][0] * out[i][0]) + (out[i][1] * out[i][1]))/ch1V->data->count();
+                                //                    (*FFTout->data)[i].value=sqrt((out[i][0] * out[i][0]) + (out[i][1] * out[i][1]))/ch1V->data->count();
                                 (*FFTout->data)[i].value=((out[i][0] * out[i][0]) + (out[i][1] * out[i][1]))/(ch1V->data->count());
                                 (*FFTout->data)[i].key = i;
                             }
             void CassiniTools::dataReady(QLopDataList data)
             {
+                static QLopDataList prevData=QLopDataList();
                 SocExplorerPlot* plot = QLopPlots::getPlot(m_defaultPlot);
                 if(plot==NULL)
                 {
                 }
                 if(plot)
                 {
+                    QLopDataBase::removeData(prevData);
                     plot->removeAllGraphs();
+                    //        QLopDataBase::re
                     for(int i=0;i<data.count();i++)
                     {
                         plot->addGraph();
                     }
                     plot->rescaleAxis();
                     plot->replot();
+                    prevData = data;
+                    QLopDataBase::addData(data);
                 }
             }
+            void CassiniTools::fileWritten()
+            {
+                SocExplorerPlot* plot = QLopPlots::getPlot(m_defaultPlot);
+                if(plot==NULL)
+                {
+                    makePlot();
+                    plot = QLopPlots::getPlot(m_defaultPlot);
+                }
+                if(plot)
+                {
+                    QString fileName = QString(plot->title()).replace(".TAB","-part");
+                    fileName = generateFileName(fileName,".TAB");
+                    ExportAction->setText("export view to "+fileName);
+                }
+            }

src/Cassini/cassinitools.h +1 0

             private slots:
                 static QString generateFileName(const QString& baseName,const QString& extension);
                 void dataReady(QLopDataList data);
+                void fileWritten();
             };
             #endif // CASSINITOOLS_H

src/Core/Widgets/qlopdatabaseviewer.cpp +2 0

                 ui->setupUi(this);
                 this->model = new QLopDataBaseViewerModel();
                 this->ui->dataBaseTbleView->setModel(model);
+                connect(QLopDataBase::self(),SIGNAL(DBChanged()),this->model,SLOT(DBChanged()));
             }
             QLopDataBaseViewer::~QLopDataBaseViewer()
                     break;
                 }
             }

src/Core/Widgets/qlopdatabaseviewer.ui +5 -1

               <widget class="QWidget" name="dockWidgetContents">
                <layout class="QGridLayout" name="gridLayout">
                 <item row="0" column="0">
-                 <widget class="QTableView" name="dataBaseTbleView"/>
+                 <widget class="QTableView" name="dataBaseTbleView">
+                  <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+                   <bool>false</bool>
+                  </attribute>
+                 </widget>
                 </item>
                </layout>
               </widget>

src/Core/Widgets/qlopdatabaseviewermodel.cpp +53 -4

@@ -19,7 +19,7 int QLopDataBaseViewerModel::rowCount(co
19		19
20	int QLopDataBaseViewerModel::columnCount(const QModelIndex &parent) const	20	int QLopDataBaseViewerModel::columnCount(const QModelIndex &parent) const
21	{	21	{
22	return 3;	22	return 5;
23	}	23	}
24		24
25	QVariant QLopDataBaseViewerModel::data(const QModelIndex &index, int role) const	25	QVariant QLopDataBaseViewerModel::data(const QModelIndex &index, int role) const
@@ -28,14 +28,63 QVariant QLopDataBaseViewerModel::data(c
28	return QVariant();	28	return QVariant();
29	QLopData* data=QLopDataBase::self()->getDataFromIdex(index.row());	29	QLopData* data=QLopDataBase::self()->getDataFromIdex(index.row());
30	if(data)	30	if(data)
31	return data->name;	31	{
		32	switch (index.column()) {
		33	case 0:
		34	return data->name;
		35	break;
		36	case 1:
		37	return data->source;
		38	break;
		39	case 2:
		40	return data->typeStr();
		41	break;
		42	case 3:
		43	return data->unit;
		44	break;
		45	case 4:
		46	return data->size();
		47	break;
		48	default:
		49	return data->name;
		50	break;
		51	}
		52	}
32	else QVariant();	53	else QVariant();
33	}	54	}
34		55
35	QVariant QLopDataBaseViewerModel::headerData(int section, Qt::Orientation orientation, int role) const	56	QVariant QLopDataBaseViewerModel::headerData(int section, Qt::Orientation orientation, int role) const
36	{	57	{
37	if (role == Qt::SizeHintRole)	58	//if (role == Qt::SizeHintRole)
38	return QSize(1, 1);	59	// return QSize(1, 1);
		60	if(orientation==Qt::Horizontal && role==Qt::DisplayRole)
		61	{
		62	switch (section) {
		63	case 0:
		64	return QVariant("Name");
		65	break;
		66	case 1:
		67	return QVariant("Source");
		68	break;
		69	case 2:
		70	return QVariant("Type");
		71	break;
		72	case 3:
		73	return QVariant("Unit");
		74	break;
		75	case 4:
		76	return QVariant("Size");
		77	break;
		78	default:
		79	break;
		80	}
		81	}
39	return QVariant();	82	return QVariant();
40	}	83	}
41		84
		85	void QLopDataBaseViewerModel::DBChanged()
		86	{
		87	beginResetModel();
		88	endResetModel();
		89	}
		90

src/Core/Widgets/qlopdatabaseviewermodel.h +3 0

             class QLopDataBaseViewerModel : public QAbstractTableModel
             {
+                Q_OBJECT
             public:
                 QLopDataBaseViewerModel(QObject *parent=0);
                 ~QLopDataBaseViewerModel();
                 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
                 QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+            public slots:
+                void DBChanged();
             private:
             };

src/Core/qlopdata.cpp +8 0

             ----------------------------------------------------------------------------*/
             #include "qlopdata.h"
+            QLopData::QLopDataTypeList_t QLopData::QLopDataTypeList[]=
+                {
+                    {Scalar,"Scalar"},
+                    {Vector,"Vector"},
+                    {Matrix,"Matrix"},
+                    {QCPDataVector,"QCPDataVector"},
+                    {None,"None"}
+                };
             QLopData::QLopData(QObject *parent) : QObject(parent)
             {

src/Core/qlopdata.h +23 -3

             typedef QList<dataVector> QListOfDataVector;
             class QLopData : public QObject
             {
                 Q_OBJECT
             public:
+            #define QLopDataTypeCnt 5
                 typedef enum QLopDataType
                 {
                     Scalar=0,
                     Matrix=2,
                     QCPDataVector=3,
                     None=-1,
+                }QLopDataType;
-                QLopDataType;
+                struct QLopDataTypeList_t
+                {
+                    QLopDataType type;
+                    const char* typeStr;
+                };
+                static struct QLopDataTypeList_t QLopDataTypeList[];
                 explicit QLopData(QObject *parent = 0);
                 ~QLopData();
                 QString name;
                 QString source;
                 QString unit;
+                QString typeStr()
+                {
+                    for(int i=0;i<QLopDataTypeCnt;i++)
+                    {
+                        if(QLopDataTypeList[i].type==this->type)
+                            return QLopDataTypeList[i].typeStr;
+                    }
+                    return "Unknow data type";
+                }
                 QLopDataType type;
                 int ID;
+                virtual int size(){return 0;}
             signals:
                 void dataChanged();
             public slots:
                 explicit QLopQCPDataVector(QObject *parent = 0);
                 ~QLopQCPDataVector();
                 QVector<QCPData>* data;
+                int size(){return data->length();}
             signals:
             public slots:
             private:
                 explicit QLopQVector(QObject *parent = 0);
                 ~QLopQVector();
                 QVector<double>* data;
+                int size(){return data->length();}
             signals:
             public slots:
             private:
             };
             typedef QList<QLopData*> QLopDataList;
             #endif // QLOPDATA_H

src/Core/qlopdatabase.cpp +51 -2

             #include "qlopdatabase.h"
+            #include <qlopdatabaseviewer.h>
             QList<QLopData*>* QLopDataBase::m_dataBase=NULL;
             QLopDataBase* QLopDataBase::_self=NULL;
+            QDockWidget* QLopDataBase::m_gui=NULL;
             #define INIT() \
                 if(Q_UNLIKELY(_self==NULL))\
                     init();\
                 }
-            QLopDataBase::QLopDataBase(QObject *parent) : QObject(parent)
+            QLopDataBase::QLopDataBase(bool noGUI,QObject *parent) : QLopService(parent)
             {
                 this->m_dataBase = new QList<QLopData*>();
+                m_serviceName="QLopDataBase";
+                m_noGui=noGUI;
             }
             QLopDataBase::~QLopDataBase()
             }
-            void QLopDataBase::init()
+            QDockWidget *QLopDataBase::getGUI()
+            {
+                if(!m_noGui && (m_gui==NULL))
+                {
+                    m_gui=new QLopDataBaseViewer();
+                    m_gui->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
+                }
+                return m_gui;
+            }
+            void QLopDataBase::init(bool noGUI, QObject *parent)
             {
                 _self=new QLopDataBase();
             }
+            const QString &QLopDataBase::serviceName()
+            {
+                INIT();
+                return m_serviceName;
+            }
             int QLopDataBase::addData(QLopData *data)
             {
                 INIT();
                 if(!m_dataBase->contains(data))
                 {
                     m_dataBase->append(data);
+                    emit QLopDataBase::self()->DBChanged();
                     return 1;
                 }
                 return 0;
                 {
                     addedData += addData(data.at(i));
                 }
+                emit QLopDataBase::self()->DBChanged();
                 return addedData;
             }
+            int QLopDataBase::removeData(QLopData *data)
+            {
+                INIT();
+                if(m_dataBase->contains(data))
+                {
+                    m_dataBase->removeAll(data);
+                    emit QLopDataBase::self()->DBChanged();
+                    return 1;
+                }
+                return 0;
+            }
+            int QLopDataBase::removeData(const QLopDataList &data)
+            {
+                INIT();
+                int removedData=0;
+                for (int i = 0; i < data.count(); i++)
+                {
+                    removedData += removeData(data.at(i));
+                }
+                emit QLopDataBase::self()->DBChanged();
+                return removedData;
+            }
             QLopDataBase *QLopDataBase::self()
             {
                 INIT();
             int QLopDataBase::count()
             {
+                INIT();
                 return m_dataBase->count();
             }
             QLopData *QLopDataBase::getData(const QString &name)
             {
+                INIT();
                 for (int i = 0; i < m_dataBase->count(); i++)
                 {
                     if(Q_UNLIKELY(m_dataBase->at(i)->name==name))
             QLopData *QLopDataBase::getData(int ID)
             {
+                INIT();
                 for (int i = 0; i < m_dataBase->count(); i++)
                 {
                     if(Q_UNLIKELY(m_dataBase->at(i)->ID==ID))

src/Core/qlopdatabase.h +12 -4

             #include <QObject>
             #include <qlopdata.h>
             #include <QList>
+            #include <qlopservice.h>
-            class QLopDataBase : public QObject
+            class QLopDataBaseViewer;
+            class QLopDataBase : public QLopService
             {
                 Q_OBJECT
-                explicit QLopDataBase(QObject *parent = 0);
+                static QDockWidget* m_gui;
+                QLopDataBase(bool noGUI=false,QObject *parent = 0);
                 ~QLopDataBase();
                 static QLopDataBase* _self;
             public:
-                static void init();
+                QDockWidget* getGUI();
+                static void init(bool noGUI=false,QObject *parent = 0);
+                const QString& serviceName();
                 static int addData(QLopData* data);
                 static int addData(const QLopDataList &data);
+                static int removeData(QLopData* data);
+                static int removeData(const QLopDataList &data);
                 static QLopDataBase* self();
                 static int count();
                 static QLopData* getData(const QString& name);
                 static QLopData* getData(int ID);
                 QLopData* getDataFromIdex(int index);
             signals:
+                void DBChanged();
             public slots:
             private:
                 static QList<QLopData*>* m_dataBase;

src/mainwindow.cpp +2 0

             #include <filedownloader.h>
             #include <cassinitools.h>
             #include <qlopplots.h>
+            #include <qlopdatabase.h>
             const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
+                    <<QLopDataBase::self()
                     <<FileDownloader::self()
                    <<CassiniTools::self()
                   << QLopPlots::self();

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