Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes paste image to upload

Browse Source
This commit is contained in:
psychedelicious 2022-11-19 18:20:40 +11:00 committed by blessedcoolant
parent 37a356d377
commit 5fd43fca13
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/src/common/components/ImageUploader.tsx
View File

@ -8,8 +8,6 @@ import {
import { useAppDispatch, useAppSelector } from 'app/store'; import { useAppDispatch, useAppSelector } from 'app/store';
import { FileRejection, useDropzone } from 'react-dropzone'; import { FileRejection, useDropzone } from 'react-dropzone';
import { useToast } from '@chakra-ui/react'; import { useToast } from '@chakra-ui/react';
// import { uploadImage } from 'app/socketio/actions';
import { UploadImagePayload } from 'app/invokeai';
import { ImageUploaderTriggerContext } from 'app/contexts/ImageUploaderTriggerContext'; import { ImageUploaderTriggerContext } from 'app/contexts/ImageUploaderTriggerContext';
import { activeTabNameSelector } from 'features/options/store/optionsSelectors'; import { activeTabNameSelector } from 'features/options/store/optionsSelectors';
import { tabDict } from 'features/tabs/components/InvokeTabs'; import { tabDict } from 'features/tabs/components/InvokeTabs';
@ -46,8 +44,6 @@ const ImageUploader = (props: ImageUploaderProps) => {
const fileAcceptedCallback = useCallback( const fileAcceptedCallback = useCallback(
async (file: File) => { async (file: File) => {
// setIsHandlingUpload(true);
dispatch(uploadImage({ imageFile: file })); dispatch(uploadImage({ imageFile: file }));
}, },
[dispatch] [dispatch]
@ -122,12 +118,7 @@ const ImageUploader = (props: ImageUploaderProps) => {
return; return;
} }
// const payload: UploadImagePayload = { file }; dispatch(uploadImage({ imageFile: file }));
// if (['img2img', 'inpainting'].includes(activeTabName)) {
// payload.destination = activeTabName as ImageUploadDestination;
// }
// dispatch(uploadImage(payload));
}; };
document.addEventListener('paste', pasteImageListener); document.addEventListener('paste', pasteImageListener);
return () => { return () => {
@ -135,7 +126,9 @@ const ImageUploader = (props: ImageUploaderProps) => {
}; };
}, [dispatch, toast, activeTabName]); }, [dispatch, toast, activeTabName]);
const overlaySecondaryText = ['img2img', 'unifiedCanvas'].includes(activeTabName) const overlaySecondaryText = ['img2img', 'unifiedCanvas'].includes(
activeTabName
)
? ` to ${tabDict[activeTabName as keyof typeof tabDict].tooltip}` ? ` to ${tabDict[activeTabName as keyof typeof tabDict].tooltip}`
: ``; : ``;

22
frontend/src/features/canvas/store/canvasSlice.ts
View File

@ -154,6 +154,8 @@ export const canvasSlice = createSlice({
}, },
setInitialCanvasImage: (state, action: PayloadAction<InvokeAI.Image>) => { setInitialCanvasImage: (state, action: PayloadAction<InvokeAI.Image>) => {
const image = action.payload; const image = action.payload;
const { stageDimensions } = state;
const newBoundingBoxDimensions = { const newBoundingBoxDimensions = {
width: roundDownToMultiple(_.clamp(image.width, 64, 512), 64), width: roundDownToMultiple(_.clamp(image.width, 64, 512), 64),
height: roundDownToMultiple(_.clamp(image.height, 64, 512), 64), height: roundDownToMultiple(_.clamp(image.height, 64, 512), 64),
@ -174,6 +176,7 @@ export const canvasSlice = createSlice({
state.boundingBoxCoordinates = newBoundingBoxCoordinates; state.boundingBoxCoordinates = newBoundingBoxCoordinates;
state.pastLayerStates.push(state.layerState); state.pastLayerStates.push(state.layerState);
state.layerState = { state.layerState = {
...initialLayerState, ...initialLayerState,
objects: [ objects: [
@ -191,6 +194,25 @@ export const canvasSlice = createSlice({
state.futureLayerStates = []; state.futureLayerStates = [];
state.isCanvasInitialized = false; state.isCanvasInitialized = false;
const newScale = calculateScale(
stageDimensions.width,
stageDimensions.height,
image.width,
image.height,
STAGE_PADDING_PERCENTAGE
);
const newCoordinates = calculateCoordinates(
stageDimensions.width,
stageDimensions.height,
0,
0,
image.width,
image.height,
newScale
);
state.stageScale = newScale;
state.stageCoordinates = newCoordinates;
state.doesCanvasNeedScaling = true; state.doesCanvasNeedScaling = true;
}, },
setStageDimensions: (state, action: PayloadAction<Dimensions>) => { setStageDimensions: (state, action: PayloadAction<Dimensions>) => {