Skip to content

Allow inverting mask for inpainting and img2img #340

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 1 commit into
base: master
Choose a base branch
from
Open

Allow inverting mask for inpainting and img2img #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions electron_app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion electron_app/src/components/Img2Img.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->

<div v-if="inp_img" @drop.prevent="onDragFile" @dragover.prevent class="image_area" :class="{ crosshair_cur : is_inpaint }" style="height: calc(100% - 200px); border-radius: 16px; padding:5px;">
<ImageCanvas ref="inp_img_canvas" :is_inpaint="is_inpaint" :image_source="inp_img" :is_disabled="!stable_diffusion.is_input_avail" canvas_id="img2imgcan" canvas_d_id="img2imgcand" ></ImageCanvas>
<ImageCanvas ref="inp_img_canvas" :is_invert="is_invert" :is_inpaint="is_inpaint" :image_source="inp_img" :is_disabled="!stable_diffusion.is_input_avail" canvas_id="img2imgcan" canvas_d_id="img2imgcand" ></ImageCanvas>
</div>
<div v-else @drop.prevent="onDragFile" @dragover.prevent @click="open_input_image" class="image_area" :class="{ pointer_cursor : is_sd_active }" style="height: calc(100% - 200px); border-radius: 16px; padding:5px;">
<center>
Expand All @@ -20,6 +20,7 @@
<div v-if="inp_img && stable_diffusion.is_input_avail" class="l_button" @click="inp_img =''">Clear</div>
<div v-if="inp_img && stable_diffusion.is_input_avail && !is_inpaint" class="l_button" @click="is_inpaint = !is_inpaint ">Draw Mask</div>
<div v-if="inp_img && stable_diffusion.is_input_avail && is_inpaint" class="l_button" @click="is_inpaint = !is_inpaint ">Remove Mask</div>
<div v-if="inp_img && stable_diffusion.is_input_avail && is_inpaint" class="l_button" @click="is_invert = !is_invert ">Invert Mask</div>

<br> <br>
<textarea
Expand Down Expand Up @@ -134,6 +135,7 @@ export default {
img_h : 512 ,
img_w : 512 ,
is_inpaint : false,
is_invert : false,
guidence_scale : 7.5 ,

is_negative_prompt_avail : false,
Expand Down
4 changes: 3 additions & 1 deletion electron_app/src/components/Inpainting.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<div v-if="inp_img && stable_diffusion.is_input_avail" class="l_button" style="float:right " @click="clear" > Reset</div>
<div v-if="undo_history.length > 0 && stable_diffusion.is_input_avail" class="l_button" style="float:right " @click="do_undo" > Undo</div>
<div v-if="inp_img " class="l_button" style="float:right " @click="save_img" > Save Image</div>
<div v-if="inp_img " class="l_button" style="float:right " @click="is_invert = !is_invert" > Invert Mask</div>
<div v-if="retry_params && stable_diffusion.is_input_avail" class="l_button" style="float:right " @click="generate(true)"> Retry</div>


Expand All @@ -18,7 +19,7 @@
</div>

<div class="inapint_container" @drop.prevent="onDragFile" @dragover.prevent>
<ImageCanvas style="cursor: crosshair;" v-if="inp_img" ref="inp_img_canvas" :is_inpaint="true" :image_source="inp_img" :is_disabled="!stable_diffusion.is_input_avail" id="inpaint" canvas_id="inpaintcan" canvas_d_id="inpaintcand" :stroke_size_no="stroke_size_no" ></ImageCanvas>
<ImageCanvas style="cursor: crosshair;" v-if="inp_img" ref="inp_img_canvas" :is_inpaint="true" :is_invert="is_invert" :image_source="inp_img" :is_disabled="!stable_diffusion.is_input_avail" id="inpaint" canvas_id="inpaintcan" canvas_d_id="inpaintcand" :stroke_size_no="stroke_size_no" ></ImageCanvas>
<div v-else @click="open_input_image" style=" " :class="{ pointer_cursor : is_sd_active }" >
<center>
<p style="padding-top: calc( 50vh - 115px);padding-bottom: calc( 50vh - 155px); opacity: 70%;" >Click to add input image and draw a mask</p>
Expand Down Expand Up @@ -95,6 +96,7 @@ export default {
undo_history : [],
retry_params: undefined,
stroke_size_no : "30",
is_invert: false,
"history_key" : "",
};
},
Expand Down
23 changes: 22 additions & 1 deletion electron_app/src/components_bare/ImageCanvas.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default {
canvas_d_id : String,
canvas_id: String,
stroke_size_no : String,
is_invert: Boolean,
},
components: {},
computed: {
Expand Down Expand Up @@ -192,6 +193,19 @@ export default {
ctx.clearRect(0, 0, canvas.width, canvas.height);
this.is_something_drawn = false
},
invert_inpaint(){
let canvas = document.getElementById(this.canvas_id);
let ctx = canvas.getContext("2d");

let prevCompositionState = ctx.globalCompositeOperation
try {
ctx.globalCompositeOperation = 'xor'
ctx.fillStyle = this.stroke_color;
ctx.fillRect(0, 0, canvas.width, canvas.height);
} finally {
ctx.globalCompositeOperation = prevCompositionState
}
},
on_img_change(){
let that = this;
addImageProcess('file://'+this.image_source).then(function(img_tag){
Expand Down Expand Up @@ -261,7 +275,14 @@ export default {
}
},
deep: true
} ,
},

'is_invert': {
handler: function() {
this.invert_inpaint();
},
deep: true
}
}
}
</script>
Expand Down