Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support both 5.5 and 5.6 version of ParaView
[modules/gui.git]
/
src
/
Plot2d
/
Plot2d_Curve.cxx
diff --git
a/src/Plot2d/Plot2d_Curve.cxx
b/src/Plot2d/Plot2d_Curve.cxx
index 615d5dfd8ebc4077c2119dc59424bdd3b71b6731..11f616002a0a70b764d779b624510539298127d8 100755
(executable)
--- a/
src/Plot2d/Plot2d_Curve.cxx
+++ b/
src/Plot2d/Plot2d_Curve.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-135,19
+135,19
@@
void Plot2d_Curve::updatePlotItem( QwtPlotItem* theItem )
aCurve->setSelected(isSelected());
aCurve->setPen( QPen(aColor , lineW, ps ) );
aCurve->setSelected(isSelected());
aCurve->setPen( QPen(aColor , lineW, ps ) );
- aCurve->setSymbol( QwtSymbol( ms, QBrush( aColor ),
- QPen( aColor ),
- QSize( markerS , markerS ) ) );
+ aCurve->setSymbol(
new
QwtSymbol( ms, QBrush( aColor ),
+ QPen( aColor ),
+
QSize( markerS , markerS ) ) );
aCurve->setLegendPen(QPen(getColor(), getLineWidth(), ps ));
aCurve->setLegendPen(QPen(getColor(), getLineWidth(), ps ));
- aCurve->setLegendSymbol(
QwtSymbol( ms, QBrush( getColor() ),
- QPen( getColor() ),
- QSize( getMarkerSize() , getMarkerSize() )));
+ aCurve->setLegendSymbol(
new QwtSymbol( ms, QBrush( getColor() ),
+ QPen( getColor() ),
+
QSize( getMarkerSize() , getMarkerSize() )));
double *x, *y, *min, *max;
long nb = getData( &x, &y );
if(nb > 0 && x && y) {
double *x, *y, *min, *max;
long nb = getData( &x, &y );
if(nb > 0 && x && y) {
- aCurve->set
Data
( x, y, nb );
+ aCurve->set
Samples
( x, y, nb );
delete [] x;
delete [] y;
QList<int> idx;
delete [] x;
delete [] y;
QList<int> idx;
@@
-160,7
+160,7
@@
void Plot2d_Curve::updatePlotItem( QwtPlotItem* theItem )
aCurve->clearDeviationData();
}
} else {
aCurve->clearDeviationData();
}
} else {
- aCurve->set
Data
( NULL, NULL, 0 );
+ aCurve->set
Samples
( NULL, NULL, 0 );
}
}
}
}