Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Persist OCD color numbers #2158

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Persist OCD color numbers #2158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
747f383
Map: Rename color manipulation methods
lpechacek Jun 28, 2024
ba1fec3
MapColor, XMLFile: Introduce color id
lpechacek Jun 28, 2024
78b2b95
Update examples and symbol sets with color id
lpechacek Jun 28, 2024
8b38150
OcdFileImport/Export: Persist OCD color numbers
lpechacek Jun 28, 2024
4b2b4f4
OcdFileExport: Export non-integer CMYK components
lpechacek Jun 28, 2024
7036522
OcdFileImport/Export: Handle v8 color overprint
lpechacek Jun 28, 2024
c8a7ea3
OcdFileImport: Reliably detect Registration black
lpechacek Jun 28, 2024
30a443e
OcdFileExport: Warn when exporting transparent colors to v8 format
lpechacek Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions examples/complete map.omap
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions examples/forest sample.omap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
<notes></notes>
<georeferencing scale="10000"><projected_crs id="Local"/></georeferencing>
<colors count="22">
<color priority="0" name="Purple" c="0.2" m="1" y="0" k="0" opacity="1"><spotcolors><namedcolor>PURPLE</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0.8" g="0" b="1"/></color>
<color priority="1" name="Black" c="0" m="0" y="0" k="1" opacity="1"><spotcolors knockout="true"><namedcolor>BLACK</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0" g="0" b="0"/></color>
<color priority="2" name="Brown 50%" c="0" m="0.28" y="0.5" k="0.09" opacity="1"><spotcolors knockout="true"><component factor="0.5" spotcolor="7"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.91" g="0.68" b="0.5"/></color>
<color priority="3" name="Black below light browns" c="0" m="0" y="0" k="1" opacity="1"><spotcolors knockout="true"><component factor="1" spotcolor="1"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0" g="0" b="0"/></color>
<color priority="4" name="Opaque Blue" c="0.87" m="0.18" y="0" k="0" opacity="1"><spotcolors knockout="true"><component factor="1" spotcolor="5"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.13" g="0.82" b="1"/></color>
<color priority="5" name="Blue" c="0.87" m="0.18" y="0" k="0" opacity="1"><spotcolors><namedcolor>BLUE</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0.13" g="0.82" b="1"/></color>
<color priority="6" name="Blue 50%" c="0.435" m="0.09" y="0" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.5" spotcolor="5"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.565" g="0.91" b="1"/></color>
<color priority="7" name="Brown" c="0" m="0.56" y="1" k="0.18" opacity="1"><spotcolors><namedcolor>BROWN</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0.82" g="0.361" b="0"/></color>
<color priority="8" name="OpenOrienteering Orange" c="0" m="0.474" y="0.895" k="0.09" opacity="1"><spotcolors><component factor="0.5" spotcolor="7"/><component factor="1" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.91" g="0.497" b="0.105"/></color>
<color priority="9" name="Black 30%" c="0" m="0" y="0" k="0.3" opacity="1"><spotcolors knockout="true"><component factor="0.3" spotcolor="1"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.7" g="0.7" b="0.7"/></color>
<color priority="10" name="Green 50%, Yellow" c="0.38" m="0.27" y="0.886" k="0" opacity="1"><spotcolors><component factor="0.5" spotcolor="14"/><component factor="1" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.62" g="0.73" b="0.114"/></color>
<color priority="11" name="Green over White over Green" c="0.76" m="0" y="0.91" k="0" opacity="1"><spotcolors><component factor="1" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.24" g="1" b="0.09"/></color>
<color priority="12" name="Opaque White over Green" c="0" m="0" y="0" k="0" opacity="1"><spotcolors knockout="true"><component factor="0" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="1" g="1" b="1"/></color>
<color priority="13" name="Opaque Green" c="0.76" m="0" y="0.91" k="0" opacity="1"><spotcolors knockout="true"><component factor="1" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.24" g="1" b="0.09"/></color>
<color priority="14" name="Green" c="0.76" m="0" y="0.91" k="0" opacity="1"><spotcolors><namedcolor>GREEN</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0.24" g="1" b="0.09"/></color>
<color priority="15" name="Green 60%" c="0.456" m="0" y="0.546" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.6" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.544" g="1" b="0.454"/></color>
<color priority="16" name="Green 30%" c="0.228" m="0" y="0.273" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.3" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.772" g="1" b="0.727"/></color>
<color priority="17" name="Green below light greens" c="0.76" m="0" y="0.91" k="0" opacity="1"><spotcolors><component factor="1" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.24" g="1" b="0.09"/></color>
<color priority="18" name="Yellow" c="0" m="0.27" y="0.79" k="0" opacity="1"><spotcolors><namedcolor>YELLOW</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="1" g="0.73" b="0.21"/></color>
<color priority="19" name="Yellow 50%" c="0" m="0.135" y="0.395" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.5" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="1" g="0.865" b="0.605"/></color>
<color priority="20" name="White over Yellow 70%" c="0" m="0" y="0" k="0" opacity="1"><spotcolors><component factor="0" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="1" g="1" b="1"/></color>
<color priority="21" name="Yellow 70%" c="0" m="0.189" y="0.553" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.7" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="1" g="0.811" b="0.447"/></color>
<color id="1" priority="0" name="Purple" c="0.2" m="1" y="0" k="0" opacity="1"><spotcolors><namedcolor>PURPLE</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0.8" g="0" b="1"/></color>
<color id="2" priority="1" name="Black" c="0" m="0" y="0" k="1" opacity="1"><spotcolors knockout="true"><namedcolor>BLACK</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0" g="0" b="0"/></color>
<color id="3" priority="2" name="Brown 50%" c="0" m="0.28" y="0.5" k="0.09" opacity="1"><spotcolors knockout="true"><component factor="0.5" spotcolor="7"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.91" g="0.68" b="0.5"/></color>
<color id="4" priority="3" name="Black below light browns" c="0" m="0" y="0" k="1" opacity="1"><spotcolors knockout="true"><component factor="1" spotcolor="1"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0" g="0" b="0"/></color>
<color id="5" priority="4" name="Opaque Blue" c="0.87" m="0.18" y="0" k="0" opacity="1"><spotcolors knockout="true"><component factor="1" spotcolor="5"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.13" g="0.82" b="1"/></color>
<color id="6" priority="5" name="Blue" c="0.87" m="0.18" y="0" k="0" opacity="1"><spotcolors><namedcolor>BLUE</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0.13" g="0.82" b="1"/></color>
<color id="7" priority="6" name="Blue 50%" c="0.435" m="0.09" y="0" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.5" spotcolor="5"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.565" g="0.91" b="1"/></color>
<color id="8" priority="7" name="Brown" c="0" m="0.56" y="1" k="0.18" opacity="1"><spotcolors><namedcolor>BROWN</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0.82" g="0.361" b="0"/></color>
<color id="9" priority="8" name="OpenOrienteering Orange" c="0" m="0.474" y="0.895" k="0.09" opacity="1"><spotcolors><component factor="0.5" spotcolor="7"/><component factor="1" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.91" g="0.497" b="0.105"/></color>
<color id="10" priority="9" name="Black 30%" c="0" m="0" y="0" k="0.3" opacity="1"><spotcolors knockout="true"><component factor="0.3" spotcolor="1"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.7" g="0.7" b="0.7"/></color>
<color id="11" priority="10" name="Green 50%, Yellow" c="0.38" m="0.27" y="0.886" k="0" opacity="1"><spotcolors><component factor="0.5" spotcolor="14"/><component factor="1" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.62" g="0.73" b="0.114"/></color>
<color id="12" priority="11" name="Green over White over Green" c="0.76" m="0" y="0.91" k="0" opacity="1"><spotcolors><component factor="1" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.24" g="1" b="0.09"/></color>
<color id="13" priority="12" name="Opaque White over Green" c="0" m="0" y="0" k="0" opacity="1"><spotcolors knockout="true"><component factor="0" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="1" g="1" b="1"/></color>
<color id="14" priority="13" name="Opaque Green" c="0.76" m="0" y="0.91" k="0" opacity="1"><spotcolors knockout="true"><component factor="1" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.24" g="1" b="0.09"/></color>
<color id="15" priority="14" name="Green" c="0.76" m="0" y="0.91" k="0" opacity="1"><spotcolors><namedcolor>GREEN</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="0.24" g="1" b="0.09"/></color>
<color id="16" priority="15" name="Green 60%" c="0.456" m="0" y="0.546" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.6" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.544" g="1" b="0.454"/></color>
<color id="17" priority="16" name="Green 30%" c="0.228" m="0" y="0.273" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.3" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.772" g="1" b="0.727"/></color>
<color id="18" priority="17" name="Green below light greens" c="0.76" m="0" y="0.91" k="0" opacity="1"><spotcolors><component factor="1" spotcolor="14"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="0.24" g="1" b="0.09"/></color>
<color id="19" priority="18" name="Yellow" c="0" m="0.27" y="0.79" k="0" opacity="1"><spotcolors><namedcolor>YELLOW</namedcolor></spotcolors><cmyk method="custom"/><rgb method="cmyk" r="1" g="0.73" b="0.21"/></color>
<color id="20" priority="19" name="Yellow 50%" c="0" m="0.135" y="0.395" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.5" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="1" g="0.865" b="0.605"/></color>
<color id="21" priority="20" name="White over Yellow 70%" c="0" m="0" y="0" k="0" opacity="1"><spotcolors><component factor="0" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="1" g="1" b="1"/></color>
<color id="22" priority="21" name="Yellow 70%" c="0" m="0.189" y="0.553" k="0" opacity="1"><spotcolors knockout="true"><component factor="0.7" spotcolor="18"/></spotcolors><cmyk method="spotcolor"/><rgb method="spotcolor" r="1" g="0.811" b="0.447"/></color>
</colors>
<barrier version="6" required="0.6.0">
<symbols count="158" id="ISOM2000">
Expand Down
Loading
Loading