[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [labplot] src: set selected datetime format when importing
From: Stefan Gerlach <null () kde ! org>
Date: 2017-06-30 22:59:13
Message-ID: E1dR4sb-0006po-Gi () code ! kde ! org
[Download RAW message or body]
Git commit 0a9c56432f5968b8d31ae74ef3843e089f1649d9 by Stefan Gerlach.
Committed on 30/06/2017 at 22:59.
Pushed by sgerlach into branch 'master'.
set selected datetime format when importing
M +6 -2 src/backend/datasources/filters/AsciiFilter.cpp
M +0 -1 src/kdefrontend/datasources/ImportFileWidget.cpp
https://commits.kde.org/labplot/0a9c56432f5968b8d31ae74ef3843e089f1649d9
diff --git a/src/backend/datasources/filters/AsciiFilter.cpp \
b/src/backend/datasources/filters/AsciiFilter.cpp index f6734f0c..886d9e48 100644
--- a/src/backend/datasources/filters/AsciiFilter.cpp
+++ b/src/backend/datasources/filters/AsciiFilter.cpp
@@ -26,10 +26,11 @@ Copyright : (C) 2009-2017 Alexander Semke \
(alexander.semke@web.de)
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
-#include "backend/datasources/filters/AsciiFilter.h"
-#include "backend/datasources/filters/AsciiFilterPrivate.h"
#include "backend/datasources/FileDataSource.h"
#include "backend/core/column/Column.h"
+#include "backend/datasources/filters/AsciiFilter.h"
+#include "backend/datasources/filters/AsciiFilterPrivate.h"
+#include "backend/core/datatypes/DateTime2StringFilter.h"
#include "backend/lib/macros.h"
#include <QTextStream>
@@ -606,6 +607,9 @@ QVector<QStringList> \
AsciiFilterPrivate::readDataFromDevice(QIODevice& device, A break;
case AbstractColumn::DateTime:
comment = i18np("date and time data, %1 element", "date and time data, %1 \
elements", rows); + // set same datetime format in column
+ DateTime2StringFilter* filter = \
static_cast<DateTime2StringFilter*>(column->outputFilter()); \
+ filter->setFormat(dateTimeFormat); }
column->setComment(comment);
if (importMode == AbstractFileFilter::Replace) {
diff --git a/src/kdefrontend/datasources/ImportFileWidget.cpp \
b/src/kdefrontend/datasources/ImportFileWidget.cpp index 5864a1a3..40e3c37a 100644
--- a/src/kdefrontend/datasources/ImportFileWidget.cpp
+++ b/src/kdefrontend/datasources/ImportFileWidget.cpp
@@ -173,7 +173,6 @@ ImportFileWidget::ImportFileWidget(QWidget* parent, const \
QString& fileName) : Q connect( ui.bRefreshPreview, SIGNAL(clicked()), \
SLOT(refreshPreview()) );
connect( asciiOptionsWidget.chbHeader, SIGNAL(stateChanged(int)), \
SLOT(headerChanged(int)) );
-//TODO connect( asciiOptionsWidget.cbDataType, SIGNAL(stateChanged(int)), \
SLOT(dataTypeChanged(int)) ); connect( hdfOptionsWidget.twContent, \
SIGNAL(itemSelectionChanged()), SLOT(hdfTreeWidgetSelectionChanged()) ); connect( \
hdfOptionsWidget.bRefreshPreview, SIGNAL(clicked()), SLOT(refreshPreview()) ); \
connect( netcdfOptionsWidget.twContent, SIGNAL(itemSelectionChanged()), \
SLOT(netcdfTreeWidgetSelectionChanged()) );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic