Commit a3e1e0da authored by dmMaze's avatar dmMaze
Browse files

fix erasing strokeitem

parent 61352926
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -492,6 +492,7 @@ class DrawingPanel(Widget):
                self.runInpaint()

    def on_finish_erasing(self, stroke_item: StrokeImgItem):
        print("fin erasing")
        stroke_item.finishPainting()
        # inpainted-erasing logic is essentially the same as inpainting
        if self.currentTool == self.inpaintTool:
@@ -510,6 +511,7 @@ class DrawingPanel(Widget):
            inpaint_mask = self.canvas.imgtrans_proj.mask_array[inpaint_rect[1]: inpaint_rect[3], inpaint_rect[0]: inpaint_rect[2]]
            # no inpainted need to be erased
            if inpaint_mask.sum() == 0:
                self.canvas.removeItem(stroke_item)
                return
            mask = cv2.bitwise_and(mask, inpaint_mask)
            inpaint_mask = np.zeros_like(inpainted)
+8 −7
Original line number Diff line number Diff line
@@ -480,6 +480,8 @@ class SceneTextManager(QObject):
    def onAutoLayoutTextblks(self):
        selected_blks = self.get_selected_blkitems()
        old_html_lst, old_rect_lst, trans_widget_lst = [], [], []
        selected_blks = [blk for blk in selected_blks if not blk.is_vertical]
        if len(selected_blks) > 0:
            for blkitem in selected_blks:
                old_html_lst.append(blkitem.toHtml())
                old_rect_lst.append(blkitem.absBoundingRect())
@@ -488,7 +490,6 @@ class SceneTextManager(QObject):

            self.canvasUndoStack.push(AutoLayoutCommand(selected_blks, old_rect_lst, old_html_lst, trans_widget_lst))


    def layout_textblk(self, blkitem: TextBlkItem, text: str = None, mask: np.ndarray = None, bounding_rect: List = None, region_rect: List = None):
        
        img = self.imgtrans_proj.img_array