[gnome-color-manager] Add images of the Colorimtre HCFR
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Add images of the Colorimtre HCFR
- Date: Thu, 25 Mar 2010 23:08:58 +0000 (UTC)
commit e511ab98a82d43f9987f18153d9e0d5934724079
Author: Richard Hughes <richard hughsie com>
Date: Thu Mar 25 22:55:15 2010 +0000
Add images of the Colorimtre HCFR
data/figures/Makefile.am | 1 +
data/figures/hcfr-attach.svg | 289 +++++++++++++++++++++++++++++++++++++++
rules/95-gcm-colorimeters.rules | 2 +-
src/gcm-calibrate-argyll.c | 2 +
src/gcm-colorimeter.c | 4 +
src/gcm-colorimeter.h | 1 +
6 files changed, 298 insertions(+), 1 deletions(-)
---
diff --git a/data/figures/Makefile.am b/data/figures/Makefile.am
index e19e95b..b6622cc 100644
--- a/data/figures/Makefile.am
+++ b/data/figures/Makefile.am
@@ -8,6 +8,7 @@ figures_DATA = \
scan-target-good.svg \
scan-target-bad.svg \
huey-attach.svg \
+ hcfr-attach.svg \
spyder-attach.svg \
munki-ambient.svg \
munki-attach.svg \
diff --git a/data/figures/hcfr-attach.svg b/data/figures/hcfr-attach.svg
new file mode 100644
index 0000000..c688d7d
--- /dev/null
+++ b/data/figures/hcfr-attach.svg
@@ -0,0 +1,289 @@
+<?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: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.47 r22583"
+ sodipodi:docname="hcfr-attach.svg">
+ <defs
+ id="defs4">
+ <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="perspective2865"
+ 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="perspective2900"
+ 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="perspective3696"
+ 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="perspective3723"
+ 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="perspective3745"
+ 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" />
+ </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="30.542722"
+ inkscape:cy="539.68281"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:window-width="1680"
+ inkscape:window-height="977"
+ 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" />
+ </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="172.36218"
+ ry="7.7272758" />
+ <g
+ id="g3764"
+ transform="translate(680,-20.000001)">
+ <rect
+ ry="40"
+ y="312.36218"
+ x="-540"
+ height="660"
+ width="480"
+ id="rect2851"
+ style="fill:#1e1e1e;fill-opacity:1;stroke:#000000;stroke-width:0.97979587;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ transform="matrix(1.142857,0,0,1.142857,45.71423,-63.398597)"
+ d="m -320,468.79074 c 0,19.32997 -15.67003,35 -35,35 -19.32997,0 -35,-15.67003 -35,-35 0,-19.32997 15.67003,-35 35,-35 19.32997,0 35,15.67003 35,35 z"
+ sodipodi:ry="35"
+ sodipodi:rx="35"
+ sodipodi:cy="468.79074"
+ sodipodi:cx="-355"
+ id="path2855"
+ style="fill:#8d8e3f;fill-opacity:0.44537814;stroke:#000000;stroke-width:0.87500012;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.57142871,0,0,0.57142871,42.857199,244.48169)"
+ d="m -320,468.79074 c 0,19.32997 -15.67003,35 -35,35 -19.32997,0 -35,-15.67003 -35,-35 0,-19.32997 15.67003,-35 35,-35 19.32997,0 35,15.67003 35,35 z"
+ sodipodi:ry="35"
+ sodipodi:rx="35"
+ sodipodi:cy="468.79074"
+ sodipodi:cx="-355"
+ id="path2855-7"
+ style="fill:#0098ff;fill-opacity:1;stroke:#000000;stroke-width:1.74999952;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <path
+ transform="matrix(0.57142871,0,0,0.57142871,-257.14281,324.48169)"
+ d="m -320,468.79074 c 0,19.32997 -15.67003,35 -35,35 -19.32997,0 -35,-15.67003 -35,-35 0,-19.32997 15.67003,-35 35,-35 19.32997,0 35,15.67003 35,35 z"
+ sodipodi:ry="35"
+ sodipodi:rx="35"
+ sodipodi:cy="468.79074"
+ sodipodi:cx="-355"
+ id="path2855-7-2"
+ style="fill:#00a500;fill-opacity:1;stroke:#000000;stroke-width:1.74999952;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <rect
+ ry="6.6666665"
+ y="452.36218"
+ x="-380"
+ height="40"
+ width="40"
+ id="rect2914"
+ style="fill:#141414;fill-opacity:1;stroke:#000000;stroke-width:0.66666669;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <path
+ transform="matrix(1.142857,0,0,1.142857,165.71423,-63.398594)"
+ d="m -320,468.79074 c 0,19.32997 -15.67003,35 -35,35 -19.32997,0 -35,-15.67003 -35,-35 0,-19.32997 15.67003,-35 35,-35 19.32997,0 35,15.67003 35,35 z"
+ sodipodi:ry="35"
+ sodipodi:rx="35"
+ sodipodi:cy="468.79074"
+ sodipodi:cx="-355"
+ id="path2855-5"
+ style="fill:#8d8e3f;fill-opacity:0.44537814;stroke:#000000;stroke-width:0.87500012;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <rect
+ ry="6.6666665"
+ y="452.36218"
+ x="-260"
+ height="40"
+ width="40"
+ id="rect2914-0"
+ style="fill:#141414;fill-opacity:1;stroke:#000000;stroke-width:0.66666669;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <rect
+ ry="1.464461"
+ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+ y="337.54605"
+ x="111.27187"
+ height="9.9999409"
+ width="131.42142"
+ id="rect3713"
+ style="fill:#0d0d0d;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <rect
+ ry="1.464461"
+ transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+ y="305.72623"
+ x="143.09166"
+ height="10"
+ width="67.781761"
+ id="rect3713-5"
+ style="fill:#0d0d0d;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <rect
+ ry="1.464461"
+ transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
+ y="-995.15527"
+ x="-372.90134"
+ height="9.9999409"
+ width="131.42142"
+ id="rect3713-57"
+ style="fill:#0d0d0d;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <rect
+ ry="1.464461"
+ transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
+ y="-1026.9751"
+ x="-341.08157"
+ height="10"
+ width="67.781761"
+ id="rect3713-5-4"
+ style="fill:#0d0d0d;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ <rect
+ ry="0.86641496"
+ y="972.56012"
+ x="-495"
+ height="9.802063"
+ width="65"
+ id="rect3762"
+ style="fill:#0d0d0d;fill-opacity:1;stroke:#000000;stroke-width:0.35788032;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ </g>
+ </g>
+</svg>
diff --git a/rules/95-gcm-colorimeters.rules b/rules/95-gcm-colorimeters.rules
index 39e1f85..479202e 100644
--- a/rules/95-gcm-colorimeters.rules
+++ b/rules/95-gcm-colorimeters.rules
@@ -48,7 +48,7 @@ ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2000", ENV{GCM_COLORIMETER}="1", ENV
ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2007", ENV{GCM_COLORIMETER}="1", ENV{GCM_KIND}="color-munki", ENV{GCM_TYPE_DISPLAY}="1", ENV{GCM_TYPE_PROJECTOR}="1", ENV{GCM_TYPE_PRINTER}="1", ENV{GCM_TYPE_SPOT}="1"
# Colorimtre HCFR
-ATTRS{idVendor}=="04db", ATTRS{idProduct}=="005b", ENV{GCM_COLORIMETER}="1", ENV{GCM_KIND}="unknown", ENV{GCM_TYPE_PROJECTOR}="1"
+ATTRS{idVendor}=="04db", ATTRS{idProduct}=="005b", ENV{GCM_COLORIMETER}="1", ENV{GCM_KIND}="colorimtre-hcfr", ENV{GCM_TYPE_PROJECTOR}="1"
# Spyder 2
ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0200", ENV{GCM_COLORIMETER}="1", ENV{GCM_KIND}="spyder", ENV{GCM_TYPE_DISPLAY}="1"
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index b0d6dcd..677387a 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -188,6 +188,8 @@ gcm_calibrate_argyll_get_colorimeter_image_attach (GcmCalibrateArgyll *calibrate
return "munki-attach.svg";
if (colorimeter_kind == GCM_COLORIMETER_KIND_SPYDER)
return "spyder-attach.svg";
+ if (colorimeter_kind == GCM_COLORIMETER_KIND_COLORIMTRE_HCFR)
+ return "hcfr-attach.svg";
return NULL;
}
diff --git a/src/gcm-colorimeter.c b/src/gcm-colorimeter.c
index e86e34d..dfd9597 100644
--- a/src/gcm-colorimeter.c
+++ b/src/gcm-colorimeter.c
@@ -300,6 +300,8 @@ gcm_colorimeter_kind_to_string (GcmColorimeterKind colorimeter_kind)
return "spectro-scan";
if (colorimeter_kind == GCM_COLORIMETER_KIND_I1_PRO)
return "i1-pro";
+ if (colorimeter_kind == GCM_COLORIMETER_KIND_COLORIMTRE_HCFR)
+ return "colorimtre-hcfr";
return "unknown";
}
@@ -327,6 +329,8 @@ gcm_colorimeter_kind_from_string (const gchar *colorimeter_kind)
return GCM_COLORIMETER_KIND_SPECTRO_SCAN;
if (g_strcmp0 (colorimeter_kind, "i1-pro") == 0)
return GCM_COLORIMETER_KIND_I1_PRO;
+ if (g_strcmp0 (colorimeter_kind, "colorimtre-hcfr") == 0)
+ return GCM_COLORIMETER_KIND_COLORIMTRE_HCFR;
return GCM_COLORIMETER_KIND_UNKNOWN;
}
diff --git a/src/gcm-colorimeter.h b/src/gcm-colorimeter.h
index 412e40d..1bd20e4 100644
--- a/src/gcm-colorimeter.h
+++ b/src/gcm-colorimeter.h
@@ -65,6 +65,7 @@ typedef enum {
GCM_COLORIMETER_KIND_DTP51,
GCM_COLORIMETER_KIND_SPECTRO_SCAN,
GCM_COLORIMETER_KIND_I1_PRO,
+ GCM_COLORIMETER_KIND_COLORIMTRE_HCFR,
GCM_COLORIMETER_KIND_UNKNOWN
} GcmColorimeterKind;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
