diff --git a/Memola/Canvas/Contexts/GraphicContext.swift b/Memola/Canvas/Contexts/GraphicContext.swift index d54af58..20da0fc 100644 --- a/Memola/Canvas/Contexts/GraphicContext.swift +++ b/Memola/Canvas/Contexts/GraphicContext.swift @@ -160,7 +160,7 @@ extension GraphicContext { thickness: pen.thickness ) eraserStroke.graphicContext = self - withPersistence(\.backgroundContext) { [graphicContext = object, _stroke = eraserStroke] context in + withPersistence(\.backgroundContext) { [_stroke = eraserStroke] context in let stroke = EraserObject(\.backgroundContext) stroke.bounds = _stroke.bounds stroke.color = _stroke.color @@ -169,8 +169,6 @@ extension GraphicContext { stroke.createdAt = _stroke.createdAt stroke.quads = [] stroke.strokes = .init() - stroke.graphicContext = graphicContext - graphicContext?.erasers.add(stroke) _stroke.object = stroke try context.saveIfNeeded() } diff --git a/Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift b/Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift index 38637c3..68f669f 100644 --- a/Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift +++ b/Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift @@ -65,7 +65,7 @@ final class PenStroke: Stroke, @unchecked Sendable { bounds: object.bounds, color: object.color, style: style, - createdAt: object.createdAt, + createdAt: object.createdAt, // sometimes crash here thickness: object.thickness ) self.object = object diff --git a/Memola/Features/Memos/MemosView.swift b/Memola/Features/Memos/MemosView.swift index 6ff6fe9..331016c 100644 --- a/Memola/Features/Memos/MemosView.swift +++ b/Memola/Features/Memos/MemosView.swift @@ -85,7 +85,6 @@ struct MemosView: View { let graphicContextObject = GraphicContextObject(\.viewContext) graphicContextObject.strokes = [] - graphicContextObject.erasers = .init() memoObject.canvas = canvasObject memoObject.tool = toolObject diff --git a/Memola/Persistence/Objects/EraserObject.swift b/Memola/Persistence/Objects/EraserObject.swift index 5c35ab5..7c5ac48 100644 --- a/Memola/Persistence/Objects/EraserObject.swift +++ b/Memola/Persistence/Objects/EraserObject.swift @@ -17,5 +17,4 @@ final class EraserObject: NSManagedObject { @NSManaged var thickness: CGFloat @NSManaged var quads: NSMutableOrderedSet @NSManaged var strokes: NSMutableSet - @NSManaged var graphicContext: GraphicContextObject? } diff --git a/Memola/Persistence/Objects/GraphicContextObject.swift b/Memola/Persistence/Objects/GraphicContextObject.swift index 9d97a0b..f62a765 100644 --- a/Memola/Persistence/Objects/GraphicContextObject.swift +++ b/Memola/Persistence/Objects/GraphicContextObject.swift @@ -12,5 +12,4 @@ import Foundation final class GraphicContextObject: NSManagedObject { @NSManaged var canvas: CanvasObject? @NSManaged var strokes: NSMutableOrderedSet - @NSManaged var erasers: NSMutableSet } diff --git a/Memola/Resources/Models/MemolaModel.xcdatamodeld/MemolaModel.xcdatamodel/contents b/Memola/Resources/Models/MemolaModel.xcdatamodeld/MemolaModel.xcdatamodel/contents index 862dffc..c9ca0bf 100644 --- a/Memola/Resources/Models/MemolaModel.xcdatamodeld/MemolaModel.xcdatamodel/contents +++ b/Memola/Resources/Models/MemolaModel.xcdatamodeld/MemolaModel.xcdatamodel/contents @@ -12,13 +12,11 @@ - -