Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 60d54680 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'release/2.26.0'

parents 88a72383 5ff981a2
Pipeline #206000 failed with stage
in 0 seconds
# Change Log:
# 2.26.0 21-Jan-2021
- remove ambiguous signature of addFieldY method
# 2.25.0 04-Dec-2020
- add setTitle in dtkVisualizationCanvas API
......
......@@ -23,7 +23,7 @@ project(dtkVisualization)
## ###################################################################
set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 25)
set(${PROJECT_NAME}_VERSION_MINOR 26)
set(${PROJECT_NAME}_VERSION_PATCH 0)
set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......
......@@ -19,7 +19,8 @@ channels:
dependencies:
- qt >=5.9.0
- vtk=8.2.0
- dtk-widgets >=2.22.2
- dtk-widgets >=2.24.1
- dtk-log >=2.3.0
#
# dtk-visualization.yaml ends here
......@@ -41,15 +41,17 @@ requirements:
- {{ cdt('libxxf86vm') }} # [linux]
host:
- qt >=5.9.0
- dtk-widgets >=2.22.2
- dtk-widgets >=2.24.1
- dtk-themes >=2.1.0,<2.2
- dtk-log >=2.3.0
- vtk=8.2.0
run:
- vtk=8.2.0
- qt >=5.9.0
- dtk-widgets >=2.22.2
- dtk-themes >=2.1.0,<2.2
- dtk-widgets >=2.24.1
- dtk-themes >=2.1.0
- dtk-log >=2.3.0
- gst-plugins-good # [linux]
- gst-libav # [linux]
......
......@@ -631,18 +631,8 @@ void dtkVisualizationPlot2D::addFieldY(vtkSmartPointer<vtkAbstractArray> field,
int chart_type,
int marker_style,
QColor color,
int width)
{
addFieldY(field, 0, checked, chart_type, marker_style, color, width);
}
void dtkVisualizationPlot2D::addFieldY(vtkSmartPointer<vtkAbstractArray> field,
int source,
bool checked,
int chart_type,
int marker_style,
QColor color,
int width)
int width,
int source)
{
Q_ASSERT_X(source < d->sources.size(), Q_FUNC_INFO, qPrintable("source" + QString::number(source) + "is out or range" + QString::number(d->sources.size())));
Q_ASSERT_X(chart_type >= 0 && chart_type < 7, "setChartType", "0: Line , 1: Points , 2: Bar , 3: Stacked , 4: Bag , 5: functionalBag , 6: Area -> as in vtkPlot");
......
......@@ -47,15 +47,8 @@ public:
int type = vtkChart::POINTS,
int marker_style = vtkPlotPoints::PLUS,
QColor color = Qt::transparent,
int width = 3);
void addFieldY(vtkSmartPointer<vtkAbstractArray>,
int source,
bool checked = false,
int type = vtkChart::POINTS,
int marker_style = vtkPlotPoints::PLUS,
QColor color = Qt::transparent,
int width = 3);
int width = 3,
int source = 0);
void clearFields(void);
void removeField(vtkSmartPointer<vtkAbstractArray>);
void removeField(const QString&);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment