Merge branch 'master' into Zadanie_05_Dawid

This commit is contained in:
Dawid_Kreft 2020-04-06 23:47:51 +02:00
commit 7a29b69730
4 changed files with 103 additions and 26 deletions

View File

@ -18,22 +18,32 @@ PNM* BlurGaussian::transform()
radius = (size/2)+1;
sigma = getParameter("sigma").toDouble();
return convolute(getMask(size, Normalize), RepeatEdge);
return convolute(getMask(size, Normalize), CyclicEdge);
}
math::matrix<float> BlurGaussian::getMask(int size, Mode)
{
math::matrix<float> mask(size, size);
qDebug() << Q_FUNC_INFO << "Not implemented yet!";
if(size%2!=0) radius=size/2;
for(int i=-radius;i<=radius;i++)
{
for(int j=-radius;j<=radius;j++)
{
mask[i+radius][j+radius]=getGauss(i,j,sigma);
}
}
return mask;
}
float BlurGaussian::getGauss(int x, int y, float sigma)
{
qDebug() << Q_FUNC_INFO << "Not implemented yet!";
return 0;
float gauss= exp(-(x*x+y*y)/(2*sigma*sigma))/(2*M_PI*sigma*sigma);
return gauss;
}

View File

@ -13,12 +13,29 @@ BlurLinear::BlurLinear(PNM* img, ImageViewer* iv) :
PNM* BlurLinear::transform()
{
int maskSize = getParameter("size").toInt();
QList<QVariant> tmpMask = getParameter("mask").toList();
bool normalize = getParameter("normalize").toBool();
QList<QVariant> tmpMask = getParameter("mask").toList();
bool normalize = getParameter("normalize").toBool();
math::matrix<float> mask(maskSize, maskSize);
math::matrix<float> mask(maskSize, maskSize);
qDebug() << Q_FUNC_INFO << "Not implemented yet!";
int index = 0;
float sum = 0;
for (int x = 0; x < maskSize; x++) {
for (int y = 0; y < maskSize; y++) {
mask[x][y] = tmpMask.at(index).toDouble();
index++;
sum = sum + mask[x][y];
}
}
return convolute(mask, RepeatEdge);
if(normalize == true && sum != 0.0 ){
for (int x = 0; x < maskSize; x++) {
for (int y = 0; y < maskSize; y++) {
mask[x][y] = mask[x][y] / sum;
}
}
}
return convolute(mask, CyclicEdge);
}

View File

@ -14,7 +14,15 @@ math::matrix<float> BlurUniform::getMask(int size, Mode)
{
math::matrix<float> mask(size, size);
qDebug() << Q_FUNC_INFO << "Not implemented yet!";
for(int i=0;i<size;i++)
{
for(int j=0;j<size;j++)
{
mask[i][j]=1.00;
}
}
return mask;
}

View File

@ -99,34 +99,59 @@ QRgb Transformation::getPixel(int x, int y, Mode mode)
}
/** Returns a pixel using the Cyclic mode:
* pixel(x,y) = pixel(x%width, y%width);
*
*/
QRgb Transformation::getPixelCyclic(int x, int y)
{
qDebug() << Q_FUNC_INFO << "Not implemented yet!";
int height=image->height();
int width=image->width();
/*
if(x>width) x=x%width;
if(y>height) y=y%height;
if(x<0) x=width-x;
if(y<0) y=height-y;
*/
x=(width+(x%width))%width;
y=(height+(y%height))%height;
return image->pixel(x,y);
}
/**
* Returns a given pixel
* If the pixel is out of image boundaries Black is returned;
*/
QRgb Transformation::getPixelNull(int x, int y)
{
qDebug() << Q_FUNC_INFO << "Not implemented yet!";
int height=image->height();
int width=image->width();
return image->pixel(x,y);
QRgb pixel = image->pixel(x,y);
if(x>width || x<0 || y>height || y<0)
{
int v=PIXEL_VAL_MAX;
image->setPixel(x,y, QColor(v,v,v).rgb());
}
return pixel;
}
/**
* Returns given pixel.
* If the pixel is out of image boundaries
* the nearest edge pixel is given
*/
QRgb Transformation::getPixelRepeat(int x, int y)
{
qDebug() << Q_FUNC_INFO << "Not implemented yet!";
int height=image->height();
int width=image->width();
if(x>width) x=width;
if(y>height) y=height;
if(x<0) x=0;
if(y<0) y=0;
return image->pixel(x,y);
}
@ -136,9 +161,26 @@ math::matrix<float> Transformation::getWindow(int x, int y, int size,
Channel channel,
Mode mode = RepeatEdge)
{
math::matrix<float> window(size,size);
qDebug() << Q_FUNC_INFO << "Not implemented yet!";
math::matrix<float> window(size,size);
int temp,r;
r=size/2;
for(int i=-r;i<=r;i++)
{
for(int j=-r;j<=r;j++)
{
if(channel==RChannel) temp = qRed(getPixel(x+i,y+j, CyclicEdge));
if(channel==GChannel) temp = qGreen (getPixel(x+i,y+j, CyclicEdge));
if(channel==BChannel) temp = qBlue(getPixel(x+i,y+j, CyclicEdge));
//if(channel==LChannel) temp= qGray(getPixel(i,j, mode));
window[i+r][j+r]=temp;
}
}
return window;
}