OCD support improvements #1796
Merged
OCD support improvements #1796
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dg0yt
force-pushed
the
ocd-combined-symbols
branch
from
ce79c9e to
83be602
Compare
When "double lines" are not explicitly turned of for a line symbol, but all related widths are zero, there is no visible result. There is no significant benefit in preserving all double line properties by construction of a CombinedSymbol, but there is the downside of Mapper of having shortcomings in exporting nested CombinedSymbols (e.g. area with border line). Also, the user interface is less convenient for CombinedSymbol when the user expects to edit a simple line.
We must create breakdown records for all CombinedSymbol objects, even if they are mapped to a simple OCD symbol. The breakdown record is needed during the export of path objects having a CombinedSymbol. (Symbols triggering the crash have been created on OCD import for some area symbols with border.)
... to the "case" branch handling CombinedSymbol with 2 parts. This the only case which we handle for area-with-border, so this should be reflected by the structure of the code.
In particular, use the local `border_duplicate` as much as possible, so that requirements on the type of `border_symbol` are reduced to class `Symbol` in that block. This change prepares the handling of border lines which are CombinedSymbol in Mapper.
Handle border lines which are represented by CombinedSymbol in Mapper. Such symbols were created by OcdFileImport in the past, but could also be constructed manually.
Avoid undefined behaviour.
dg0yt
force-pushed
the
ocd-combined-symbols
branch
from
83be602 to
8c6be46
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Avoid some pointless imports of OCD line symbols as combined symbols.
Fix export of area-with-border even for (some) borders which are combined symbols.
Turn Q_UNREACHABLE into proper exceptions in order to avoid aborting or UB.