Changeset 799 for trunk/demo/c++/rundemo.cpp

Timestamp:

01/14/09 07:43:26 (20 months ago)

Author:

artem

Message:

+ updated

Files:

• trunk/demo/c++/rundemo.cpp (modified) (9 diffs)

trunk/demo/c++/rundemo.cpp

@@ -62 +62 @@
         rule_type provpoly_rule_on;
         provpoly_rule_on.set_filter(create_filter("[NAME_EN] = 'Ontario'"));
-        provpoly_rule_on.append(polygon_symbolizer(Color(250, 190, 183)));
+        provpoly_rule_on.append(polygon_symbolizer(color(250, 190, 183)));
         provpoly_style.add_rule(provpoly_rule_on);
         
         rule_type provpoly_rule_qc;
         provpoly_rule_qc.set_filter(create_filter("[NAME_EN] = 'Quebec'"));
-        provpoly_rule_qc.append(polygon_symbolizer(Color(217, 235, 203)));
+        provpoly_rule_qc.append(polygon_symbolizer(color(217, 235, 203)));
         provpoly_style.add_rule(provpoly_rule_qc);
         
@@ -75 +75 @@
         feature_type_style provlines_style;
         
-        stroke provlines_stk (Color(0,0,0),1.0);
+        stroke provlines_stk (color(0,0,0),1.0);
         provlines_stk.add_dash(8, 4);
         provlines_stk.add_dash(2, 2);
@@ -91 +91 @@
         rule_type qcdrain_rule;
         qcdrain_rule.set_filter(create_filter("[HYC] = 8"));
-        qcdrain_rule.append(polygon_symbolizer(Color(153, 204, 255)));
+        qcdrain_rule.append(polygon_symbolizer(color(153, 204, 255)));
         qcdrain_style.add_rule(qcdrain_rule);
         
@@ -100 +100 @@
         rule_type roads34_rule;
         roads34_rule.set_filter(create_filter("[CLASS] = 3 or [CLASS] = 4"));
-        stroke roads34_rule_stk(Color(171,158,137),2.0);
+        stroke roads34_rule_stk(color(171,158,137),2.0);
         roads34_rule_stk.set_line_cap(ROUND_CAP);
         roads34_rule_stk.set_line_join(ROUND_JOIN);
@@ -113 +113 @@
         rule_type roads2_rule_1;
         roads2_rule_1.set_filter(create_filter("[CLASS] = 2"));
-        stroke roads2_rule_stk_1(Color(171,158,137),4.0);
+        stroke roads2_rule_stk_1(color(171,158,137),4.0);
         roads2_rule_stk_1.set_line_cap(ROUND_CAP);
         roads2_rule_stk_1.set_line_join(ROUND_JOIN);
@@ -124 +124 @@
         rule_type roads2_rule_2;
         roads2_rule_2.set_filter(create_filter("[CLASS] = 2"));
-        stroke roads2_rule_stk_2(Color(255,250,115),2.0);
+        stroke roads2_rule_stk_2(color(255,250,115),2.0);
         roads2_rule_stk_2.set_line_cap(ROUND_CAP);
         roads2_rule_stk_2.set_line_join(ROUND_JOIN);
@@ -136 +136 @@
         rule_type roads1_rule_1;
         roads1_rule_1.set_filter(create_filter("[CLASS] = 1"));
-        stroke roads1_rule_stk_1(Color(188,149,28),7.0);
+        stroke roads1_rule_stk_1(color(188,149,28),7.0);
         roads1_rule_stk_1.set_line_cap(ROUND_CAP);
         roads1_rule_stk_1.set_line_join(ROUND_JOIN);
@@ -146 +146 @@
         rule_type roads1_rule_2;
         roads1_rule_2.set_filter(create_filter("[CLASS] = 1"));
-        stroke roads1_rule_stk_2(Color(242,191,36),5.0);
+        stroke roads1_rule_stk_2(color(242,191,36),5.0);
         roads1_rule_stk_2.set_line_cap(ROUND_CAP);
         roads1_rule_stk_2.set_line_join(ROUND_JOIN);
@@ -157 +157 @@
         feature_type_style popplaces_style;
         rule_type popplaces_rule;
-        text_symbolizer popplaces_text_symbolizer("GEONAME","DejaVu Sans Book",10,Color(0,0,0));
-        popplaces_text_symbolizer.set_halo_fill(Color(255,255,200));
+        text_symbolizer popplaces_text_symbolizer("GEONAME","DejaVu Sans Book",10,color(0,0,0));
+        popplaces_text_symbolizer.set_halo_fill(color(255,255,200));
         popplaces_text_symbolizer.set_halo_radius(1);
         popplaces_rule.append(popplaces_text_symbolizer);