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

             #-------------------------------------------------
             #
             # Project created by QtCreator 2015-01-07T02:41:29
             #
             #-------------------------------------------------
             QT       += core gui network xml svg
             CONFIG   += pythonqt
             greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
             MOC_DIR = moc
             UI_DIR = ui
             OBJECTS_DIR = obj
             DESTDIR =./bin
             TARGET = QLop
             TEMPLATE = app
             LIBS+=-lfftw3_threads -lfftw3
             INCLUDEPATH += src/QCustomPlot \
                             src src/Cassini \
                             src/Core src/Core/Widgets \
                             src/Core/Widgets/PyWdgt
             QMAKE_CXXFLAGS += -O5 -fopenmp
             QMAKE_LFLAGS += -O5 -fopenmp
+            #QMAKE_CXXFLAGS += -O0 -fopenmp
+            #QMAKE_LFLAGS += -O0 -fopenmp
             SOURCES += src/main.cpp\
                     src/mainwindow.cpp \
                 src/SocExplorerPlot.cpp \
                 src/QCustomPlot/qcustomplot.cpp \
                 src/toolbarcontainer.cpp \
                 src/Core/abstractfileloader.cpp \
                 src/Core/filedownloader.cpp \
                 src/Core/filedownloadertask.cpp \
                 src/Core/Widgets/downloadhistory.cpp \
                 src/Core/Widgets/downloadhistoryelement.cpp \
                 src/Core/qlopservice.cpp \
                 src/Cassini/expxmldownloader.cpp \
                 src/Cassini/cassinidatadownloader.cpp \
                 src/Cassini/cassinidatafile.cpp \
                 src/Cassini/cassiniindexfile.cpp \
                 src/Cassini/cassiniindexfileviewer.cpp \
                 src/Cassini/cassinitools.cpp \
                 src/Cassini/cassinitoolsgui.cpp \
                 src/Core/Widgets/qlopplots.cpp \
                 src/Core/qlopdata.cpp \
                 src/Core/Widgets/PyWdgt/pythonconsole.cpp \
                 src/Core/Widgets/PyWdgt/pythonqtscriptingconsoledandd.cpp \
                 src/QCustomPlot/qcpdocumentobject.cpp \
                 src/Core/Widgets/filebrowser.cpp \
                 src/Core/Widgets/filesystemmodel.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/QCustomPlot/qcustomplot.h \
                 src/toolbarcontainer.h \
                 src/Core/abstractfileloader.h \
                 src/Core/filedownloader.h \
                 src/Core/filedownloadertask.h \
                 src/Core/Widgets/downloadhistory.h \
                 src/Core/Widgets/downloadhistoryelement.h \
                 src/Core/qlopservice.h \
                 src/Cassini/expxmldownloader.h \
                 src/Cassini/cassinidatadownloader.h \
                 src/Cassini/cassinidatafile.h \
                 src/Cassini/cassiniindexfile.h \
                 src/Cassini/cassiniindexfileviewer.h \
                 src/Cassini/cassinitools.h \
                 src/Cassini/cassinitoolsgui.h \
                 src/Core/Widgets/qlopplots.h \
                 src/Core/qlopdata.h \
                 src/Core/Widgets/PyWdgt/pythonconsole.h \
                 src/Core/Widgets/PyWdgt/pythonqtscriptingconsoledandd.h \
                 src/Core/qlop.h \
                 src/Core/pyqlop.h \
                 src/QCustomPlot/qcpdocumentobject.h \
                 src/Core/Widgets/filebrowser.h \
                 src/Core/Widgets/filesystemmodel.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 \
                 src/Core/Widgets/downloadhistoryelement.ui \
                 src/Cassini/cassinidatadownloader.ui \
                 src/Cassini/cassiniindexfileviewer.ui \
                 src/Cassini/cassinitoolsgui.ui \
                 src/Core/Widgets/filebrowser.ui \
                 src/Core/Widgets/qlopdatabaseviewer.ui
             RESOURCES += \
                 resources/qlop.qrc
             include(src/Core/Widgets/NicePyConsole/NicePyConsole.pri)
             include(src/Core/pythonQtOut/generated_cpp/PyQLop/PyQLop.pri)
             win32 {
                 DEFINES += WIN32
             }
             unix {
                 DEFINES += UNIX
             }
             unix{
                 target.path    = /usr/bin
                 INSTALLS += target
             }
             unix{
                 QLopLauncher.path = /usr/share/applications/
                 QLopLauncher.files = linux/QLop.desktop
                 QLopAppData.path = /usr/share/appdata/
                 QLopAppData.files = linux/QLop.appdata.xml
                 share.path = /usr/share/QLop
                 share.files = resources/QLop.svg \
                             resources/QLop.png
                 INSTALLS+= QLopLauncher share QLopAppData
             }
             DISTFILES += \
                 src/Core/pythongenerator.sh \
                 src/Core/pythonQtgeneratorCfg.txt \
                 linux/QLop.spec \
                 linux/QLop.desktop \
                 linux/QLop.appdata.xml

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
             License:        GPLv2+
             URL:            https://hephaistos.lpp.polytechnique.fr/redmine/projects/qlop
             Source0:        https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/376/%{upstream_name}.zip
             BuildRequires:  python2-devel
             BuildRequires:  qt5-qtbase-devel
             BuildRequires:  qt5-qtwebkit-devel
             BuildRequires:  qt5-qttools-static
             BuildRequires:  qt5-qttools-devel
             BuildRequires:  qt5-qtsvg-devel
             BuildRequires:  qt5-qtxmlpatterns-devel
             BuildRequires:  qt5-qtmultimedia-devel
             BuildRequires:  qt5-pythonqt-devel
             BuildRequires:  appdata-tools
             BuildRequires:  desktop-file-utils
             BuildRequires:  fftw-devel
             Requires(post): python2
             Requires(post): qt5-qtbase
             Requires(post): qt5-qtwebkit
             Requires(post): qt5-qtsvg
             Requires(post): qt5-qtxmlpatterns
             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.
             %prep
             %setup -q -n %{upstream_name}
             %build
             %{_qt5_qmake}
             make %{?_smp_mflags}
             %install
             make install INSTALL_ROOT=%{buildroot}
             #appdata-validate --nonet %{buildroot}/%{_datadir}/appdata/QLop.appdata.xml
             #desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/QLop.desktop
             %post -p /sbin/ldconfig
             %postun -p /sbin/ldconfig
             %files
             /etc/QLop/python/PygmentsHighlighter.py
             /etc/QLop/python/PygmentsHighlighter.pyc
             /etc/QLop/python/PygmentsHighlighter.pyo
             /etc/QLop/python/PythonCompleter.py
             /etc/QLop/python/PythonCompleter.pyc
             /etc/QLop/python/PythonCompleter.pyo
             /etc/QLop/python/module_completion.py
             /etc/QLop/python/module_completion.pyc
             /etc/QLop/python/module_completion.pyo
             /etc/QLop/python/pygments/__init__.py
             /etc/QLop/python/pygments/__init__.pyc
             /etc/QLop/python/pygments/__init__.pyo
             /etc/QLop/python/pygments/cmdline.py
             /etc/QLop/python/pygments/cmdline.pyc
             /etc/QLop/python/pygments/cmdline.pyo
             /etc/QLop/python/pygments/console.py
             /etc/QLop/python/pygments/console.pyc
             /etc/QLop/python/pygments/console.pyo
             /etc/QLop/python/pygments/filter.py
             /etc/QLop/python/pygments/filter.pyc
             /etc/QLop/python/pygments/filter.pyo
             /etc/QLop/python/pygments/filters/__init__.py
             /etc/QLop/python/pygments/filters/__init__.pyc
             /etc/QLop/python/pygments/filters/__init__.pyo
             /etc/QLop/python/pygments/formatter.py
             /etc/QLop/python/pygments/formatter.pyc
             /etc/QLop/python/pygments/formatter.pyo
             /etc/QLop/python/pygments/formatters/__init__.py
             /etc/QLop/python/pygments/formatters/__init__.pyc
             /etc/QLop/python/pygments/formatters/__init__.pyo
             /etc/QLop/python/pygments/formatters/_mapping.py
             /etc/QLop/python/pygments/formatters/_mapping.pyc
             /etc/QLop/python/pygments/formatters/_mapping.pyo
             /etc/QLop/python/pygments/formatters/bbcode.py
             /etc/QLop/python/pygments/formatters/bbcode.pyc
             /etc/QLop/python/pygments/formatters/bbcode.pyo
             /etc/QLop/python/pygments/formatters/html.py
             /etc/QLop/python/pygments/formatters/html.pyc
             /etc/QLop/python/pygments/formatters/html.pyo
             /etc/QLop/python/pygments/formatters/img.py
             /etc/QLop/python/pygments/formatters/img.pyc
             /etc/QLop/python/pygments/formatters/img.pyo
             /etc/QLop/python/pygments/formatters/latex.py
             /etc/QLop/python/pygments/formatters/latex.pyc
             /etc/QLop/python/pygments/formatters/latex.pyo
             /etc/QLop/python/pygments/formatters/other.py
             /etc/QLop/python/pygments/formatters/other.pyc
             /etc/QLop/python/pygments/formatters/other.pyo
             /etc/QLop/python/pygments/formatters/rtf.py
             /etc/QLop/python/pygments/formatters/rtf.pyc
             /etc/QLop/python/pygments/formatters/rtf.pyo
             /etc/QLop/python/pygments/formatters/svg.py
             /etc/QLop/python/pygments/formatters/svg.pyc
             /etc/QLop/python/pygments/formatters/svg.pyo
             /etc/QLop/python/pygments/formatters/terminal.py
             /etc/QLop/python/pygments/formatters/terminal.pyc
             /etc/QLop/python/pygments/formatters/terminal.pyo
             /etc/QLop/python/pygments/formatters/terminal256.py
             /etc/QLop/python/pygments/formatters/terminal256.pyc
             /etc/QLop/python/pygments/formatters/terminal256.pyo
             /etc/QLop/python/pygments/lexer.py
             /etc/QLop/python/pygments/lexer.pyc
             /etc/QLop/python/pygments/lexer.pyo
             /etc/QLop/python/pygments/lexers/__init__.py
             /etc/QLop/python/pygments/lexers/__init__.pyc
             /etc/QLop/python/pygments/lexers/__init__.pyo
             /etc/QLop/python/pygments/lexers/_asybuiltins.py
             /etc/QLop/python/pygments/lexers/_asybuiltins.pyc
             /etc/QLop/python/pygments/lexers/_asybuiltins.pyo
             /etc/QLop/python/pygments/lexers/_clbuiltins.py
             /etc/QLop/python/pygments/lexers/_clbuiltins.pyc
             /etc/QLop/python/pygments/lexers/_clbuiltins.pyo
             /etc/QLop/python/pygments/lexers/_luabuiltins.py
             /etc/QLop/python/pygments/lexers/_luabuiltins.pyc
             /etc/QLop/python/pygments/lexers/_luabuiltins.pyo
             /etc/QLop/python/pygments/lexers/_mapping.py
             /etc/QLop/python/pygments/lexers/_mapping.pyc
             /etc/QLop/python/pygments/lexers/_mapping.pyo
             /etc/QLop/python/pygments/lexers/_phpbuiltins.py
             /etc/QLop/python/pygments/lexers/_phpbuiltins.pyc
             /etc/QLop/python/pygments/lexers/_phpbuiltins.pyo
             /etc/QLop/python/pygments/lexers/_postgres_builtins.py
             /etc/QLop/python/pygments/lexers/_postgres_builtins.pyc
             /etc/QLop/python/pygments/lexers/_postgres_builtins.pyo
             /etc/QLop/python/pygments/lexers/_scilab_builtins.py
             /etc/QLop/python/pygments/lexers/_scilab_builtins.pyc
             /etc/QLop/python/pygments/lexers/_scilab_builtins.pyo
             /etc/QLop/python/pygments/lexers/_vimbuiltins.py
             /etc/QLop/python/pygments/lexers/_vimbuiltins.pyc
             /etc/QLop/python/pygments/lexers/_vimbuiltins.pyo
             /etc/QLop/python/pygments/lexers/agile.py
             /etc/QLop/python/pygments/lexers/agile.pyc
             /etc/QLop/python/pygments/lexers/agile.pyo
             /etc/QLop/python/pygments/lexers/asm.py
             /etc/QLop/python/pygments/lexers/asm.pyc
             /etc/QLop/python/pygments/lexers/asm.pyo
             /etc/QLop/python/pygments/lexers/compiled.py
             /etc/QLop/python/pygments/lexers/compiled.pyc
             /etc/QLop/python/pygments/lexers/compiled.pyo
             /etc/QLop/python/pygments/lexers/dotnet.py
             /etc/QLop/python/pygments/lexers/dotnet.pyc
             /etc/QLop/python/pygments/lexers/dotnet.pyo
             /etc/QLop/python/pygments/lexers/functional.py
             /etc/QLop/python/pygments/lexers/functional.pyc
             /etc/QLop/python/pygments/lexers/functional.pyo
             /etc/QLop/python/pygments/lexers/hdl.py
             /etc/QLop/python/pygments/lexers/hdl.pyc
             /etc/QLop/python/pygments/lexers/hdl.pyo
             /etc/QLop/python/pygments/lexers/jvm.py
             /etc/QLop/python/pygments/lexers/jvm.pyc
             /etc/QLop/python/pygments/lexers/jvm.pyo
             /etc/QLop/python/pygments/lexers/math.py
             /etc/QLop/python/pygments/lexers/math.pyc
             /etc/QLop/python/pygments/lexers/math.pyo
             /etc/QLop/python/pygments/lexers/other.py
             /etc/QLop/python/pygments/lexers/other.pyc
             /etc/QLop/python/pygments/lexers/other.pyo
             /etc/QLop/python/pygments/lexers/parsers.py
             /etc/QLop/python/pygments/lexers/parsers.pyc
             /etc/QLop/python/pygments/lexers/parsers.pyo
             /etc/QLop/python/pygments/lexers/shell.py
             /etc/QLop/python/pygments/lexers/shell.pyc
             /etc/QLop/python/pygments/lexers/shell.pyo
             /etc/QLop/python/pygments/lexers/special.py
             /etc/QLop/python/pygments/lexers/special.pyc
             /etc/QLop/python/pygments/lexers/special.pyo
             /etc/QLop/python/pygments/lexers/sql.py
             /etc/QLop/python/pygments/lexers/sql.pyc
             /etc/QLop/python/pygments/lexers/sql.pyo
             /etc/QLop/python/pygments/lexers/templates.py
             /etc/QLop/python/pygments/lexers/templates.pyc
             /etc/QLop/python/pygments/lexers/templates.pyo
             /etc/QLop/python/pygments/lexers/text.py
             /etc/QLop/python/pygments/lexers/text.pyc
             /etc/QLop/python/pygments/lexers/text.pyo
             /etc/QLop/python/pygments/lexers/web.py
             /etc/QLop/python/pygments/lexers/web.pyc
             /etc/QLop/python/pygments/lexers/web.pyo
             /etc/QLop/python/pygments/plugin.py
             /etc/QLop/python/pygments/plugin.pyc
             /etc/QLop/python/pygments/plugin.pyo
             /etc/QLop/python/pygments/scanner.py
             /etc/QLop/python/pygments/scanner.pyc
             /etc/QLop/python/pygments/scanner.pyo
             /etc/QLop/python/pygments/style.py
             /etc/QLop/python/pygments/style.pyc
             /etc/QLop/python/pygments/style.pyo
             /etc/QLop/python/pygments/styles/__init__.py
             /etc/QLop/python/pygments/styles/__init__.pyc
             /etc/QLop/python/pygments/styles/__init__.pyo
             /etc/QLop/python/pygments/styles/autumn.py
             /etc/QLop/python/pygments/styles/autumn.pyc
             /etc/QLop/python/pygments/styles/autumn.pyo
             /etc/QLop/python/pygments/styles/borland.py
             /etc/QLop/python/pygments/styles/borland.pyc
             /etc/QLop/python/pygments/styles/borland.pyo
             /etc/QLop/python/pygments/styles/bw.py
             /etc/QLop/python/pygments/styles/bw.pyc
             /etc/QLop/python/pygments/styles/bw.pyo
             /etc/QLop/python/pygments/styles/colorful.py
             /etc/QLop/python/pygments/styles/colorful.pyc
             /etc/QLop/python/pygments/styles/colorful.pyo
             /etc/QLop/python/pygments/styles/default.py
             /etc/QLop/python/pygments/styles/default.pyc
             /etc/QLop/python/pygments/styles/default.pyo
             /etc/QLop/python/pygments/styles/emacs.py
             /etc/QLop/python/pygments/styles/emacs.pyc
             /etc/QLop/python/pygments/styles/emacs.pyo
             /etc/QLop/python/pygments/styles/friendly.py
             /etc/QLop/python/pygments/styles/friendly.pyc
             /etc/QLop/python/pygments/styles/friendly.pyo
             /etc/QLop/python/pygments/styles/fruity.py
             /etc/QLop/python/pygments/styles/fruity.pyc
             /etc/QLop/python/pygments/styles/fruity.pyo
             /etc/QLop/python/pygments/styles/manni.py
             /etc/QLop/python/pygments/styles/manni.pyc
             /etc/QLop/python/pygments/styles/manni.pyo
             /etc/QLop/python/pygments/styles/monokai.py
             /etc/QLop/python/pygments/styles/monokai.pyc
             /etc/QLop/python/pygments/styles/monokai.pyo
             /etc/QLop/python/pygments/styles/murphy.py
             /etc/QLop/python/pygments/styles/murphy.pyc
             /etc/QLop/python/pygments/styles/murphy.pyo
             /etc/QLop/python/pygments/styles/native.py
             /etc/QLop/python/pygments/styles/native.pyc
             /etc/QLop/python/pygments/styles/native.pyo
             /etc/QLop/python/pygments/styles/pastie.py
             /etc/QLop/python/pygments/styles/pastie.pyc
             /etc/QLop/python/pygments/styles/pastie.pyo
             /etc/QLop/python/pygments/styles/perldoc.py
             /etc/QLop/python/pygments/styles/perldoc.pyc
             /etc/QLop/python/pygments/styles/perldoc.pyo
             /etc/QLop/python/pygments/styles/rrt.py
             /etc/QLop/python/pygments/styles/rrt.pyc
             /etc/QLop/python/pygments/styles/rrt.pyo
             /etc/QLop/python/pygments/styles/tango.py
             /etc/QLop/python/pygments/styles/tango.pyc
             /etc/QLop/python/pygments/styles/tango.pyo
             /etc/QLop/python/pygments/styles/trac.py
             /etc/QLop/python/pygments/styles/trac.pyc
             /etc/QLop/python/pygments/styles/trac.pyo
             /etc/QLop/python/pygments/styles/vim.py
             /etc/QLop/python/pygments/styles/vim.pyc
             /etc/QLop/python/pygments/styles/vim.pyo
             /etc/QLop/python/pygments/styles/vs.py
             /etc/QLop/python/pygments/styles/vs.pyc
             /etc/QLop/python/pygments/styles/vs.pyo
             /etc/QLop/python/pygments/token.py
             /etc/QLop/python/pygments/token.pyc
             /etc/QLop/python/pygments/token.pyo
             /etc/QLop/python/pygments/unistring.py
             /etc/QLop/python/pygments/unistring.pyc
             /etc/QLop/python/pygments/unistring.pyo
             /etc/QLop/python/pygments/util.py
             /etc/QLop/python/pygments/util.pyc
             /etc/QLop/python/pygments/util.pyo
             /usr/bin/QLop
             /usr/share/QLop/QLop.png
             /usr/share/QLop/QLop.svg
             /usr/share/appdata/QLop.appdata.xml
             /usr/share/applications/QLop.desktop
             %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
             * Fri Apr 3  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.1
             - Initial Fedora packaging

src/Cassini/cassinidatadownloader.cpp +18 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "cassinidatadownloader.h"
             #include "ui_cassinidatadownloader.h"
             #include <filedownloader.h>
             #include <QDir>
             #include <QFileDialog>
             #include <QFile>
             CassiniDataDownloader::CassiniDataDownloader(QWidget *parent) :
                 QWidget(parent),
                 ui(new Ui::CassiniDataDownloader)
             {
                 ui->setupUi(this);
                 m_xmlLoader = new ExpXmlDownLoader();
+                m_TTDownLoader = new ExpTimeTableDownLoader();
                 connect(this->ui->calendar,SIGNAL(activated(QDate)),this,SLOT(downloadData(QDate)));
                 connect(this->ui->LoadXmlFileQpb,SIGNAL(clicked()),this,SLOT(loadXmlFile()));
+                connect(this->ui->LoadTimeTableQpb,SIGNAL(clicked()),this,SLOT(loadTimeTableFile()));
             }
             CassiniDataDownloader::~CassiniDataDownloader()
             {
                 delete ui;
                 delete m_xmlLoader;
             }
             void CassiniDataDownloader::changeEvent(QEvent *e)
             {
                 QWidget::changeEvent(e);
                 switch (e->type()) {
                 case QEvent::LanguageChange:
                     ui->retranslateUi(this);
                     break;
                 default:
                     break;
                 }
             }
             void CassiniDataDownloader::downloadData(const QDate &date)
             {
                 QDate tmpDate;
                 QStringList months=QStringList()<< "JAN" << "FEB" << "MAR" << "APR" << "MAY" << "JUN" << "JUI" << "AUG" << "SEP" << "OCT" << "NOV" << "DEC";
                 tmpDate.setDate(date.year(),date.month(),1);
                 int firstDayOfMonth=tmpDate.dayOfYear();
                 tmpDate.setDate(tmpDate.year(),tmpDate.month(),tmpDate.daysInMonth());
                 int lastDayOfMonth=tmpDate.dayOfYear();
                 QString link="http://ppi.pds.nasa.gov/ditdos/download?id=pds://PPI/CO-E_SW_J_S-MAG-3-RDR-FULL-RES-V1.0/DATA/" \
                     + QString("%1").arg(date.year()) +"/" + QString("%1_%2_").arg(firstDayOfMonth,3).arg(lastDayOfMonth,3).replace(' ','0') \
                     + months.at(date.month()-1) + "/" ;
                 qDebug()<<link;
                 QString dataFileName= QString("%1%2").arg(date.year()-2000,2).arg(date.dayOfYear(),3).replace(' ','0') + "_FGM_KRTP.TAB";
                 QString headerFileName= QString("%1%2").arg(date.year()-2000,2).arg(date.dayOfYear(),3).replace(' ','0') + "_FGM_KRTP.LBL";
             //    "_FGM_KRTP.TAB"
                 FileDownloader::downloadFile(link+dataFileName,QDir::homePath() +"/Téléchargements/"+dataFileName);
                 FileDownloader::downloadFile(link+headerFileName,QDir::homePath() +"/Téléchargements/"+headerFileName);
             }
             void CassiniDataDownloader::loadXmlFile()
             {
                 QString file=QFileDialog::getOpenFileName();
                 if(QFile::exists(file))
                 {
                     if(m_xmlLoader->parseXml(file))
                     {
                         QList<QDate> daysToDl = m_xmlLoader->daysToDownload();
                         for(int i=0;i<daysToDl.count();i++)
                         {
                             downloadData(daysToDl.at(i));
                         }
                     }
                 }
             }
+            void CassiniDataDownloader::loadTimeTableFile()
+            {
+                QString file=QFileDialog::getOpenFileName();
+                if(QFile::exists(file))
+                {
+                    if(m_TTDownLoader->parseFile(file))
+                    {
+                        QList<QDate> daysToDl = m_TTDownLoader->daysToDownload();
+                        for(int i=0;i<daysToDl.count();i++)
+                        {
+                            downloadData(daysToDl.at(i));
+                        }
+                    }
+                }
+            }

src/Cassini/cassinidatadownloader.h +4 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef CASSINIDATADOWNLOADER_H
             #define CASSINIDATADOWNLOADER_H
             #include <QWidget>
             #include <QDate>
             #include <expxmldownloader.h>
+            #include "exptimetabledownloader.h"
             namespace Ui {
             class CassiniDataDownloader;
             }
             class CassiniDataDownloader : public QWidget
             {
                 Q_OBJECT
             public:
                 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

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>CassiniDataDownloader</class>
              <widget class="QWidget" name="CassiniDataDownloader">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>1032</width>
                 <height>648</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QGridLayout" name="gridLayout_2">
                <item row="0" column="0">
                 <layout class="QGridLayout" name="gridLayout_3">
                  <item row="0" column="0">
                   <widget class="QCalendarWidget" name="calendar">
                    <property name="acceptDrops">
                     <bool>true</bool>
                    </property>
                    <property name="gridVisible">
                     <bool>false</bool>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="1">
                   <widget class="QScrollArea" name="DownloadList">
                    <property name="widgetResizable">
                     <bool>true</bool>
                    </property>
                    <widget class="QWidget" name="Content">
                     <property name="geometry">
                      <rect>
                       <x>0</x>
                       <y>0</y>
                       <width>501</width>
                       <height>626</height>
                      </rect>
                     </property>
                     <layout class="QGridLayout" name="gridLayout">
                      <item row="0" column="0">
                       <widget class="QPushButton" name="LoadXmlFileQpb">
                        <property name="sizePolicy">
                         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                          <horstretch>0</horstretch>
                          <verstretch>0</verstretch>
                         </sizepolicy>
                        </property>
                        <property name="text">
                         <string>Load Xml File</string>
                        </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 {
                 border: 1px solid gray;
                 border-radius: 9px;
                 margin-top: 0.5em;
             }
             QGroupBox::title {
                 subcontrol-origin: margin;
                 left: 10px;
                 padding: 0 3px 0 3px;
             }
             </string>
                        </property>
                        <property name="title">
                         <string>Download list</string>
                        </property>
                        <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>
                  </item>
                 </layout>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

src/Cassini/cassinidatafile.cpp +5 -1

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "cassinidatafile.h"
             #include <QFile>
             #include <stdio.h>
             #include <QDateTime>
             #include <QVector>
             #include <QProgressDialog>
             #include <omp.h>
             #include <QTimer>
             #include <QElapsedTimer>
             #include <sys/time.h>
             CassiniDataFile::CassiniDataFile(QObject *parent) : AbstractFileLoader(parent)
             {
             }
             CassiniDataFile::~CassiniDataFile()
             {
             }
             void CassiniDataFile::parseFile(const QString &fileName)
             {
                 this->fileName = fileName;
                 m_Write = false;
                 this->start();
             }
             void CassiniDataFile::saveFile(const QString &fileName, QLopDataList data)
             {
                 this->fileName = fileName;
                 m_Write = true;
                 m_data = data;
                 this->start();
             }
             inline double __decodeVal(int ofset,unsigned char* data)
             {
                 if(data[ofset]=='-')
                     return  -0.001 * (double)(
                                 (10000 * (int)(data[ofset+1] & 0x0F))
                             + (1000 *  (int)(data[ofset+2] & 0x0F))
                             + (100 *   (int)(data[ofset+4] & 0x0F))
                             + (10 *    (int)(data[ofset+5] & 0x0F))
                             + (        (int)(data[ofset+6] & 0x0F))
                             );
                 else
                 {
                     if(data[ofset+1]=='-')
                     {
                         return  -0.001 * (double)(
                                     (1000 * (int)(data[ofset+2] & 0x0F))
                                 + (100 *  (int)(data[ofset+4] & 0x0F))
                                 + (10 *   (int)(data[ofset+5] & 0x0F))
                                 + (       (int)(data[ofset+6] & 0x0F))
                                 );
                     }
                     else
                     {
                         return 0.001 * (double)(
                                     (10000 * (int)(data[ofset+1] & 0x0F))
                                 + (1000 *  (int)(data[ofset+2] & 0x0F))
                                 + (100 *   (int)(data[ofset+4] & 0x0F))
                                 + (10 *    (int)(data[ofset+5] & 0x0F))
                                 + (        (int)(data[ofset+6] & 0x0F))
                                 );
                     }
                 }
             }
             inline QDate __decodeDate(int ofset,unsigned char* data)
             {
                 int y=(1000*(data[ofset] & 0x0F)) + (100*(data[ofset+1] & 0x0F)) + (10*(data[ofset+2] & 0x0F)) + (1*(data[ofset+3] & 0x0F));
                 int m=(10*(data[ofset+5] & 0x0F)) + (1*(data[ofset+6] & 0x0F));
                 int d=(10*(data[ofset+8] & 0x0F)) + (1*(data[ofset+9] & 0x0F));
                 return QDate(y,m,d);
             }
             inline QTime __decodeTime(int ofset,unsigned char* data)
             {
                 int h=(10*(data[ofset] & 0x0F)) + (1*(data[ofset+1] & 0x0F));
                 int m=(10*(data[ofset+3] & 0x0F)) + (1*(data[ofset+4] & 0x0F));
                 int s=(10*(data[ofset+6] & 0x0F)) + (1*(data[ofset+7] & 0x0F));
                 int ms=(100*(data[ofset+9] & 0x0F)) + (10*(data[ofset+10] & 0x0F)) + (1*(data[ofset+11] & 0x0F));
                 return QTime(h,m,s,ms);
             }
             double __decodeTimeFromEpochMs(int ofset,unsigned char* data)
             {
                 struct tm t;
                 time_t t_of_day;
                 t.tm_year=(1000*(data[ofset] & 0x0F)) + (100*(data[ofset+1] & 0x0F)) + (10*(data[ofset+2] & 0x0F)) + ((data[ofset+3] & 0x0F)) -1900;
                 t.tm_mon=(10*(data[ofset+5] & 0x0F)) + ((data[ofset+6] & 0x0F));
                 t.tm_mday=(10*(data[ofset+8] & 0x0F)) + ((data[ofset+9] & 0x0F));
                 t.tm_hour=(10*(data[ofset+11] & 0x0F)) + ((data[ofset+12] & 0x0F));
                 t.tm_min=(10*(data[ofset+14] & 0x0F)) + ((data[ofset+15] & 0x0F));
                 t.tm_sec=(10*(data[ofset+17] & 0x0F)) + ((data[ofset+18] & 0x0F));
                 int ms=(100*(data[ofset+20] & 0x0F)) + (10*(data[ofset+21] & 0x0F)) + ((data[ofset+22] & 0x0F));
                 t_of_day = mktime(&t);
                 return (t_of_day*1000.0)+ms;
             }
             double __decodeTimeFromEpoch(int ofset,unsigned char* data)
             {
                 struct tm t;
                 time_t t_of_day;
                 t.tm_year=(1000*(data[ofset] & 0x0F)) + (100*(data[ofset+1] & 0x0F)) + (10*(data[ofset+2] & 0x0F)) + ((data[ofset+3] & 0x0F)) -1900;
                 t.tm_mon=(10*(data[ofset+5] & 0x0F)) + ((data[ofset+6] & 0x0F));
                 t.tm_mday=(10*(data[ofset+8] & 0x0F)) + ((data[ofset+9] & 0x0F));
                 t.tm_hour=(10*(data[ofset+11] & 0x0F)) + ((data[ofset+12] & 0x0F));
                 t.tm_min=(10*(data[ofset+14] & 0x0F)) + ((data[ofset+15] & 0x0F));
                 t.tm_sec=(10*(data[ofset+17] & 0x0F)) + ((data[ofset+18] & 0x0F));
                 double ms=(100*(data[ofset+20] & 0x0F)) + (10*(data[ofset+21] & 0x0F)) + ((data[ofset+22] & 0x0F));
                 t_of_day = mktime(&t);
                 return (double)t_of_day+((double)ms*(double)0.001);
             }
             double __decodeTimeHMSmS(int ofset,unsigned char* data)
             {
                 int h,m,s;
                 h=(10*(data[ofset+11] & 0x0F)) + ((data[ofset+12] & 0x0F));
                 m=(10*(data[ofset+14] & 0x0F)) + ((data[ofset+15] & 0x0F));
                 s=(10*(data[ofset+17] & 0x0F)) + ((data[ofset+18] & 0x0F));
                 double ms=(100*(data[ofset+20] & 0x0F)) + (10*(data[ofset+21] & 0x0F)) + ((data[ofset+22] & 0x0F));
                 return (double)((h*3600)+(m*60)+s) + (ms*0.001);
             }
             double __decodeTimeDHMSmS(int ofset,unsigned char* data)
             {
                 int d,h,m,s;
                 d=(10*(data[ofset+8] & 0x0F)) + ((data[ofset+9] & 0x0F));
                 h=(10*(data[ofset+11] & 0x0F)) + ((data[ofset+12] & 0x0F));
                 m=(10*(data[ofset+14] & 0x0F)) + ((data[ofset+15] & 0x0F));
                 s=(10*(data[ofset+17] & 0x0F)) + ((data[ofset+18] & 0x0F));
                 double ms=(100*(data[ofset+20] & 0x0F)) + (10*(data[ofset+21] & 0x0F)) + ((data[ofset+22] & 0x0F));
                 return (double)((d*3600*24)+(h*3600)+(m*60)+s) + (ms*0.001);
             }
             double __decodeTimeFromEpochDayOnly(int ofset,unsigned char* data)
             {
                 struct tm t;
                 time_t t_of_day;
             //    t.tm_year=(1000*(data[ofset] & 0x0F)) + (100*(data[ofset+1] & 0x0F)) + (10*(data[ofset+2] & 0x0F)) + ((data[ofset+3] & 0x0F)) -1900;
                 t.tm_year=(1000*(data[ofset] & 0x0F)) + (100*(data[ofset+1] & 0x0F)) + (10*(data[ofset+2] & 0x0F)) + ((data[ofset+3] & 0x0F));
                 t.tm_mon=(10*(data[ofset+5] & 0x0F)) + ((data[ofset+6] & 0x0F));
                 t.tm_mday=(10*(data[ofset+8] & 0x0F)) + ((data[ofset+9] & 0x0F));
                 t.tm_hour=0;
                 t.tm_min=0;
                 t.tm_sec=0;
             //    t_of_day = mktime(&t);
             //    return (double)t_of_day;
                 QDateTime date(QDate(t.tm_year,t.tm_mon,1),QTime(0,0));
             //    date.setDate();
                 return (double)((date.toMSecsSinceEpoch()/1000.0)-(24*3600));
             }
             void CassiniDataFile::run()
             {
                 if(!m_Write)
                 {
                     readFile();
                 }
                 else
                 {
                     writeFile();
                 }
             }
             void CassiniDataFile::readFile()
             {
                 FILE* dataFile;
                 dataFile = fopen(fileName.toStdString().c_str(),"r");
                 if(dataFile != NULL)
                 {
                     fseek(dataFile, 0L, SEEK_END);
                     int FileSize=ftell(dataFile);
                     int lineCnt = FileSize/58;
                     int curLine=0;
                     int lastLineUpdate=0;
                     QVector<QCPData> *ch1=new QVector<QCPData>(lineCnt);
                     QVector<QCPData> *ch2=new QVector<QCPData>(lineCnt);
                     QVector<QCPData> *ch3=new QVector<QCPData>(lineCnt);
                     QLopDataList data;
                     QLopQCPDataVector* ch1V=new QLopQCPDataVector();
                     QLopQCPDataVector* ch2V=new QLopQCPDataVector();
                     QLopQCPDataVector* ch3V=new QLopQCPDataVector();
                     ch1V->data=ch1;
                     ch2V->data=ch2;
                     ch3V->data=ch3;
                     ch1V->name="r";
                     ch2V->name="theta";
                     ch3V->name="phi";
                     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);
                     QElapsedTimer timr;
                     double _x=0.0,day=0.0;
                     char* line;
                     QCPData data1,data2,data3;
                     char* fileContent=(char*)malloc(FileSize);
                     if(Q_UNLIKELY(fileContent==NULL))return;
                     int threadIndex,numThreads=omp_get_num_threads();
                     int updateTriger=(lineCnt/100)/numThreads;
                     fseek(dataFile, 0L, SEEK_SET);
                     char* svglocale=NULL;
                     setlocale(LC_NUMERIC,svglocale);
                     setlocale(LC_NUMERIC, "en_US");
                     if(fread(fileContent,1,FileSize,dataFile))
                     {
                         line = fileContent;
                         QDateTime date;
                         timr.start();
                         day=__decodeTimeFromEpochDayOnly(0,(unsigned char*)line);
                         //#pragma omp parallel if ((FileSize > 10000000)) private(date,data1,data2,data3,_x,threadIndex,lastLineUpdate) shared(ch1,ch2,ch3,lineCnt)
                         //          {
             #pragma omp parallel for if ((FileSize > 1024*1024*10)) private(date,data1,data2,data3,_x,threadIndex,lastLineUpdate,curLine) shared(ch1,ch2,ch3,lineCnt,updateTriger)
                         for(int i=0;i<lineCnt;i++)
                         {
                             //              _x=  i;
                             _x= day + __decodeTimeDHMSmS((i*58),(unsigned char*)line);
                             //              _x=__decodeTimeFromEpoch((i*58),(unsigned char*)line);
                             data1.key=_x;
                             data2.key=_x;
                             data3.key=_x;
                             data1.value=__decodeVal(((i*58)+27),(unsigned char*)line);
                             data2.value=__decodeVal(((i*58)+38),(unsigned char*)line);
                             data3.value=__decodeVal(((i*58)+49),(unsigned char*)line);
                             (*ch1)[i]=data1;
                             (*ch2)[i]=data2;
                             (*ch3)[i]=data3;
                             curLine++;
                             if(Q_UNLIKELY(lastLineUpdate++>updateTriger))
                             {
                                 lastLineUpdate=0;
                                 int test=((curLine*numThreads *100)/ (lineCnt));
                                 emit updateProgress(omp_get_thread_num(),test);
                             }
                         }
                     }
                     //#pragma omp barrier
                     free(fileContent);
                     //        }
                     qDebug()<< lineCnt <<" Points loaded in "<< timr.elapsed()<<"ms";
                     setlocale(LC_NUMERIC,svglocale);
                     emit dataReady(data);
                 }
             }
             void CassiniDataFile::writeFile()
             {
                 QFile dataFile(fileName);
                 dataFile.open(QIODevice::WriteOnly);
                 QTextStream out(&dataFile);
                 if(dataFile.isOpen())
                 {
                     if(m_data.count()==3)
                     {
                         QLopQCPDataVector* ch1V=(QLopQCPDataVector*)m_data.at(0);
                         QLopQCPDataVector* ch2V=(QLopQCPDataVector*)m_data.at(1);
                         QLopQCPDataVector* ch3V=(QLopQCPDataVector*)m_data.at(2);
                         if(ch1V->data->count()==ch2V->data->count() && ch1V->data->count()==ch3V->data->count())
                         {
                             for(int i=0;i<ch1V->data->count();i++)
                             {
                                 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";
                             }
                         }
                         dataFile.flush();
                         m_data.clear();
                         delete ch1V;
                         delete ch2V;
                         delete ch3V;
+                        emit fileWritten();
                     }
                 }
             }

src/Cassini/cassinidatafile.h +1 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef CASSINIDATAFILE_H
             #define CASSINIDATAFILE_H
             #include <QObject>
             #include <QThread>
             #include <qcustomplot.h>
             #include "abstractfileloader.h"
             class CassiniDataFile : public AbstractFileLoader
             {
               Q_OBJECT
             public:
               explicit CassiniDataFile(QObject *parent = 0);
               ~CassiniDataFile();
               void parseFile(const QString& fileName);
               void saveFile(const QString& fileName,QLopDataList data);
               void run();
             signals:
+              void fileWritten();
             public slots:
             private :
               void readFile();
               void writeFile();
               bool m_Write;
               QString fileName;
               QLopDataList m_data;
             };
             #endif // CASSINIDATAFILE_H

src/Cassini/cassinitools.cpp +24 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "cassinitools.h"
             #include <qlopplots.h>
             #include <QPen>
             #include <QAction>
             #include <fftw3.h>
             #include <omp.h>
+            #include <qlopdatabase.h>
             CassiniTools* CassiniTools::_self=NULL;
             QDockWidget* CassiniTools::m_gui=NULL;
             CassiniToolsGUI* CassiniTools::m_CassiniToolsGUI=NULL;
             CassiniDataFile* CassiniTools::m_dataFile=NULL;
             int CassiniTools::m_defaultPlot=-1;
             int CassiniTools::m_fftPlot=-1;
             SocExplorerPlotActions* CassiniTools::ExportAction=NULL;
             Qt::GlobalColor QLopColours[]= {Qt::black,
                                             Qt::red,
                                             Qt::blue,
                                             Qt::green,
                                             Qt::darkGreen,
                                             Qt::cyan,
                                             Qt::darkRed,
                                             Qt::gray,
                                             Qt::yellow,
                                             Qt::darkBlue,
                                             Qt::darkCyan,
                                             Qt::magenta,
                                             Qt::darkMagenta,
                                             Qt::darkYellow,
                                             Qt::darkGray,
                                             Qt::lightGray};
             int QLopColoursCount=16;
             #define _INIT() if(Q_UNLIKELY(_self==NULL)){init();}
             CassiniTools::CassiniTools(bool noGUI,QObject *parent) : QLopService(parent)
             {
                 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();
             }
             CassiniTools::~CassiniTools()
             {
                 delete m_dataFile;
                 delete m_CassiniToolsGUI;
                 delete m_gui;
             }
             void CassiniTools::makePlot()
             {
                 m_defaultPlot = QLopPlots::addPlot();
                 m_fftPlot = QLopPlots::addPlot();
                 SocExplorerPlot* plot=QLopPlots::getPlot(m_defaultPlot);
                 if(plot)
                 {
                     plot->setTitle(_self->m_serviceName + " plot");
                     plot->setXaxisTickLabelType(QCPAxis::ltDateTime);
                     plot->setXaxisDateTimeFormat("hh:mm:ss.zzz");
                     plot->setContextMenuPolicy(Qt::ActionsContextMenu);
                     SocExplorerPlotActions* action=new SocExplorerPlotActions("export view",plot->PID(),_self);
                     plot->addAction(action);
                     QObject::connect(action,SIGNAL(triggered(int)),_self,SLOT(export_view(int)));
                     QString fileName = QString(plot->title()).replace(".TAB","");
                     fileName = generateFileName(fileName,".TAB");
                     ExportAction=new SocExplorerPlotActions("export view to "+fileName,plot->PID(),_self);
                     plot->addAction(ExportAction);
                     QObject::connect(ExportAction,SIGNAL(triggered(int)),_self,SLOT(export_view_Predefined_FileName(int)));
                     action=new SocExplorerPlotActions("FFT of the current view",plot->PID(),_self);
                     plot->addAction(action);
                     QObject::connect(action,SIGNAL(triggered(int)),_self,SLOT(compute_fft_on_view(int)));
                 }
             }
             void CassiniTools::init(bool noGUI, QObject *parent)
             {
                 if(Q_UNLIKELY(_self==NULL))
                 {
                     _self=new CassiniTools(noGUI,parent);
                 }
             }
             CassiniTools *CassiniTools::self()
             {
                 _INIT();
                 return _self;
             }
             void CassiniTools::decodeFGMData(const QString &file)
             {
                 _INIT();
                 m_dataFile->parseFile(file);
             }
             void CassiniTools::plotFile(const QString &File)
             {
                 if(!m_dataFile->isRunning())
                 {
                     m_dataFile->parseFile(File);
                     // TODO fixme
                     SocExplorerPlot* plot = QLopPlots::getPlot(m_defaultPlot);
                     if(plot==NULL)
                     {
                         makePlot();
                         plot = QLopPlots::getPlot(m_defaultPlot);
                     }
                     if(plot)
                     {
                         plot->setTitle(File);
                         QString fileName = QString(File).replace(".TAB","-part");
                         fileName = generateFileName(fileName,".TAB");
                         ExportAction->setText("export view to "+fileName);
                     }
                 }
             }
             void CassiniTools::plot_TAB_File(const QString &fileName)
             {
                 //TODO fix: accent not accepted
                 plotFile(fileName);
             }
             void CassiniTools::export_view(int PID)
             {
                 SocExplorerPlot* plot = QLopPlots::getPlot(PID);
                 if(plot==NULL)
                     return;
                 {
                     QString fileName = plot->title();
                     fileName = QFileDialog::getSaveFileName(0,tr("Set filename"),fileName.replace(".TAB","-part.TAB"));
                     if(fileName!="")
                     {
                         QLopDataList vectors;
                         for(int i=0;i<plot->graphCount();i++)
                         {
                             QLopQCPDataVector* vect = new QLopQCPDataVector();
                             vect->data = plot->getVisibleData(i);
                             vectors.append(vect);
                         }
                         m_dataFile->saveFile(fileName,vectors);
                     }
                 }
             }
             void CassiniTools::export_view_Predefined_FileName(int PID)
             {
                 SocExplorerPlot* plot = QLopPlots::getPlot(PID);
                 if(plot==NULL)
                     return;
                 {
                     QString fileName = QString(plot->title()).replace(".TAB","-part");
                     fileName = generateFileName(fileName,".TAB");
                     if(fileName!="")
                     {
                         QLopDataList vectors;
                         for(int i=0;i<plot->graphCount();i++)
                         {
                             QLopQCPDataVector* vect = new QLopQCPDataVector();
                             vect->data = plot->getVisibleData(i);
                             vectors.append(vect);
                         }
                         m_dataFile->saveFile(fileName,vectors);
                     }
                 }
             }
             void CassiniTools::compute_fft_on_view(int PID)
             {
                 QElapsedTimer timr;
                 SocExplorerPlot* plot = QLopPlots::getPlot(PID);
                 if(plot==NULL)
                     return;
                 {
                     timr.start();
                     QLopDataList vectors;
                     for(int i=0;i<plot->graphCount();i++)
                     {
                         QLopQCPDataVector* vect = new QLopQCPDataVector();
                         vect->data = plot->getVisibleData(i);
                         vectors.append(vect);
                     }
                     if(vectors.count()==3)
                     {
                         QLopQCPDataVector* ch1V=(QLopQCPDataVector*)vectors.at(0);
                         QLopQCPDataVector* ch2V=(QLopQCPDataVector*)vectors.at(1);
                         QLopQCPDataVector* ch3V=(QLopQCPDataVector*)vectors.at(2);
                         QLopQCPDataVector* FFTout=new QLopQCPDataVector();
                         if(ch1V->data->count()==ch2V->data->count() && ch1V->data->count()==ch3V->data->count())
                         {
                             double* in;
                             fftw_complex *out;
                             fftw_plan p;
                             FFTout->data = new QVector<QCPData>(ch1V->data->count()/2);
                             in = (double*) fftw_malloc(sizeof(double) * ch1V->data->count());
                             out = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * ch1V->data->count());
                             double av=0;
                             for(int i=0;i<ch1V->data->count();i++)
                             {
                                 in[i]=sqrt((ch1V->data->at(i).value*ch1V->data->at(i).value) + (ch2V->data->at(i).value*ch2V->data->at(i).value) + (ch3V->data->at(i).value*ch3V->data->at(i).value));
                                 av = av+in[i];
                             }
                             av/=ch1V->data->count();
                             for(int i=0;i<ch1V->data->count();i++)
                             {
                                 in[i]=in[i]-av;
                             }
                             fftw_plan_with_nthreads(4);
                             p = fftw_plan_dft_r2c_1d(ch1V->data->count(),in, out,FFTW_ESTIMATE);
                             fftw_execute(p); /* repeat as needed */
                             fftw_destroy_plan(p);
                             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=((out[i][0] * out[i][0]) + (out[i][1] * out[i][1]))/(ch1V->data->count());
                                 (*FFTout->data)[i].key = i;
                             }
                             fftw_free(out);
                             SocExplorerPlot* plot = QLopPlots::getPlot(m_fftPlot);
                             if(plot==NULL)
                                 return;
                             plot->removeAllGraphs();
                             plot->addGraph();
                             plot->setXaxisLog();
                             plot->setYaxisLog();
                             plot->setAdaptativeSampling(0,true);
                             QPen pen = plot->getGraphPen(0);
                             pen.setColor(QLopColours[0%QLopColoursCount]);
                             plot->setGraphPen(0,pen);
                             plot->setGraphData(0,FFTout->data,false);
                             plot->rescaleAxis();
                             plot->replot();
                             qDebug()<< ch1V->data->count() <<" Points loaded in "<< timr.elapsed()<<"ms";
                         }
                     }
                 }
             }
             QString CassiniTools::generateFileName(const QString &baseName, const QString &extension)
             {
                 QString fileName = baseName+extension;
                 int i=0;
                 while(QFile::exists(fileName))
                 {
                     fileName = baseName+QString::number(i++)+extension;
                 }
                 return fileName;
             }
             QDockWidget *CassiniTools::getGUI()
             {
                 if(!m_noGui && (m_gui==NULL))
                 {
                     m_gui=new QDockWidget("Cassini Tools");
                     m_CassiniToolsGUI = new CassiniToolsGUI();
                     m_gui->setWidget(m_CassiniToolsGUI);
                     m_gui->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
                 }
                 return m_gui;
             }
             const QString &CassiniTools::serviceName()
             {
                 _INIT();
                 return m_serviceName;
             }
             void CassiniTools::dataReady(QLopDataList data)
             {
+                static QLopDataList prevData=QLopDataList();
                 SocExplorerPlot* plot = QLopPlots::getPlot(m_defaultPlot);
                 if(plot==NULL)
                 {
                     makePlot();
                     plot = QLopPlots::getPlot(m_defaultPlot);
                 }
                 if(plot)
                 {
+                    QLopDataBase::removeData(prevData);
                     plot->removeAllGraphs();
+                    //        QLopDataBase::re
                     for(int i=0;i<data.count();i++)
                     {
                         plot->addGraph();
                         plot->setAdaptativeSampling(i,true);
                         plot->setUseFastVector(i,true);
                         QPen pen = plot->getGraphPen(i);
                         pen.setColor(QLopColours[i%QLopColoursCount]);
                         plot->setGraphPen(i,pen);
                         plot->setGraphName(i,data.at(i)->name+"("+data.at(i)->unit+")");
                         plot->setGraphData(i,((QLopQCPDataVector*)data.at(i))->data,false);
                     }
                     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

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef CASSINITOOLS_H
             #define CASSINITOOLS_H
             #include <QObject>
             #include <QWidget>
             #include <qlopservice.h>
             #include <cassinitoolsgui.h>
             #include <cassinidatafile.h>
             #include <qlopdata.h>
             #include <SocExplorerPlot.h>
             class CassiniTools: public QLopService
             {
                 Q_OBJECT
             private:
                 static CassiniTools* _self;
                 static QDockWidget* m_gui;
                 static CassiniToolsGUI* m_CassiniToolsGUI;
                 static CassiniDataFile* m_dataFile;
                 static int m_defaultPlot,m_fftPlot;
                 static SocExplorerPlotActions* ExportAction;
                 CassiniTools(bool noGUI=false, QObject *parent=0);
                 ~CassiniTools();
                 static void makePlot();
             public:
                 static void init(bool noGUI=false,QObject *parent = 0);
                 static CassiniTools *self();
                 static void decodeFGMData(const QString& file);
                 // QLopService methodes
                 QDockWidget* getGUI();
                 const QString& serviceName();
                 static void plotFile(const QString &File);
             public slots:
                 void plot_TAB_File(const QString& fileName);
                 void export_view(int PID);
                 void export_view_Predefined_FileName(int PID);
                 void compute_fft_on_view(int PID);
             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

             #include "qlopdatabaseviewer.h"
             #include "ui_qlopdatabaseviewer.h"
             QLopDataBaseViewer::QLopDataBaseViewer(QWidget *parent) :
                 QDockWidget(parent),
                 ui(new Ui::QLopDataBaseViewer)
             {
                 ui->setupUi(this);
                 this->model = new QLopDataBaseViewerModel();
                 this->ui->dataBaseTbleView->setModel(model);
+                connect(QLopDataBase::self(),SIGNAL(DBChanged()),this->model,SLOT(DBChanged()));
             }
             QLopDataBaseViewer::~QLopDataBaseViewer()
             {
                 delete ui;
                 delete model;
             }
             void QLopDataBaseViewer::changeEvent(QEvent *e)
             {
                 QDockWidget::changeEvent(e);
                 switch (e->type()) {
                 case QEvent::LanguageChange:
                     ui->retranslateUi(this);
                     break;
                 default:
                     break;
                 }
             }

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

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>QLopDataBaseViewer</class>
              <widget class="QDockWidget" name="QLopDataBaseViewer">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>825</width>
                 <height>427</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>DockWidget</string>
               </property>
               <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>
              </widget>
              <resources/>
              <connections/>
             </ui>

src/Core/Widgets/qlopdatabaseviewermodel.cpp +52 -3

             #include "qlopdatabaseviewermodel.h"
             QLopDataBaseViewerModel::QLopDataBaseViewerModel(QObject *parent)
                 : QAbstractTableModel(parent)
             {
                 beginResetModel();
                 endResetModel();
             }
             QLopDataBaseViewerModel::~QLopDataBaseViewerModel()
             {
             }
             int QLopDataBaseViewerModel::rowCount(const QModelIndex &parent) const
             {
                 return QLopDataBase::count();
             }
             int QLopDataBaseViewerModel::columnCount(const QModelIndex &parent) const
             {
-                return 3;
+                return 5;
             }
             QVariant QLopDataBaseViewerModel::data(const QModelIndex &index, int role) const
             {
                 if (!index.isValid() || role != Qt::DisplayRole)
                     return QVariant();
                 QLopData* data=QLopDataBase::self()->getDataFromIdex(index.row());
                 if(data)
+                {
+                    switch (index.column()) {
+                    case 0:
                         return data->name;
+                        break;
+                    case 1:
+                        return data->source;
+                        break;
+                    case 2:
+                        return data->typeStr();
+                        break;
+                    case 3:
+                        return data->unit;
+                        break;
+                    case 4:
+                        return data->size();
+                        break;
+                    default:
+                        return data->name;
+                        break;
+                    }
+                }
                 else QVariant();
             }
             QVariant QLopDataBaseViewerModel::headerData(int section, Qt::Orientation orientation, int role) const
             {
-                if (role == Qt::SizeHintRole)
+                //if (role == Qt::SizeHintRole)
-                    return QSize(1, 1);
+                //    return QSize(1, 1);
+                if(orientation==Qt::Horizontal && role==Qt::DisplayRole)
+                {
+                    switch (section) {
+                    case 0:
+                        return QVariant("Name");
+                        break;
+                    case 1:
+                        return QVariant("Source");
+                        break;
+                    case 2:
+                        return QVariant("Type");
+                        break;
+                    case 3:
+                        return QVariant("Unit");
+                        break;
+                    case 4:
+                        return QVariant("Size");
+                        break;
+                    default:
+                        break;
+                    }
+                }
                 return QVariant();
             }
+            void QLopDataBaseViewerModel::DBChanged()
+            {
+                beginResetModel();
+                endResetModel();
+            }

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

             #ifndef QLOPDATABASEVIEWERMODEL_H
             #define QLOPDATABASEVIEWERMODEL_H
             #include <QObject>
             #include <QAbstractTableModel>
             #include <qlopdatabase.h>
             class QLopDataBaseViewerModel : public QAbstractTableModel
             {
+                Q_OBJECT
             public:
                 QLopDataBaseViewerModel(QObject *parent=0);
                 ~QLopDataBaseViewerModel();
                 int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
                 int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
                 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:
             };
             #endif // QLOPDATABASEVIEWERMODEL_H

src/Core/qlopdata.cpp +8 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "qlopdata.h"
+            QLopData::QLopDataTypeList_t QLopData::QLopDataTypeList[]=
+                {
+                    {Scalar,"Scalar"},
+                    {Vector,"Vector"},
+                    {Matrix,"Matrix"},
+                    {QCPDataVector,"QCPDataVector"},
+                    {None,"None"}
+                };
             QLopData::QLopData(QObject *parent) : QObject(parent)
             {
                 this->unit = "";
                 this->source = "Not set";
                 this->type = QLopData::None;
             }
             QLopData::~QLopData()
             {
             //    delete data;
             }
             QLopQCPDataVector::QLopQCPDataVector(QObject *parent)
             {
                 this->type = QLopData::QCPDataVector;
             }
             QLopQCPDataVector::~QLopQCPDataVector()
             {
                 delete data;
             }
             QLopQVector::QLopQVector(QObject *parent)
             {
                 this->type = QLopData::Vector;
             }
             QLopQVector::~QLopQVector()
             {
                 delete data;
             }

src/Core/qlopdata.h +23 -3

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef QLOPDATA_H
             #define QLOPDATA_H
             #include <QObject>
             #include <qcustomplot.h>
             typedef struct dataVector
             {
               QString name;
               QString unit;
               QVector<QCPData>* data;
             }dataVector;
             typedef QList<dataVector> QListOfDataVector;
             class QLopData : public QObject
             {
                 Q_OBJECT
             public:
+            #define QLopDataTypeCnt 5
                 typedef enum QLopDataType
                 {
                     Scalar=0,
                     Vector=1,
                     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:
             private:
             };
             class QLopQCPDataVector : public QLopData
             {
                 Q_OBJECT
             public:
                 explicit QLopQCPDataVector(QObject *parent = 0);
                 ~QLopQCPDataVector();
                 QVector<QCPData>* data;
+                int size(){return data->length();}
             signals:
             public slots:
             private:
             };
             class QLopQVector : public QLopData
             {
                 Q_OBJECT
             public:
                 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;
             }
             int QLopDataBase::addData(const QLopDataList& data)
             {
                 INIT();
                 int addedData=0;
                 for (int i = 0; i < data.count(); i++)
                 {
                     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();
                 return _self;
             }
             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))
                     {
                         return m_dataBase->at(i);
                     }
                 }
                 return NULL;
             }
             QLopData *QLopDataBase::getData(int ID)
             {
+                INIT();
                 for (int i = 0; i < m_dataBase->count(); i++)
                 {
                     if(Q_UNLIKELY(m_dataBase->at(i)->ID==ID))
                     {
                         return m_dataBase->at(i);
                     }
                 }
                 return NULL;
             }
             QLopData *QLopDataBase::getDataFromIdex(int index)
             {
                 if((index>=0)&&(index<m_dataBase->count()))
                     return m_dataBase->at(index);
                 else
                     return NULL;
             }

src/Core/qlopdatabase.h +12 -4

             #ifndef QLOPDATABASE_H
             #define QLOPDATABASE_H
             #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;
             };
             #endif // QLOPDATABASE_H

src/mainwindow.cpp +2 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the QLop Software
             -- Copyright (C) 2015, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "mainwindow.h"
             #include "ui_mainwindow.h"
             #include <QFileDialog>
             #include <QDir>
             #include "qcustomplot.h"
             #include <omp.h>
             #include <QAction>
             #include <downloadhistory.h>
             #include <QDateTime>
             #include <QDate>
             #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();
             MainWindow::MainWindow(int OMP_THREADS, QWidget *parent) :
               QMainWindow(parent),
               ui(new Ui::MainWindow)
             {
               this->OMP_THREADS = OMP_THREADS;
               ui->setupUi(this);
               this->setWindowIcon(QIcon(":img/QLop.svg"));
             //  QLopPlots::getPlot()->setXaxisTickLabelType(QCPAxis::ltDateTime);
             //  QLopPlots::getPlot()->setXaxisDateTimeFormat("hh:mm:ss.zzz");
               this->progressWidget = new QWidget();
               this->progressLayout = new QVBoxLayout(this->progressWidget);
               this->progressWidget->setLayout(this->progressLayout);
               this->progressWidget->setWindowModality(Qt::WindowModal);
               progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
               for(int i=0;i<OMP_THREADS;i++)
                 {
                   this->progress.append(new QProgressBar(this->progressWidget));
                   this->progress.last()->setMinimum(0);
                   this->progress.last()->setMaximum(100);
                   this->progressLayout->addWidget(this->progress.last());
                   this->progressWidget->hide();
                   this->progressThreadIds[i] = -1;
                 }
               this->progressWidget->setWindowTitle("Loading File");
               for(int i=0;i<ServicesToLoad.count();i++)
               {
                   qDebug()<<ServicesToLoad.at(i)->serviceName();
                   QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
                   wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
                   this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
                   PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
               }
             }
             MainWindow::~MainWindow()
             {
               delete ui;
             }
             //QString MainWindow::getFilePath(const QString &name)
             //{
             ////  for(int i=0;i<this->folderViews.count();i++)
             ////    {
             ////      if(folderViews.at(i)->isDraging(name))
             ////        return folderViews.at(i)->currentFolder();
             ////    }
             //  return "";
             //}
             void MainWindow::updateProgress(int threadId, int percentProgress)
             {
               bool updated=false;
               for(int i=0;i<OMP_THREADS;i++)
                 {
                   if(progressThreadIds[i]==threadId)
                     {
                       if(threadId<this->progress.count())
                       {
                           this->progress.at(i)->setValue(percentProgress);
                           updated=true;
                         }
                     }
                 }
               if(Q_UNLIKELY(updated==false))
                 {
                   for(int i=0;i<OMP_THREADS;i++)
                     {
                       if(progressThreadIds[i]==-1)
                         {
                           progressThreadIds[i] = threadId;
                           updateProgress(threadId,percentProgress);
                           return;
                         }
                     }
                 }
             }
             void MainWindow::askGlobalRescan()
             {
             //  for(int i=0;i<this->folderViews.count();i++)
             //    {
             //      this->folderViews.at(i)->refreshFolder();
             //  }
             }
             void MainWindow::showThemisIndexViewer()
             {
             }
             void MainWindow::changeEvent(QEvent *e)
             {
               QMainWindow::changeEvent(e);
               switch (e->type()) {
                 case QEvent::LanguageChange:
                   ui->retranslateUi(this);
                   break;
                 default:
                   break;
                 }
             }

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