head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.16
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.14
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.12
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.10
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.8
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.6
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.4
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.2
	pkgsrc-2024Q2-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2024.05.11.20.54.13;	author adam;	state Exp;
branches;
next	;
commitid	oRGyGyzvgzneLC9F;


desc
@@


1.1
log
@py-qwt-qt5: fix builds against qwt-qt5 6.1.6 and newer
@
text
@$NetBSD$

Builds against qwt-qt5 6.1.6
https://github.com/GauiStori/PyQt-Qwt/pull/22

--- sip/qwt_point_data.sip.orig	2024-05-11 20:12:06.870168546 +0000
+++ sip/qwt_point_data.sip
@@@@ -8,16 +8,35 @@@@
  * modify it under the terms of the Qwt License, Version 1.0
  *****************************************************************************/
 
-class QwtPointArrayData: QwtSeriesDataQPointF
+class QwtPointArrayDataDouble: QwtPointSeriesData
 {
 %TypeHeaderCode
+#include <qwt_series_data.h>
 #include <qwt_point_data.h>
+typedef QwtSeriesData<QPointF> QwtSeriesDataQPointF;
+typedef QwtArraySeriesData<QPointF> QwtArraySeriesDataQPointF;
+typedef QwtPointArrayData<double> QwtPointArrayDataDouble;
 %End
 
 public:
-    QwtPointArrayData( const QVector<double> &x, const QVector<double> &y );
-    //QwtPointArrayData( const double *x, const double *y, size_t size ); FIXME
-
+    QwtPointArrayDataDouble( const QVector<double> &x, const QVector<double> &y );
+    
+      	
+    QwtPointArrayDataDouble(QVector<double> &,QVector<double> &)[( const double *x, const double *y, size_t size )];
+    
+    %MethodCode
+         //QVector<double> d_x;
+         //QVector<double> d_y;
+         //size_t size;
+         //const double*x;
+	//const double*y;
+	//d_x.resize( size );
+    	//::memcpy( d_x.data(), x, size * sizeof( double ) );
+
+    	//d_y.resize( size );
+    	//::memcpy( d_y.data(), y, size * sizeof( double ) );
+    %End
+     
     virtual QRectF boundingRect() const;
 
     virtual size_t size() const;
@@@@ -33,44 +52,65 @@@@ public:
 
 /*!
   \brief Data class containing two pointers to memory blocks of doubles.
- */
-/*class QwtCPointerData: QwtSeriesDataQPointF
+*/ 
+class QwtCPointerDataDouble: QwtPointSeriesData
 {
 %TypeHeaderCode
+#include <qwt_series_data.h>
 #include <qwt_point_data.h>
+typedef QwtSeriesData<QPointF> QwtSeriesDataQPointF;
+typedef QwtArraySeriesData<QPointF> QwtArraySeriesDataQPointF;
+typedef QwtCPointerData<double> QwtCPointerDataDouble;
 %End
 
 public:
-    //QwtCPointerData( const double *x, const double *y, size_t size ); FIXME
-
+    QwtCPointerDataDouble(SIP_PYLIST,SIP_PYLIST,size_t size)[( const double *x, const double *y, size_t size )];
+    %MethodCode
+    //const double *d_x;
+    //const double *d_y;
+    //size_t d_size;
+    //size_t size;
+    //const double*x;
+    //const double*y;
+    //d_x = x ;
+    //d_y = y ;
+    //d_size =  size ;	
+    %End 
+    
+    
     virtual QRectF boundingRect() const;
     virtual size_t size() const;
     virtual QPointF sample( size_t i ) const;
 
-    const double *xData() const;
-    const double *yData() const;
-*/
+    //const double *xData() const;
+    //const double *yData() const;
+
+    const SIP_PYLIST xData() const;
+     %MethodCode
+	//const double *d_x;
+	//return d_x;	
+    %End
+     const SIP_PYLIST yData() const;	
+      %MethodCode
+	//const double *d_y;
+	//return d_y;	
+    %End
+	
+
+
 /*private:
     const double *d_x;
     const double *d_y;
     size_t d_size;*/
-//};
-
-
-/*class SinusData: QwtSyntheticPointData FIXME
-{
-%TypeHeaderCode
-#include <qwt_point_data.h>
-%End
-public:
-    SinusData();
-    virtual double y( double x ) const;
-};*/
+};
 
-class QwtSyntheticPointData: QwtSeriesDataQPointF
+class QwtSyntheticPointData: QwtPointSeriesData
 {
 %TypeHeaderCode
+#include <qwt_series_data.h>
 #include <qwt_point_data.h>
+typedef QwtSeriesData<QPointF> QwtSeriesDataQPointF;
+typedef QwtArraySeriesData<QPointF> QwtArraySeriesDataQPointF;
 %End
 public:
     QwtSyntheticPointData( size_t size,
@@@@ -91,6 +131,7 @@@@ public:
     virtual void setRectOfInterest( const QRectF & );
     QRectF rectOfInterest() const;
 
+
 /*private:
     size_t d_size;
     QwtInterval d_interval;
@@@@ -98,3 +139,6 @@@@ public:
     QwtInterval d_intervalOfInterest;*/
 };
 
+
+
+
@