[gnome-color-manager] Add defines and an attach image for the DTP94 colorimeter. Fixes #632052
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Add defines and an attach image for the DTP94 colorimeter. Fixes #632052
- Date: Thu, 14 Oct 2010 16:19:22 +0000 (UTC)
commit e1cca411b6b1d2b186ec6a8f2a03b49a583daa25
Author: Richard Hughes <richard hughsie com>
Date: Thu Oct 14 17:18:33 2010 +0100
Add defines and an attach image for the DTP94 colorimeter. Fixes #632052
data/figures/Makefile.am | 1 +
data/figures/dtp94-attach.svg | 254 +++++++++++++++++++++++++++++++++++++++
libcolor-glib/gcm-sensor.c | 4 +
libcolor-glib/gcm-sensor.h | 1 +
rules/95-gcm-colorimeters.rules | 2 +-
src/gcm-calibrate-argyll.c | 2 +
6 files changed, 263 insertions(+), 1 deletions(-)
---
diff --git a/data/figures/Makefile.am b/data/figures/Makefile.am
index 89b9dfb..d754bfe 100644
--- a/data/figures/Makefile.am
+++ b/data/figures/Makefile.am
@@ -16,6 +16,7 @@ icons_DATA = \
scan-target-bad.svg \
i1-attach.svg \
huey-attach.svg \
+ dtp94-attach.svg \
hcfr-attach.svg \
spyder-attach.svg \
munki-ambient.svg \
diff --git a/data/figures/dtp94-attach.svg b/data/figures/dtp94-attach.svg
new file mode 100644
index 0000000..8ba282d
--- /dev/null
+++ b/data/figures/dtp94-attach.svg
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="744.09448819"
+ height="1052.3622047"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:docname="dtp94-attach.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3690">
+ <stop
+ style="stop-color:#494949;stop-opacity:1;"
+ offset="0"
+ id="stop3692" />
+ <stop
+ style="stop-color:#494949;stop-opacity:0;"
+ offset="1"
+ id="stop3694" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <inkscape:perspective
+ id="perspective2826"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2840"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3632"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3656"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3678"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3700"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3738"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3760"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2844"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3640"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3676"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3690"
+ id="radialGradient3696"
+ cx="-701"
+ cy="693.36218"
+ fx="-701"
+ fy="693.36218"
+ r="229"
+ gradientTransform="matrix(1,0,0,1.2489083,0,-172.5836)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3690"
+ id="radialGradient3849"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.2489083,469,-327.5836)"
+ cx="-701"
+ cy="693.36218"
+ fx="-701"
+ fy="693.36218"
+ r="229" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.49497475"
+ inkscape:cx="160.44156"
+ inkscape:cy="726.09191"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1680"
+ inkscape:window-height="974"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2816"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ spacingx="1px"
+ spacingy="1px" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ style="fill:#a0a0a0;fill-opacity:1;stroke:#696969;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect3608"
+ width="680"
+ height="680"
+ x="40"
+ y="212.36218"
+ ry="7.7272758" />
+ <path
+ style="opacity:1;fill:#252525;fill-opacity:1;stroke:none"
+ d="m 600,552.36218 c -20,140 -120.58875,300 -220,300 -99.41125,0 -200,-160 -220,-300 -8.51824,-59.62769 0,-160 40,-220 48.9886,-73.48291 116.72859,-80 180,-80 64.03492,0 130.18505,5.27758 180,80 40,60 48.3383,161.63202 40,220 z"
+ id="path3780"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssss" />
+ <path
+ style="opacity:1;fill:#484848;fill-opacity:1;stroke:none"
+ d="M 590,552.36215 C 570.90915,687.69552 474.89258,842.36218 380.00015,842.36218 285.10748,842.36218 189.09105,687.69552 170,552.36215 c -8.13103,-57.64011 0,-154.66667 38.18183,-212.66661 46.76197,-71.03352 111.42283,-77.33336 171.81832,-77.33336 61.1242,0 124.26736,5.10164 171.81804,77.33336 C 590,397.69548 597.95929,495.93978 590,552.36215 z"
+ id="path3780-4"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssss" />
+ <path
+ style="opacity:1;fill:#2f2f2f;fill-opacity:1;stroke:none"
+ d="M 550,547.33355 C 534.09097,671.01359 454.07715,812.36218 375.00012,812.36218 295.9229,812.36218 215.90921,671.01359 200,547.33355 c -6.77586,-52.67682 0,-141.34859 31.81819,-194.35425 38.96831,-64.91695 92.85236,-70.67432 143.18193,-70.67432 50.93684,0 103.55614,4.66235 143.18171,70.67432 C 550,405.98496 556.63274,495.76961 550,547.33355 z"
+ id="path3780-4-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssss" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:#4c4c4c;fill-opacity:1;stroke:none"
+ id="path3821"
+ sodipodi:cx="380"
+ sodipodi:cy="512.36218"
+ sodipodi:rx="50"
+ sodipodi:ry="210"
+ d="m 430,512.36218 a 50,210 0 1 1 -100,0 50,210 0 1 1 100,0 z"
+ transform="matrix(1.6,0,0,1,-228,-2.4824951e-6)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:#393939;fill-opacity:1;stroke:none"
+ id="path3821-5"
+ sodipodi:cx="380"
+ sodipodi:cy="512.36218"
+ sodipodi:rx="50"
+ sodipodi:ry="210"
+ d="m 430,512.36218 a 50,210 0 1 1 -100,0 50,210 0 1 1 100,0 z"
+ transform="matrix(1.6,0,0,0.95238095,-228,14.398199)" />
+ <text
+ xml:space="preserve"
+ style="font-size:33.69457625999999806px;font-style:normal;font-weight:normal;fill:#dcdcdc;fill-opacity:1;stroke:#ffffff;stroke-width:1.02770412000000011;stroke-opacity:1;font-family:Bitstream Vera Sans;opacity:1"
+ x="351.20569"
+ y="-388.86288"
+ id="text3658"
+ transform="matrix(0,1.0578285,-0.94533286,0,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan3660"
+ x="351.20569"
+ y="-388.86288"
+ style="stroke-width:1.02770412000000011;fill:#dcdcdc;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">HughsieOptics</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:17.05572318999999837px;font-style:normal;font-weight:normal;fill:#dcdcdc;fill-opacity:1;stroke:#ffffff;stroke-width:0.52020942999999997;stroke-opacity:1;font-family:Bitstream Vera Sans;opacity:1"
+ x="589.39197"
+ y="-407.70428"
+ id="text3658-8"
+ transform="matrix(0,1.072906,-0.93204811,0,0,0)"><tspan
+ sodipodi:role="line"
+ id="tspan3660-1"
+ x="589.39197"
+ y="-407.70428"
+ style="stroke-width:0.52020942999999997;fill:#dcdcdc;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">TM</tspan></text>
+ </g>
+</svg>
diff --git a/libcolor-glib/gcm-sensor.c b/libcolor-glib/gcm-sensor.c
index be78a51..2b92d23 100644
--- a/libcolor-glib/gcm-sensor.c
+++ b/libcolor-glib/gcm-sensor.c
@@ -603,6 +603,8 @@ gcm_sensor_kind_to_string (GcmSensorKind sensor_kind)
return "dtp41";
if (sensor_kind == GCM_SENSOR_KIND_DTP51)
return "dtp51";
+ if (sensor_kind == GCM_SENSOR_KIND_DTP94)
+ return "dtp94";
if (sensor_kind == GCM_SENSOR_KIND_SPECTRO_SCAN)
return "spectro-scan";
if (sensor_kind == GCM_SENSOR_KIND_I1_PRO)
@@ -637,6 +639,8 @@ gcm_sensor_kind_from_string (const gchar *sensor_kind)
return GCM_SENSOR_KIND_DTP41;
if (g_strcmp0 (sensor_kind, "dtp51") == 0)
return GCM_SENSOR_KIND_DTP51;
+ if (g_strcmp0 (sensor_kind, "dtp94") == 0)
+ return GCM_SENSOR_KIND_DTP94;
if (g_strcmp0 (sensor_kind, "spectro-scan") == 0)
return GCM_SENSOR_KIND_SPECTRO_SCAN;
if (g_strcmp0 (sensor_kind, "i1-pro") == 0)
diff --git a/libcolor-glib/gcm-sensor.h b/libcolor-glib/gcm-sensor.h
index 756f9f2..78072c2 100644
--- a/libcolor-glib/gcm-sensor.h
+++ b/libcolor-glib/gcm-sensor.h
@@ -121,6 +121,7 @@ typedef enum {
GCM_SENSOR_KIND_DTP22,
GCM_SENSOR_KIND_DTP41,
GCM_SENSOR_KIND_DTP51,
+ GCM_SENSOR_KIND_DTP94,
GCM_SENSOR_KIND_SPECTRO_SCAN,
GCM_SENSOR_KIND_I1_PRO,
GCM_SENSOR_KIND_COLORIMTRE_HCFR,
diff --git a/rules/95-gcm-colorimeters.rules b/rules/95-gcm-colorimeters.rules
index 6bfa831..bd5b4f3 100644
--- a/rules/95-gcm-colorimeters.rules
+++ b/rules/95-gcm-colorimeters.rules
@@ -30,7 +30,7 @@ ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d020", ENV{GCM_COLORIMETER}="1", ENV
ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d092", ENV{GCM_COLORIMETER}="1", ENV{GCM_KIND}="unknown", ENV{GCM_TYPE_DISPLAY}="1"
# DTP94
-ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d094", ENV{GCM_COLORIMETER}="1", ENV{GCM_KIND}="unknown", ENV{GCM_TYPE_DISPLAY}="1"
+ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d094", ENV{GCM_COLORIMETER}="1", ENV{GCM_KIND}="dtp94", ENV{GCM_TYPE_DISPLAY}="1"
# MonacoOPTIX (Same as i1 Display 1)
ATTRS{idVendor}=="0670", ATTRS{idProduct}=="0001", ENV{GCM_COLORIMETER}="1", ENV{GCM_KIND}="i1-pro", ENV{GCM_TYPE_DISPLAY}="1"
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index 74b03dd..873edb9 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -200,6 +200,8 @@ gcm_calibrate_argyll_get_sensor_image_attach (GcmCalibrateArgyll *calibrate_argy
return "hcfr-attach.svg";
if (sensor_kind == GCM_SENSOR_KIND_I1_PRO)
return "i1-attach.svg";
+ if (sensor_kind == GCM_SENSOR_KIND_DTP94)
+ return "dtp94-attach.svg";
return NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
