Skip to content

dilation size increased to 25 #3

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

dilation size increased to 25 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45e4c5e
dilation size increased to 25
Oct 16, 2022
35ce854
allow the use of a custom structures map view
Oct 16, 2022
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
66 changes: 56 additions & 10 deletions src/ScriptDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const SCRIPT_DESCRIPTION = `<b> ${SCRIPT_NAME} v${version}</b> &mdash; This scr
export const defaultParameters = {
targetViewId: "",
starlessViewId: "",
structuresViewId: "",
structuresMinLayer: 1,
structuresMaxLayer: 3,
binarizeThreshold: 0.2,
Expand Down Expand Up @@ -86,6 +87,7 @@ export function ScriptDialog({

const [targetView, setTargetView] = useState(new View());
const [starlessView, setStarlessView] = useState(new View());
const [structuresView, setStructuresView] = useState(new View());
const [rect, setRect] = useState<Rect>(new Rect());

const [previewImages, setPreviewImages] = useState(
Expand All @@ -100,6 +102,7 @@ export function ScriptDialog({

const targetImage = useMemo(() => targetView?.image, [targetView]);
const starlessImage = useMemo(() => starlessView?.image, [starlessView]);
const structuresMapImage = useMemo(() => structuresView?.image, [structuresView]);
const currentImage = useMemo(() => previewImages[currentStep], [
currentStep,
previewImages,
Expand All @@ -108,23 +111,27 @@ export function ScriptDialog({
useEffect(() => {
setTargetView((View as any).viewById(parameters.targetViewId)); // TODO remove any after updating typings
setStarlessView((View as any).viewById(parameters.starlessViewId));
setStructuresView((View as any).viewById(parameters.structuresViewId));
}, []);

useEffect(() => {
let original = previewImages.original;
let starless = previewImages.starless;
if (targetImage) {
const previewImage = new Image();
previewImage.assign(targetImage);
previewImage.cropTo(rect);
original = previewImage;
setPreviewImages({
original,
starless: previewImages.starless,
starless: starless,
structures: previewImages.structures,
});
setCurrentStep("original");
} else {
setPreviewImages({
starless: previewImages.starless,
structures: previewImages.structures,
});
}

Expand All @@ -135,13 +142,32 @@ export function ScriptDialog({
setPreviewImages({
original,
starless: previewStarlessImage,
structures: previewImages.structures,
});
starless = previewStarlessImage;
} else {
setPreviewImages({
original,
structures: previewImages.structures,
});
}

if (structuresMapImage) {
const previewStructuresImage = new Image();
previewStructuresImage.assign(structuresMapImage);
previewStructuresImage.cropTo(rect);
setPreviewImages({
original,
starless: starless,
structures: previewStructuresImage,
});
} else {
setPreviewImages({
original,
starless: starless,
});
}
}, [rect, targetImage, starlessImage]);
}, [rect, targetImage, starlessImage, structuresMapImage]);

function updateStructuresSettings(updatedParameters: Partial<Parameters>) {
if (updatedParameters.structuresMinLayer) {
Expand All @@ -158,16 +184,18 @@ export function ScriptDialog({
onParameterChange?.("structuresMaxLayer", newParameters.structuresMaxLayer);
}

function process(image: Image, starlessImage: Image) {
function process(image: Image, starlessImage: Image, structuresMapImage?: Image) {
const lumImage = new Image();

console.log("Get Luminance...");
image.getLuminance(lumImage);

console.log("MultiscaleLinearTransform...");
const structuresImage = structures(lumImage, {
minLayer: parameters.structuresMinLayer,
maxLayer: parameters.structuresMaxLayer,
const structuresImage = structuresMapImage && structuresView && !structuresView.isNull
? structuresMapImage
: structures(lumImage, {
minLayer: parameters.structuresMinLayer,
maxLayer: parameters.structuresMaxLayer,
});

console.log("Binarize...");
Expand Down Expand Up @@ -223,6 +251,7 @@ export function ScriptDialog({

function onProcessPreviewClick() {
if (!previewImages.original || !previewImages.starless) {
console.error(previewImages.starless);
return;
}

Expand All @@ -238,7 +267,7 @@ export function ScriptDialog({
convolutedImage,
halosImage,
finalImage,
} = process(previewImages.original, previewImages.starless);
} = process(previewImages.original, previewImages.starless, previewImages.structures);

setPreviewImages({
...previewImages,
Expand Down Expand Up @@ -269,7 +298,7 @@ export function ScriptDialog({
setIsControlsEnabled(false);

try {
const { finalImage } = process(targetImage, starlessImage);
const { finalImage } = process(targetImage, starlessImage, structuresMapImage);

targetView?.beginProcess();
targetView?.image.apply(finalImage);
Expand Down Expand Up @@ -383,6 +412,23 @@ export function ScriptDialog({
</UIHorizontalSizer>

<UIGroupBox title="Structures" spacing={5} margin={5}>
<UIHorizontalSizer>
<UILabel
text="View: "
textAlignment={TextAlign_VertCenter}
minWidth={80}
/>
<UIViewList
currentView={structuresView}
onViewSelected={(view: View) => {
setStructuresView(view);
updateParameter("structuresViewId", view.id);
}}
enabled={Boolean(targetView && !targetView.isNull)}
stretchFactor={1}
/>
</UIHorizontalSizer>

<UIHorizontalSizer>
<UILabel
minWidth={60}
Expand Down Expand Up @@ -479,7 +525,7 @@ export function ScriptDialog({
/>
<UISpinBox
minValue={3}
maxValue={11}
maxValue={25}
stepSize={2}
value={parameters.closingDilationSize}
onValueUpdated={(closingDilationSize) => {
Expand All @@ -498,7 +544,7 @@ export function ScriptDialog({
<UILabel text="Size: " textAlignment={TextAlign_VertCenter} />
<UISpinBox
minValue={3}
maxValue={11}
maxValue={25}
stepSize={2}
value={parameters.dilationSize}
onValueUpdated={(dilationSize) => {
Expand Down
Loading