Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some bugs under qt5.8 #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
336 changes: 336 additions & 0 deletions blindcamaleon.pro.user

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/butterworth.cpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ QImage* Butterworth::run(Complex* dft, int value, SimpleFilteredImage* img)
int height = img->spectrum()->height();
int i, j, pos, size = width * height;
double h;
int n = QInputDialog::getInteger(img, "Butterworth filter", "n=");
int n = QInputDialog::getInt(img, "Butterworth filter", "n=");

dft = Fourier::cp(dft, size);

Expand Down
2 changes: 1 addition & 1 deletion src/histogram.cpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void Histogram::paintGraphBase(QPainter *painter, int max)

void Histogram::paintBar(QPainter *painter, int max, int i)
{
int size = qRound(indexes[i] * (ZERO_POINT - TOP_SPACE) / max) + 1;
int size = qRound(double(indexes[i] * (ZERO_POINT - TOP_SPACE) / max)) + 1;

QLinearGradient color;
int starting_color = i * perClass;
Expand Down
2 changes: 1 addition & 1 deletion src/idealfilteredimage.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class IdealFilteredImage : public QLabel
QRubberBand *rubberBand;
QPoint selOrigin, selDest;
public:
IdealFilteredImage(QWidget*);
IdealFilteredImage(QWidget* parent=nullptr);
void setSpectrum(QImage*);
QImage* spectrum();
int y0();
Expand Down
1 change: 1 addition & 0 deletions src/pidmain.cpp
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <QtGui>
#include <QMdiArea>
#include <QMdiSubWindow>
#include <QFileDialog>
#include "pidmain.h"
#include "about.h"
#include "help.h"
Expand Down
4 changes: 2 additions & 2 deletions src/simplefilteredimage.h
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class SimpleFilteredImage : public QLabel
QImage *spec;
int _x0, _y0, _z;
public:
SimpleFilteredImage(QDialog*);
SimpleFilteredImage(QWidget*);
SimpleFilteredImage(QDialog* dlg);
SimpleFilteredImage(QWidget* parent=nullptr);
void setSpectrum(QImage*);
QImage* spectrum();
int y0();
Expand Down
1 change: 1 addition & 0 deletions src/src.pro
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

TEMPLATE = app
TARGET = blindcamaleon
QT += core gui widgets

include(src.pri)

Expand Down