GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1058:d684e1205d9a

Creates iterator for QCPColorMap...

Alexandre Leroux -

r1058:d684e1205d9a

parent child

Context file:

r1058:d684e1205d9a

Collapse all files

gui/include/Visualization/QCPColorMapIterator.h created 644 +40 0

@@ -0,0 +1,40
	1	#ifndef SCIQLOP_QCPCOLORMAPITERATOR_H
	2	#define SCIQLOP_QCPCOLORMAPITERATOR_H
	3
	4	#include <iterator>
	5
	6	class QCPColorMapData;
	7
	8	/**
	9	* Forward iterator for @sa QCPColorMap
	10	*/
	11	class QCPColorMapIterator {
	12	public:
	13	using iterator_category = std::forward_iterator_tag;
	14	using value_type = double;
	15	using difference_type = std::ptrdiff_t;
	16	using pointer = const value_type *;
	17	using reference = value_type;
	18
	19	explicit QCPColorMapIterator(QCPColorMapData *data, bool begin);
	20	virtual ~QCPColorMapIterator() noexcept = default;
	21
	22	QCPColorMapIterator &operator++();
	23	QCPColorMapIterator operator++(int);
	24
	25	pointer operator->() const;
	26	reference operator*() const;
	27
	28	bool operator==(const QCPColorMapIterator &other);
	29	bool operator!=(const QCPColorMapIterator &other);
	30
	31	private:
	32	void updateValue();
	33
	34	QCPColorMapData *m_Data; ///< Data iterated
	35	int m_KeyIndex; ///< Current iteration key index
	36	int m_ValueIndex; ///< Current iteration value index
	37	double m_Value; ///< Current iteration value
	38	};
	39
	40	#endif // SCIQLOP_QCPCOLORMAPITERATOR_H

gui/src/Visualization/QCPColorMapIterator.cpp created 644 +58 0

@@ -0,0 +1,58
	1	#include "Visualization/QCPColorMapIterator.h"
	2
	3	#include <Visualization/qcustomplot.h>
	4
	5	QCPColorMapIterator::QCPColorMapIterator(QCPColorMapData *data, bool begin)
	6	: m_Data{data}, m_KeyIndex{begin ? 0 : data->keySize()}, m_ValueIndex{0}
	7	{
	8	updateValue();
	9	}
	10
	11	QCPColorMapIterator &QCPColorMapIterator::operator++()
	12	{
	13	// Increments indexes
	14	++m_ValueIndex;
	15	if (m_ValueIndex == m_Data->valueSize()) {
	16	++m_KeyIndex;
	17	m_ValueIndex = 0;
	18	}
	19
	20	// Updates value
	21	updateValue();
	22
	23	return *this;
	24	}
	25
	26	QCPColorMapIterator QCPColorMapIterator::operator++(int)
	27	{
	28	auto result = *this;
	29	this->operator++();
	30	return result;
	31	}
	32
	33	QCPColorMapIterator::pointer QCPColorMapIterator::operator->() const
	34	{
	35	return &m_Value;
	36	}
	37
	38	QCPColorMapIterator::reference QCPColorMapIterator::operator*() const
	39	{
	40	return m_Value;
	41	}
	42
	43	bool QCPColorMapIterator::operator==(const QCPColorMapIterator &other)
	44	{
	45	return std::tie(m_Data, m_KeyIndex, m_ValueIndex)
	46	== std::tie(other.m_Data, other.m_KeyIndex, other.m_ValueIndex);
	47	}
	48
	49	bool QCPColorMapIterator::operator!=(const QCPColorMapIterator &other)
	50	{
	51	return !(*this == other);
	52	}
	53
	54	void QCPColorMapIterator::updateValue()
	55	{
	56	m_Value = m_KeyIndex != m_Data->keySize() ? m_Data->cell(m_KeyIndex, m_ValueIndex)
	57	: std::numeric_limits<double>::quiet_NaN();
	58	}

gui/meson.build +2 -1

             gui_moc_headers = [
               'include/DataSource/DataSourceWidget.h',
               'include/Settings/SqpSettingsDialog.h',
               'include/Settings/SqpSettingsGeneralWidget.h',
               'include/SidePane/SqpSidePane.h',
               'include/SqpApplication.h',
               'include/DragAndDrop/DragDropScroller.h',
               'include/DragAndDrop/DragDropTabSwitcher.h',
               'include/TimeWidget/TimeWidget.h',
               'include/Variable/VariableInspectorWidget.h',
               'include/Variable/RenameVariableDialog.h',
               'include/Visualization/qcustomplot.h',
               'include/Visualization/VisualizationGraphWidget.h',
               'include/Visualization/VisualizationTabWidget.h',
               'include/Visualization/VisualizationWidget.h',
               'include/Visualization/VisualizationZoneWidget.h',
               'include/Visualization/VisualizationDragDropContainer.h',
               'include/Visualization/VisualizationDragWidget.h',
               'include/Visualization/ColorScaleEditor.h'
             ]
             gui_ui_files = [
               'ui/DataSource/DataSourceWidget.ui',
               'ui/Settings/SqpSettingsDialog.ui',
               'ui/Settings/SqpSettingsGeneralWidget.ui',
               'ui/SidePane/SqpSidePane.ui',
               'ui/TimeWidget/TimeWidget.ui',
               'ui/Variable/VariableInspectorWidget.ui',
               'ui/Variable/RenameVariableDialog.ui',
               'ui/Variable/VariableMenuHeaderWidget.ui',
               'ui/Visualization/VisualizationGraphWidget.ui',
               'ui/Visualization/VisualizationTabWidget.ui',
               'ui/Visualization/VisualizationWidget.ui',
               'ui/Visualization/VisualizationZoneWidget.ui',
               'ui/Visualization/ColorScaleEditor.ui'
             ]
             gui_qresources = ['resources/sqpguiresources.qrc']
             gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
                                            ui_files : gui_ui_files,
                                            qresources : gui_qresources)
             gui_sources = [
               'src/SqpApplication.cpp',
               'src/DragAndDrop/DragDropHelper.cpp',
               'src/DragAndDrop/DragDropScroller.cpp',
               'src/DragAndDrop/DragDropTabSwitcher.cpp',
               'src/Common/ColorUtils.cpp',
               'src/Common/VisualizationDef.cpp',
               'src/DataSource/DataSourceTreeWidgetItem.cpp',
               'src/DataSource/DataSourceTreeWidgetHelper.cpp',
               'src/DataSource/DataSourceWidget.cpp',
               'src/DataSource/DataSourceTreeWidget.cpp',
               'src/Settings/SqpSettingsDialog.cpp',
               'src/Settings/SqpSettingsGeneralWidget.cpp',
               'src/SidePane/SqpSidePane.cpp',
               'src/TimeWidget/TimeWidget.cpp',
               'src/Variable/VariableInspectorWidget.cpp',
               'src/Variable/VariableInspectorTableView.cpp',
               'src/Variable/VariableMenuHeaderWidget.cpp',
               'src/Variable/RenameVariableDialog.cpp',
               'src/Visualization/VisualizationGraphHelper.cpp',
               'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
               'src/Visualization/VisualizationGraphWidget.cpp',
               'src/Visualization/VisualizationTabWidget.cpp',
               'src/Visualization/VisualizationWidget.cpp',
               'src/Visualization/VisualizationZoneWidget.cpp',
               'src/Visualization/qcustomplot.cpp',
               'src/Visualization/QCustomPlotSynchronizer.cpp',
               'src/Visualization/operations/FindVariableOperation.cpp',
               'src/Visualization/operations/GenerateVariableMenuOperation.cpp',
               'src/Visualization/operations/MenuBuilder.cpp',
               'src/Visualization/operations/RemoveVariableOperation.cpp',
               'src/Visualization/operations/RescaleAxeOperation.cpp',
               'src/Visualization/VisualizationDragDropContainer.cpp',
               'src/Visualization/VisualizationDragWidget.cpp',
               'src/Visualization/AxisRenderingUtils.cpp',
               'src/Visualization/PlottablesRenderingUtils.cpp',
               'src/Visualization/MacScrollBarStyle.cpp',
               'src/Visualization/VisualizationCursorItem.cpp',
               'src/Visualization/ColorScaleEditor.cpp',
-              'src/Visualization/SqpColorScale.cpp'
+              'src/Visualization/SqpColorScale.cpp',
+              'src/Visualization/QCPColorMapIterator.cpp'
             ]
             gui_inc = include_directories(['include'])
             sciqlop_gui_lib = library('sciqlopgui',
                                    gui_sources,
                                    gui_moc_files,
                                    include_directories : [gui_inc],
                                    dependencies : [ qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core],
                                    install : true
                                    )
             sciqlop_gui = declare_dependency(link_with : sciqlop_gui_lib,
                                             include_directories : gui_inc,
                                             dependencies : [qt5printsupport, qt5gui, qt5widgets, qt5svg, sciqlop_core])

gui/vera-exclusions/exclusions.txt +13 0

@@ -1,9 +1,22
1	\.h:\d+:.IPSIS_S04.*found: ui	1	\.h:\d+:.IPSIS_S04.*found: ui
2	qcustomplot\.h:\d+:.IPSIS	2	qcustomplot\.h:\d+:.IPSIS
3	qcustomplot\.cpp:\d+:.IPSIS	3	qcustomplot\.cpp:\d+:.IPSIS
4		4
5	# Ignore false positive relative to App macro	5	# Ignore false positive relative to App macro
6	SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp	6	SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp
7	SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp	7	SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp
8		8
		9	# Ignore false positive relative to iterators
		10	QCPColorMapIterator\.h:\d+:.IPSIS_S04_VARIABLE.found: (forward_iterator_tag)
		11	QCPColorMapIterator\.h:\d+:.IPSIS_S04_VARIABLE.found: (ptrdiff_t)
		12	QCPColorMapIterator\.h:\d+:.IPSIS_S04_VARIABLE.found: (value_type)
		13	QCPColorMapIterator\.h:\d+:.IPSIS_S06.found: (iterator_category)
		14	QCPColorMapIterator\.h:\d+:.IPSIS_S06.found: (forward_iterator_tag)
		15	QCPColorMapIterator\.h:\d+:.IPSIS_S06.found: (value_type)
		16	QCPColorMapIterator\.h:\d+:.IPSIS_S06.found: (difference_type)
		17	QCPColorMapIterator\.h:\d+:.IPSIS_S06.found: (ptrdiff_t)
		18	QCPColorMapIterator\.h:\d+:.IPSIS_S06.found: (pointer)
		19	QCPColorMapIterator\.h:\d+:.IPSIS_S06.found: (reference)
		20	QCPColorMapIterator\.h:\d+:.IPSIS_S06.found: (value_type)
		21
9		22

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