Репозиторий Sisyphus
Последнее обновление: 17 июля 2019 | Пакетов: 17686 | Посещений: 14338863
en ru br
Репозитории ALT
S:0.9.8.9-alt8.svn20120124
5.1: 0.9.7.10-alt1.svn20091021.1
4.1: 0.9.2-alt1.1
4.0: 0.8.9-alt2
3.0: 0.5.8.3-alt1
www.altlinux.org/Changes

Группа :: Науки/Прочее
Пакет: qtiplot

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: qtiplot-0.9.8.9-alt-sipFTBFS.patch
Скачать


diff --git a/qtiplot/src/analysis/FFT.cpp b/qtiplot/src/analysis/FFT.cpp
index 3f74064..28bc4bd 100644
--- a/qtiplot/src/analysis/FFT.cpp
+++ b/qtiplot/src/analysis/FFT.cpp
@@ -353,7 +353,7 @@ void FFT::outputGraphs()
 	ml->arrangeLayers(false, false);
 }
 
-bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to)
+bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused)
 {
 	d_init_err = true;
 
diff --git a/qtiplot/src/analysis/FFT.h b/qtiplot/src/analysis/FFT.h
index 089b1ed..8ca0428 100644
--- a/qtiplot/src/analysis/FFT.h
+++ b/qtiplot/src/analysis/FFT.h
@@ -52,6 +52,8 @@ public:
 	Matrix *realOutputMatrix(){return d_re_out_matrix;}
 	Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;}
 
+    bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false);
+
 private:
     void init();
     void output();
@@ -60,8 +62,6 @@ private:
 	void fftTable();
 	void fftMatrix();
 
-    bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1);
-
     double d_sampling;
     //! Flag telling if an inverse FFT must be performed.
     bool d_inverse;
diff --git a/qtiplot/src/plot2D/ImageWidget.h b/qtiplot/src/plot2D/ImageWidget.h
index 361b916..ee808f4 100644
--- a/qtiplot/src/plot2D/ImageWidget.h
+++ b/qtiplot/src/plot2D/ImageWidget.h
@@ -67,11 +67,11 @@ public:
 	void setWindowName(const QString& name){d_window_name = name;};
 
 	static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size);
+	void paintEvent(QPaintEvent *e);
 
 private:
 	void draw(QPainter *painter, const QRect& r);
 	virtual void drawFrame(QPainter *p, const QRect& rect);
-	void paintEvent(QPaintEvent *e);
 	QPixmap d_pix;
 	//! The file from which the image was loaded.
 	QString d_file_name;
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin