Add files via upload

CanvasToolLone/index.py

@@ -93,6 +93,18 @@ def grabwfsmodels():
     wfs = os.listdir(path)
     return{"models":models,"wfs":wfs}
 
+@app.route("/cancelgen",methods=['GET', 'POST','DELETE'])
+def cancelgen():
+    data = {
+        "lastimage":f"{os.path.abspath(os.path.join(os.path.join(os.path.realpath(__file__), os.pardir), os.pardir))}/CanvasToolLone/cropped.png",
+        "done":"y"
+    }
+    json_object = json.dumps(data, indent=4)
+    path = Path("./lastimage.json")
+    with open(path, "w") as outfile:
+        outfile.write(json_object)
+    return{}
+
 @app.route("/grabwfparams",methods=['GET', 'POST','DELETE'])
 def grabwfparams():
     wf = request.json["wf"]
@@ -140,6 +152,7 @@ def generate():
 @app.route("/savedata",methods=['GET', 'POST','DELETE'])
 def savedata():
     global image
+    img2img = "inpaint"
     print("trigerred")
     taesd = request.json["taesd"]
     savedata = request.json["savedata"]
@@ -311,6 +324,7 @@ def savedata():
             bg2 = bg2.resize((bg2.size[0]-ff*2,bg2.size[1]-ff*2))
             border.paste(bg2,(ff,ff))
             bg2 = border
+            img2img = "img2img"
         bg2 = bg2.filter(ImageFilter.BoxBlur(ff-int(ff/2)))
         bg2.save("mask.png")
         width = int(float(savedata["additionaldims"]["left"])) + int(float(savedata["additionaldims"]["right"]))
@@ -397,7 +411,7 @@ def savedata():
         width = ""
         height = ""
     #time.sleep(0.1)
-    return {"img":byte_im,"width":width,"height":height,"data":savedata,"flag":str(realflag),"taesd":taesds}
+    return {"img":byte_im,"width":width,"height":height,"data":savedata,"flag":str(realflag),"taesd":taesds,"img2img":img2img}
 
 @app.route("/refresh",methods=['GET', 'POST','DELETE'])
 def refresh():

CanvasToolLone/static/index.css

@@ -423,4 +423,19 @@ label p{
 }
 #paramvalue{
     text-align: center;
+}
+#cancel{
+    position: fixed;
+    width: 20%;
+    height: 5%;
+    top: 12%;
+    left: 94%;
+    visibility: hidden;
+    color: wheat;
+    transform: rotate(45deg);
+    cursor: pointer;
+    font-size: 150px;
+}
+#cancel:hover{
+    filter: brightness(50%);
 }

CanvasToolLone/static/index.js

@@ -224,6 +224,8 @@ window.onload = function(){
                     newel.id = "source"+num;
                     newel.className = "canvas";
                     newel.style.position = "fixed";
+                    newel.style.left = parseInt(document.getElementById("source").style.left) + document.getElementById("source").width + "px";
+                    newel.style.top = document.getElementById("source").style.top;
                     document.getElementById("canvascontainer").append(newel);
                     img = new Image();
                     img.onload = function() {
@@ -282,6 +284,8 @@ window.onload = function(){
             newel.id = "source"+num;
             newel.className = "canvas";
             newel.style.position = "fixed";
+            newel.style.left = parseInt(document.getElementById("source").style.left) + document.getElementById("source").width + "px";
+            newel.style.top = document.getElementById("source").style.top;
             document.getElementById("canvascontainer").append(newel);
             img = new Image();
             img.onload = function() {
@@ -365,6 +369,11 @@ function setreftoggle(){
     else{
         document.getElementById("selector").style.border = "2px solid green";
         document.getElementById("setref").style.backgroundColor = "gray";
+        ll = false;
+        lr = false;
+        lt = false;
+        lb = false;
+        document.getElementById("lockbox").style.backgroundColor = "gray";
     }
 }
 function resetimg(){
@@ -760,6 +769,14 @@ function generate(){
     });
 }
 
+function cancelgen(){
+    fetch('http://localhost:5000/cancelgen')
+    .then(function (response){
+        return response.json();
+    })
+    .then(data=>{
+    });
+}
 function saved(savedata){
     var responseClone; // 1    
     var canvas = document.getElementById("source");
@@ -800,6 +817,8 @@ function saved(savedata){
         document.getElementById("selector").style.visibility = "hidden";
         document.getElementById("saveexit").style.visibility = "hidden";
         document.getElementById("undo").style.visibility = "hidden";
+        document.getElementById("moveimglistner").style.visibility = "hidden";
+        document.getElementById("cancel").style.visibility = "visible";
         if(genflag==false){
             generate();
             genflag = true;
@@ -818,10 +837,7 @@ function saved(savedata){
                     canvas.style.top = boxtop;
                     //var maincanv = document.getElementById("source");
                     //document.getElementById("source").remove();
-                    if(parseFloat(boxleft)>=parseFloat(document.getElementById("source").style.left) 
-                    && parseFloat(boxtop)>=parseFloat(document.getElementById("source").style.top)
-                    && parseFloat(boxleft)+canvas.width<=parseFloat(document.getElementById('source').getBoundingClientRect()["right"])
-                    && parseFloat(boxtop)+canvas.height<=parseFloat(document.getElementById('source').getBoundingClientRect()["bottom"])            
+                    if(data["img2img"]=="img2img"       
                     ){
                         canvas.style.zIndex = "4";
                     }
@@ -925,6 +941,8 @@ function saved(savedata){
             document.getElementById("settings").style.visibility = "visible";
             document.getElementById("selector").style.visibility = "visible";
             document.getElementById("undo").style.visibility = "visible";
+            document.getElementById("moveimglistner").style.visibility = "visible";
+            document.getElementById("cancel").style.visibility = "hidden";
             taesd = "false";
             canvasflag = true;
             genflag = false;

CanvasToolLone/templates/index.html

@@ -56,6 +56,7 @@
                 
                 
             </div>
+            <div id="cancel" onclick="cancelgen();">+</div>
             <div id="settings2">
                 <div id="moveimg1"  onclick="moveimgenable();"><p class="txt">Move Image</p></div>
                 <div id="done" onclick="compimage();"><p class="txt">Done</p></div>

CanvasToolLone/workflows/ref_ipadapter_workflow.json

@@ -106,14 +106,14 @@
         1
       ],
       "cfg": 1.5,
-      "reference_style_fidelity": 0.1,
+      "reference_style_fidelity": 0.05,
       "batch": 1,
       "strength": 1,
       "prompt_weighting": "disable",
       "controlnet_weight": 1,
       "reference_only": "enable",
       "ip_adapter": "enable",
-      "ipadapter_scale": 0.25,
+      "ipadapter_scale": 0.1,
       "mask": [
         "16",
         1