nessar/SnapEdit
Archived
1
0 Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

front ok back ok just borders

Browse Source
This commit is contained in:
Theophyl Hoguet committed 2023-04-01 17:10:33 +02:00
1 parent 922eb0a905
commit 539af71440
7 files changed
+38 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

backend/src/main/java/pdl/backend/Controller/AlgorithmController.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class AlgorithmController {
private ObjectMapper mapper;
public static List<Algorithm> algorithmList() {
final String[] borderTypes = { "SKIP", "ZERO", "NORMALIZED", "REFLECT", "EXTEND", "WRAP" };
final String[] borderTypes = { "SKIP", "ZERO", "NORMALIZED", "REFLECT", "EXTENDED", "WRAP" };
ArrayList<Algorithm> algorithms = new ArrayList<Algorithm>();
algorithms.add(new Algorithm("Changement de luminosité", "changeLuminosity",
Arrays.asList(new IntegerParameter("delta", "delta", -255, 255, 1)),
backend/src/main/java/pdl/backend/Controller/ImageController.java
+10 -2
View File
@@ -202,9 +202,17 @@ public class ImageController {
if (!parameters.containsKey(p.getName())) {
return JSONError("Parameter '" + p.getName() + "' is missing", HttpStatus.BAD_REQUEST);
}
p.setValue(parameters.get(p.getName()));
try {
p.setValue(parameters.get(p.getName()));
} catch (Exception e) {
return JSONError("Parameter '" + p.getName() + "' is invalid", HttpStatus.BAD_REQUEST);
}
}
try {
a.apply(input);
} catch (Exception e) {
return JSONError("There was an internal server error", HttpStatus.INTERNAL_SERVER_ERROR);
}
a.apply(input);
break;
}
}
backend/src/main/java/pdl/backend/Image/ImageProcessing.java
+6 -28
View File
@@ -295,7 +295,6 @@ public final class ImageProcessing {
* @param borderType type de bord à utiliser pour la convolution
*/
public static void meanFilter(Planar<GrayU8> input, int size, BorderType borderType) {
Planar<GrayU8> output = input.createSameShape();
// Vérification que la taille est impaire
if (size % 2 == 0 || size < 0) {
throw new IllegalArgumentException(
@@ -308,12 +307,6 @@ public final class ImageProcessing {
}
}
convolution(input, kernel, borderType);
for (int i = 0; i < input.width; i++) {
for (int j = 0; j < input.height; j++) {
int[] rgb = getRGBValue(output, i, j);
setRGBValue(input, i, j, rgb);
}
}
}
/**
@@ -327,7 +320,6 @@ public final class ImageProcessing {
* @param borderType Le type de bord à utiliser pour la convolution
*/
public static void gaussienFilter(Planar<GrayU8> input, int size, double sigma, BorderType borderType) {
Planar<GrayU8> output = input.createSameShape();
if (size % 2 == 0 || size < 0 || sigma <= 0) {
throw new IllegalArgumentException(
"La taille doit être impaire et positive et sigma doit être strictement positif");
@@ -364,13 +356,6 @@ public final class ImageProcessing {
}
}
convolution(input, kernelInt, borderType);
// copy all output pixels to input
for (int i = 0; i < input.width; i++) {
for (int j = 0; j < input.height; j++) {
int[] rgb = getRGBValue(output, i, j);
setRGBValue(input, i, j, rgb);
}
}
}
/**
@@ -383,7 +368,7 @@ public final class ImageProcessing {
* @param borderType Le type de bord à utiliser pour la convolution
*/
public static void convolution(Planar<GrayU8> input, int[][] kernel, BorderType borderType) {
Planar<GrayU8> output = input.createSameShape();
Planar<GrayU8> copy = input.clone();
int size = kernel.length;
int half = kernel.length / 2;
int coefs = 0;
@@ -401,9 +386,9 @@ public final class ImageProcessing {
if (y < half || x < half || y >= input.height - half || x >= input.width -
half) {
if (borderType == BorderType.SKIP) {
setRGBValue(output, x, y, getRGBValue(input, x, y));
setRGBValue(input, x, y, getRGBValue(copy, x, y));
} else if (borderType == BorderType.ZERO) {
setRGBValue(output, x, y, new int[] { 0, 0, 0 });
setRGBValue(input, x, y, new int[] { 0, 0, 0 });
} else {
int totalValue[] = new int[3];
int coefsUsed = 0;
@@ -434,8 +419,7 @@ public final class ImageProcessing {
}
}
for (int k = 0; k < totalValue.length; k++) {
totalValue[k] += input.getBand(k).get(tmpi, tmpj)
* kernel[tmpi][tmpj];
totalValue[k] += copy.getBand(k).get(tmpi, tmpj) * kernel[tmpi][tmpj];
}
coefsUsed += kernel[tmpi][tmpj];
}
@@ -454,7 +438,7 @@ public final class ImageProcessing {
for (int j = y - half; j <= y + half; j++) {
for (int i = x - half; i <= x + half; i++) {
for (int k = 0; k < totalValue.length; k++) {
totalValue[k] += input.getBand(k).get(i, j) * kernel[currentJ][currentI];
totalValue[k] += copy.getBand(k).get(i, j) * kernel[currentJ][currentI];
}
currentI++;
}
@@ -464,14 +448,8 @@ public final class ImageProcessing {
for (int k = 0; k < totalValue.length; k++) {
totalValue[k] /= totalCoefs;
}
setRGBValue(output, x, y, totalValue);
setRGBValue(input, x, y, totalValue);
}
});
for (int i = 0; i < input.width; i++) {
for (int j = 0; j < input.height; j++) {
int[] rgb = getRGBValue(output, i, j);
setRGBValue(input, i, j, rgb);
}
}
}
}