diff options
| author | Sophie Zhang <sophie_zhang@brown.edu> | 2023-08-18 17:52:41 -0400 |
|---|---|---|
| committer | Sophie Zhang <sophie_zhang@brown.edu> | 2023-08-18 17:52:41 -0400 |
| commit | 79b1be0e8904cd6e7e1591b333e81b503f8ca41e (patch) | |
| tree | 036f32e0bce83d7017ca233dcfe6c54897652659 /src/client/views/nodes/generativeFill | |
| parent | ad2f3695ddfb4a7bec17ddbdf6e7011862936bc4 (diff) | |
cleanup
Diffstat (limited to 'src/client/views/nodes/generativeFill')
3 files changed, 6 insertions, 12 deletions
diff --git a/src/client/views/nodes/generativeFill/GenerativeFill.tsx b/src/client/views/nodes/generativeFill/GenerativeFill.tsx index 06819d08c..547a76348 100644 --- a/src/client/views/nodes/generativeFill/GenerativeFill.tsx +++ b/src/client/views/nodes/generativeFill/GenerativeFill.tsx @@ -33,7 +33,7 @@ interface GenerativeFillProps { addDoc: ((doc: Doc | Doc[], annotationKey?: string) => boolean) | undefined; } -// New field on image doc: gen_fill_children => list of children Docs +// Added field on image doc: gen_fill_children: List of children Docs const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addDoc }: GenerativeFillProps) => { const canvasRef = useRef<HTMLCanvasElement>(null); @@ -191,6 +191,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD }; }, [canvasRef, imageEditorSource]); + // once the appropriate dimensions are set, draw the image to the canvas useEffect(() => { if (!currImg.current) return; ImageUtility.drawImgToCanvas(currImg.current, canvasRef, canvasDims.width, canvasDims.height); @@ -338,7 +339,6 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD if (firstDoc) { const x = 0; const initialY = 0; - const newImg = Docs.Create.ImageDocument(source, { x: x, y: initialY, @@ -347,7 +347,6 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD data_nativeWidth: result.nativeWidth, data_nativeHeight: result.nativeHeight, }); - // add a new doc list field to newimg if (isNewCollection && newCollectionRef.current) { Doc.AddDocToList(newCollectionRef.current, undefined, newImg); } else { @@ -389,6 +388,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD } }; + // Saves an image to the collection const onSave = async (src: string) => { const img = new Image(); img.src = src; @@ -401,13 +401,13 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD } }; + // Closes the editor view const handleViewClose = () => { MainView.Instance.setImageEditorOpen(false); MainView.Instance.setImageEditorSource(''); if (newCollectionRef.current) { newCollectionRef.current.fitContentOnce = true; } - setEdits([]); }; @@ -419,7 +419,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD <FormControlLabel control={ <Checkbox - // disable once edited has been clicked + // disable once edited has been clicked (doesn't make sense to change after first edit) disabled={edited} checked={isNewCollection} onChange={e => { @@ -431,7 +431,7 @@ const GenerativeFill = ({ imageEditorOpen, imageEditorSource, imageRootDoc, addD labelPlacement="end" sx={{ whiteSpace: 'nowrap' }} /> - <Buttons canvasRef={canvasRef} currImg={currImg} getEdit={getEdit} loading={loading} onReset={handleReset} /> + <Buttons getEdit={getEdit} loading={loading} onReset={handleReset} /> <IconButton onClick={handleViewClose}> <BsX color={activeColor} /> </IconButton> diff --git a/src/client/views/nodes/generativeFill/GenerativeFillButtons.tsx b/src/client/views/nodes/generativeFill/GenerativeFillButtons.tsx index e15af0a56..398ba5333 100644 --- a/src/client/views/nodes/generativeFill/GenerativeFillButtons.tsx +++ b/src/client/views/nodes/generativeFill/GenerativeFillButtons.tsx @@ -1,14 +1,9 @@ import { Button } from '@mui/material'; -import { ImageUtility } from './generativeFillUtils/ImageHandler'; -import { canvasSize } from './generativeFillUtils/generativeFillConstants'; import { Oval } from 'react-loader-spinner'; import './GenerativeFillButtons.scss'; import React = require('react'); -import { Doc } from '../../../../fields/Doc'; interface ButtonContainerProps { - canvasRef: React.RefObject<HTMLCanvasElement>; - currImg: React.MutableRefObject<HTMLImageElement | null>; getEdit: () => Promise<void>; loading: boolean; onReset: () => void; diff --git a/src/client/views/nodes/generativeFill/generativeFillUtils/BrushHandler.ts b/src/client/views/nodes/generativeFill/generativeFillUtils/BrushHandler.ts index f84f04190..ace7ebcae 100644 --- a/src/client/views/nodes/generativeFill/generativeFillUtils/BrushHandler.ts +++ b/src/client/views/nodes/generativeFill/generativeFillUtils/BrushHandler.ts @@ -15,7 +15,6 @@ export class BrushHandler { static brushCircleOverlay = (x: number, y: number, brushRadius: number, ctx: CanvasRenderingContext2D, fillColor: string, erase: boolean) => { ctx.globalCompositeOperation = 'destination-out'; - // ctx.globalCompositeOperation = erase ? "destination-out" : "source-over"; ctx.fillStyle = fillColor; ctx.shadowColor = eraserColor; ctx.shadowBlur = 5; |
