starred/Memola
1
0
Fork 0
mirror of https://github.com/dscyrescotti/Memola.git synced 2026-04-18 06:50:03 +02:00
Code Issues 5 Packages Projects Releases 3 Wiki Activity

feat: remove erasers in graphic context

Browse Source
This commit is contained in:
dscyrescotti
2024-06-10 00:51:50 +07:00
parent 89b97be07d
commit 9c10e46213
6 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Memola/Canvas/Contexts/GraphicContext.swift
View File

@@ -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()
}

2
Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift
View File

@@ -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

1
Memola/Features/Memos/MemosView.swift
View File

@@ -85,7 +85,6 @@ struct MemosView: View {
let graphicContextObject = GraphicContextObject(\.viewContext)
graphicContextObject.strokes = []
graphicContextObject.erasers = .init()
memoObject.canvas = canvasObject
memoObject.tool = toolObject

1
Memola/Persistence/Objects/EraserObject.swift
View File

@@ -17,5 +17,4 @@ final class EraserObject: NSManagedObject {
@NSManaged var thickness: CGFloat
@NSManaged var quads: NSMutableOrderedSet
@NSManaged var strokes: NSMutableSet
@NSManaged var graphicContext: GraphicContextObject?
}

1
Memola/Persistence/Objects/GraphicContextObject.swift
View File

@@ -12,5 +12,4 @@ import Foundation
final class GraphicContextObject: NSManagedObject {
@NSManaged var canvas: CanvasObject?
@NSManaged var strokes: NSMutableOrderedSet
@NSManaged var erasers: NSMutableSet
}

2
Memola/Resources/Models/MemolaModel.xcdatamodeld/MemolaModel.xcdatamodel/contents
View File

@@ -12,13 +12,11 @@
<attribute name="createdAt" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="style" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="thickness" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<relationship name="graphicContext" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="GraphicContextObject" inverseName="erasers" inverseEntity="GraphicContextObject"/>
<relationship name="quads" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="QuadObject" inverseName="eraser" inverseEntity="QuadObject"/>
<relationship name="strokes" toMany="YES" deletionRule="Nullify" destinationEntity="StrokeObject" inverseName="erasers" inverseEntity="StrokeObject"/>
</entity>
<entity name="GraphicContextObject" representedClassName="GraphicContextObject" syncable="YES">
<relationship name="canvas" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="CanvasObject" inverseName="graphicContext" inverseEntity="CanvasObject"/>
<relationship name="erasers" toMany="YES" deletionRule="Cascade" destinationEntity="EraserObject" inverseName="graphicContext" inverseEntity="EraserObject"/>
<relationship name="strokes" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="StrokeObject" inverseName="graphicContext" inverseEntity="StrokeObject"/>
</entity>
<entity name="MemoObject" representedClassName="MemoObject" syncable="YES">