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

Add morphology operation #874

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import edu.wpi.grip.generated.opencv_imgproc.enumeration.ColorConversionCodesEnum;
import edu.wpi.grip.generated.opencv_imgproc.enumeration.ColormapTypesEnum;
import edu.wpi.grip.generated.opencv_imgproc.enumeration.InterpolationFlagsEnum;
import edu.wpi.grip.generated.opencv_imgproc.enumeration.MorphTypesEnum;
import edu.wpi.grip.generated.opencv_imgproc.enumeration.ThresholdTypesEnum;

import com.google.common.annotations.VisibleForTesting;
Expand Down Expand Up @@ -309,7 +310,28 @@ public class CVOperations {
}
)),

new OperationMetaData(CVOperation.defaults("CV rectangle",
new OperationMetaData(CVOperation.defaults("CV morphologyEx",
"Performs advanced morphological transformations."),
templateFactory.create(
SocketHints.Inputs.createMatSocketHint("src", false),
SocketHints.createEnumSocketHint("op", MorphTypesEnum.MORPH_OPEN),
SocketHints.Inputs.createMatSocketHint("kernel", true),
new SocketHint.Builder<>(Point.class).identifier("anchor").initialValueSupplier(
() -> new Point(-1, -1)).build(),
SocketHints.Inputs.createNumberSpinnerSocketHint("iterations", 1),
SocketHints.createEnumSocketHint("borderType", BorderTypesEnum.BORDER_CONSTANT),
new SocketHint.Builder<>(Scalar.class).identifier("borderValue")
.initialValueSupplier(opencv_imgproc::morphologyDefaultBorderValue).build(),
SocketHints.Outputs.createMatSocketHint("dst"),
(src, op, kernel, anchor, iterations, borderType, borderValue, dst) -> {
opencv_imgproc.morphologyEx(src, dst, op.value, kernel, anchor,
iterations.intValue(), borderType.value, borderValue);
}
)),



new OperationMetaData(CVOperation.defaults("CV rectangle",
"Draw a rectangle (outline or filled) on an image."),
templateFactory.create(
SocketHints.Inputs.createMatSocketHint("src", false),
Expand Down Expand Up @@ -426,6 +448,20 @@ public enum CVBorderTypesEnum {
}
}

public enum CVMorphTypesEnum {
MORPH_OPEN(MorphTypesEnum.MORPH_OPEN.value),
MORPH_CLOSE(MorphTypesEnum.MORPH_CLOSE.value),
MORPH_GRADIENT(MorphTypesEnum.MORPH_GRADIENT.value),
MORPH_TOPHAT(MorphTypesEnum.MORPH_TOPHAT.value),
MORPH_BLACKHAT(MorphTypesEnum.MORPH_BLACKHAT.value);

public final int value;

CVMorphTypesEnum(int value) {
this.value = value;
}
}


/**
* All of the operations that this list supplies.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package edu.wpi.grip.core.operations.opencv;


import edu.wpi.grip.core.Description;
import edu.wpi.grip.core.OperationDescription;
import edu.wpi.grip.core.sockets.InputSocket;
import edu.wpi.grip.core.sockets.OutputSocket;
import edu.wpi.grip.core.sockets.SocketHint;
import edu.wpi.grip.core.sockets.SocketHints;

import com.google.inject.Inject;

import org.bytedeco.javacpp.opencv_core.Mat;
import org.bytedeco.javacpp.opencv_core.Size;
import org.bytedeco.javacpp.opencv_imgproc;
import org.python.google.common.collect.ImmutableList;

import java.util.List;

@Description(name = "New Kernel",
summary = "Create a kernel of custom size",
category = OperationDescription.Category.OPENCV,
iconName = "kernel")
public class NewKernelOperation implements CVOperation {

private final SocketHint<KernelEnum> typeHint = SocketHints.createEnumSocketHint("kernelType",
KernelEnum.MORPH_RECT);
private final SocketHint<Number> widthHint = SocketHints.Inputs
.createNumberSpinnerSocketHint("width", 1, 1, Integer.MAX_VALUE);
private final SocketHint<Number> heightHint = SocketHints.Inputs
.createNumberSpinnerSocketHint("height", 1, 1, Integer.MAX_VALUE);
private final SocketHint<Mat> outputHint = SocketHints.Outputs.createMatSocketHint("kernel");


private final InputSocket<Number> widthSocket;
private final InputSocket<Number> heightSocket;
private final InputSocket<KernelEnum> typeSocket;

private final OutputSocket<Mat> outputSocket;

@Inject
@SuppressWarnings("JavadocMethod")
public NewKernelOperation(InputSocket.Factory inputSocketFactory,
OutputSocket.Factory outputSocketFactory) {
this.typeSocket = inputSocketFactory.create(typeHint);
this.widthSocket = inputSocketFactory.create(widthHint);
this.heightSocket = inputSocketFactory.create(heightHint);
this.outputSocket = outputSocketFactory.create(outputHint);
}

@Override
public List<InputSocket> getInputSockets() {
return ImmutableList.of(
typeSocket,
widthSocket,
heightSocket
);
}

@Override
public List<OutputSocket> getOutputSockets() {
return ImmutableList.of(
outputSocket
);
}

@Override
public void perform() {
final int widthValue = widthSocket.getValue().get().intValue();
final int heightValue = heightSocket.getValue().get().intValue();
final int kernelType = typeSocket.getValue().get().value;

outputSocket.setValue(opencv_imgproc.getStructuringElement(kernelType, new Size(widthValue,
heightValue)));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't this allocate a new matrix every time this perform method is called.
Don't you instead want to pass in an existing matrix so the memory can be reused?

Copy link
Author

@ArchdukeTim ArchdukeTim Dec 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally you'd create the kernel once with all the variables, but idk how to get that behavior.

Do you mean the Size matrix?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be an overload that takes a dest as a parameter.

Copy link
Author

@ArchdukeTim ArchdukeTim Dec 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand. Is there an example in the code I can copy?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately no.
What we are trying to avoid is allocating new memory on every call.
So there should be an alternative method called getStructuringElement that takes an additional arg called dest. You can pass a pre-allocated matrix so we aren't allocating more memory on every call.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's december of the next year, which means it's my turn to comment 😂

Going back and looking through this, I understand what we are going for, but not sure how that functionality is created in GRIP. The kernel creating isn't part of the pipeline, just the setup, although I think i'm combining the code generation with the actual application..lemme see what I can come up with for the application part and then I'll worry about code gen later

}

public enum KernelEnum {
MORPH_RECT(0),
MORPH_CROSS(1),
MORPH_ELLIPSE(2);

public final int value;

KernelEnum(int value) {
this.value = value;
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* Performs advanced morphology functions.
* @param src the Image to morph.
* @param op the morph operation
* @param kernel the kernel for morphing.
* @param anchor the center of the kernel.
* @param iterations the number of times to perform the morph.
* @param borderType pixel extrapolation method.
* @param borderValue value to be used for a constant border.
* @param dst Output Image.
*/
void $className::#func($step ["src", "op", "kernel", "anchor", "iterations", "borderType", "borderValue", "dst"]) {
cv::morphologyEx(src, dst, op, kernel, anchor, (int)iterations, borderType, borderValue);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Creates kernel of given shape and size
* @param shape the kernels MorphShape.
* @param size the size of the kernel.
*/
void $className::#func($step ["shape", "size"]) {
return cv::getStructuringElement(shape, size));
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* Performs advanced morphology functions.
* @param src the Image to morph.
* @param op the operation to perform.
* @param kernel the kernel for morphing.
* @param anchor the center of the kernel.
* @param iterations the number of times to perform the morph.
* @param borderType pixel extrapolation method.
* @param borderValue value to be used for a constant border.
* @param dst Output Image.
*/
private void $tMeth.name($step.name())(Mat src, MorphType op, Mat kernel, Point anchor, double iterations,
int borderType, Scalar borderValue, Mat dst) {
if (kernel == null) {
kernel = new Mat();
}
if (anchor == null) {
anchor = new Point(-1,-1);
}
if (borderValue == null) {
borderValue = new Scalar(-1);
}
Imgproc.morphologyEx(src, dst, op, kernel, anchor, (int)iterations, borderType, borderValue);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Creates a kernel of given shape and size.
* @param shape the kernels MorphShape.
* @param size the size of the kernel.
*/
private void $tMeth.name($step.name())(Mat shape, Size size) {
Imgproc.getStructuringElement(shape, size);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@staticmethod
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this and it works

def $tMeth.name($step.name())(src, op, kernel, anchor, iterations, border_type, border_value):
"""Expands area of lower value in an image.
Args:
src: A numpy.ndarray.
kernel: The kernel for erosion. A numpy.ndarray.
iterations: the number of times to erode.
border_type: Opencv enum that represents a border type.
border_value: value to be used for a constant border.
Returns:
A numpy.ndarray after erosion.
"""
return cv2.morphologyEx(src, op, kernel, anchor, iterations = (int) (iterations +0.5),
borderType = border_type, borderValue = border_value)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@staticmethod
def $tMeth.name($step.name())(shape, width, height):
"""Creates kernel of given shape and size.
Args:
shape: The kernel MorphShape
size: Size of kernel as a tuple
Returns:
A numpy.ndarray representing the kernel.
"""
return cv2.getStructuringElement(shape, (int(width), int(height)))