Commit f18263e7 authored by Laurent Belcour's avatar Laurent Belcour

Updating the interface for the data plugins. This is not a clean REV to update...

Updating the interface for the data plugins. This is not a clean REV to update to, ALTA will not compile here.
parent 50fe41b3
......@@ -97,10 +97,8 @@ vec data_astm::max() const
return res ;
}
data* provide_data()
ALTA_DLL_EXPORT data* provide_data()
{
return new data_astm();
}
Q_EXPORT_PLUGIN2(data_astm, data_astm)
......@@ -25,16 +25,13 @@ Delaunay_d* D;
int dD;
#endif
data_interpolant::data_interpolant()
data_interpolant::data_interpolant() : _data(new vertical_segment())
{
_data = new vertical_segment();
_knn = 3;
}
data_interpolant::~data_interpolant()
{
delete _data;
#ifndef USE_DELAUNAY
if(_kdtree != NULL)
delete _kdtree;
......@@ -192,7 +189,7 @@ vec data_interpolant::value(vec x) const
// Get data size, e.g. the number of samples to fit
int data_interpolant::size() const
{
assert(_data != NULL);
assert(_data);
return _data->size();
}
......
......@@ -45,7 +45,7 @@ class data_interpolant : public data
private: // data
// The data object used to load sparse points sets
data* _data;
ptr<data> _data;
// Interpolation
flann::Index< flann::L2<double> >* _kdtree;
......
......@@ -42,6 +42,6 @@ class data_interpolant : public data
private: // data
// The data object used to load sparse points sets
data* _data;
ptr<data> _data;
Engine *ep;
} ;
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