コマ内に画像を保存する際、上部にPolygonがあるとエラーになる問題を修正

Author: new-sankaku

js/ai/ComfyUI/comfyui-management.js

@@ -176,11 +176,11 @@ throw new Error(result.message);
 
 if(isPanel(layer)){
 var center=calculateCenter(layer);
-putImageInFrame(result,center.centerX,center.centerY);
+putImageInFrame(result,center.centerX,center.centerY,false,false,true,layer);
 }else if(layer.clipPath){
 layer.visible=false;
 var center=calculateCenter(layer);
-putImageInFrame(result,center.centerX,center.centerY);
+putImageInFrame(result,center.centerX,center.centerY,false,false,true,layer);
 }else{
 layer.visible=false;
 replaceImageObject(layer,result,Type);

js/ai/sdwebui/sdwebui-single-call-api.js

@@ -20,7 +20,7 @@ const webpImg=await img2webp(img);
 webpImg.name=imageName;
 setImage2ImageInitPrompt(webpImg);
 const {centerX,centerY}=calculateCenter(layer);
-putImageInFrame(webpImg,centerX,centerY);
+putImageInFrame(webpImg,centerX,centerY,false,false,true,layer);
 
 const infoObject=JSON.parse(responseData.info);
 layer.tempSeed=infoObject.seed;
@@ -120,7 +120,7 @@ return new Promise((resolve,reject)=>{
 fabric.Image.fromURL(responseData,(img)=>{
 if (img) {
 const {centerX,centerY}=calculateCenter(layer);
-putImageInFrame(img,centerX,centerY);
+putImageInFrame(img,centerX,centerY,false,false,true,layer);
 resolve(img);
 visibleChange(layer);
 } else {

js/shortcut.js

@@ -210,7 +210,7 @@ activeObject.left+
 const y=
 activeObject.top+
 (activeObject.height*activeObject.scaleY)/2;
-putImageInFrame(img,x,y);
+putImageInFrame(img,x,y,false,false,true,activeObject);
 } else {
 isActive=false;
 const canvasWidth=canvas.width/2;

js/sidebar/panel/panel-manager.js

@@ -129,20 +129,20 @@ updateLayerPanel();
 }
 
 
-function putImageInFrame(imgOrSvg,x,y,isNotActive=false,notReplace=false,isFit=true) {
+function putImageInFrame(imgOrSvg,x,y,isNotActive=false,notReplace=false,isFit=true,targetLayer=null) {
 let obj;
 
 if (typeof imgOrSvg==='string'&&imgOrSvg.startsWith('<svg')) {
 fabric.loadSVGFromString(imgOrSvg,function(objects,options) {
 obj=fabric.util.groupSVGElements(objects,options);
-placeObject(obj,x,y,isNotActive,true,isFit);
+placeObject(obj,x,y,isNotActive,true,isFit,targetLayer);
 });
 } else {
 obj=imgOrSvg;
-placeObject(obj,x,y,isNotActive,notReplace,isFit);
+placeObject(obj,x,y,isNotActive,notReplace,isFit,targetLayer);
 }
 
-function placeObject(obj,x,y,isNotActive,notReplace,isFit) {
+function placeObject(obj,x,y,isNotActive,notReplace,isFit,targetLayer) {
 if(isFit){
 obj.set({left: x,top: y});
 }
@@ -154,7 +154,7 @@ if(notReplace){
 canvas.add(obj);
 }
 
-var targetFrameIndex=findTargetFrame(x,y);
+var targetFrameIndex=targetLayer?canvas.getObjects().indexOf(targetLayer):findTargetFrame(x,y);
 console.log("targetFrameIndex",targetFrameIndex);
 if (targetFrameIndex!==-1) {
 var targetFrame=canvas.item(targetFrameIndex);

js/sidebar/tone/focusline.js

@@ -210,7 +210,7 @@ var activeObject=getLastObject();
 if (isPanel(activeObject)) {
 var canvasX=activeObject.left+(activeObject.width*activeObject.scaleX)/2;
 var canvasY=activeObject.top+(activeObject.height*activeObject.scaleY)/2;
-var obj=putImageInFrame(svgString,canvasX,canvasY,true);
+var obj=putImageInFrame(svgString,canvasX,canvasY,true,false,true,activeObject);
 obj.name='Focus Line';
 canvas.add(obj);
 nowFocusLine=obj;

js/sidebar/tone/snow-tone.js

@@ -162,7 +162,7 @@ var activeObject=getLastObject();
 if (isPanel(activeObject)) {
 var canvasX=activeObject.left+(activeObject.width*activeObject.scaleX)/2;
 var canvasY=activeObject.top+(activeObject.height*activeObject.scaleY)/2;
-putImageInFrame(img,canvasX,canvasY,true);
+putImageInFrame(img,canvasX,canvasY,true,false,true,activeObject);
 img.name='Snow Tone';
 nowSnowTone=img;
 }else{

js/sidebar/tone/speedline.js

@@ -178,7 +178,7 @@ var activeObject=getLastObject();
 if(isPanel(activeObject)){
 var canvasX=(activeObject.left+(activeObject.width*activeObject.scaleX/2))  ;
 var canvasY=(activeObject.top+(activeObject.height*activeObject.scaleY/2)) ;
-putImageInFrame(img,canvasX,canvasY,true);
+putImageInFrame(img,canvasX,canvasY,true,false,true,activeObject);
 img.name='Speed Line';
 }else{
 img.name='Speed Line';

js/sidebar/tone/tone-noise.js

@@ -139,7 +139,7 @@ var activeObject=getLastObject();
 if (isPanel(activeObject)) {
 var canvasX=activeObject.left+(activeObject.width*activeObject.scaleX)/2;
 var canvasY=activeObject.top+(activeObject.height*activeObject.scaleY)/2;
-putImageInFrame(img,canvasX,canvasY,true);
+putImageInFrame(img,canvasX,canvasY,true,false,true,activeObject);
 img.name='Tone Noise';
 nowToneNoise=img;
 }else{

js/sidebar/tone/tone.js

@@ -181,7 +181,7 @@ var activeObject=getLastObject();
 if(isPanel(activeObject)){
 var canvasX=(activeObject.left+(activeObject.width*activeObject.scaleX/2))  ;
 var canvasY=(activeObject.top+(activeObject.height*activeObject.scaleY/2)) ;
-putImageInFrame(img,canvasX,canvasY,true);
+putImageInFrame(img,canvasX,canvasY,true,false,true,activeObject);
 img.name='Tone';
 }else{
 img.scaleToWidth(canvas.width);