[cairo-commit] roadster/data layers.xml, 1.31, 1.32 roadster.glade,
1.36, 1.37
Ian McIntosh
commit at pdx.freedesktop.org
Mon Oct 17 20:05:27 PDT 2005
- Previous message: [cairo-commit] roadster ChangeLog, 1.92, 1.93 TODO, 1.2,
1.3 configure.ac, 1.13, 1.14
- Next message: [cairo-commit] roadster/src animator.h, 1.2, 1.3 db.c, 1.34,
1.35 db.h, 1.15, 1.16 downloadmanager.c, 1.2, 1.3 glyph.h, 1.7,
1.8 import_tiger.c, 1.24, 1.25 locationeditwindow.c, 1.3,
1.4 locationeditwindow.h, 1.2, 1.3 main.c, 1.33,
1.34 mainwindow.c, 1.52, 1.53 mainwindow.h, 1.13, 1.14 map.c,
1.55, 1.56 map.h, 1.27, 1.28 map_draw_cairo.c, 1.29,
1.30 map_draw_gdk.c, 1.28, 1.29 map_hittest.c, 1.2,
1.3 map_hittest.h, 1.1, 1.2 map_math.c, 1.3, 1.4 map_math.h,
1.2, 1.3 map_tilemanager.c, 1.2, 1.3 map_tilemanager.h, 1.1,
1.2 mapinfowindow.c, 1.1, 1.2 search_city.h, 1.1,
1.2 search_location.h, 1.3, 1.4 search_road.h, 1.2,
1.3 test_poly.c, 1.2, 1.3 util.c, 1.17, 1.18 util.h, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: ian
Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv7805/data
Modified Files:
layers.xml roadster.glade
Log Message:
* configure.ac: Added -Wall compiler option (show all warnings).
* src/map_draw_cairo.c: The return of Cairo! Now drawing from tile data and using bounding box overlap tests.
* src/map_hittest.c: The return of hittesting!
* src/db.c: Remove dead code.
* src/downloadmanager.c: Properly return a value from a GnomeVFS callback.
* src/import_tiger.c: Switch from GPtrArrays to GArrays for points.
* src/main.c: Properly include libintl.h
* src/map.c: Cleanups. Dead code removal.
* src/map_draw_gdk.c: Add random road segment color option for debugging.
* src/map_math.c: Added polygon clipping and line stitching.
* src/map_tilemanager.c: Do basic line stitching at load time.
* src/mainwindow.c: Cleanups. Move some code to util.c
* src/util.c: Receive some code from mainwindow.c
Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- layers.xml 12 Oct 2005 03:04:05 -0000 1.31
+++ layers.xml 18 Oct 2005 03:05:25 -0000 1.32
@@ -12,62 +12,57 @@
<layers>
# Labels
- <layer draw-type="locations">
- <!-- <property zoom-level="1-5" name="size" value="large" /> -->
- </layer>
-
+<!-- <layer draw-type="locations"> -->
+<!-- </layer> -->
+
<layer draw-type="location-labels">
- <property zoom-level="5-10" name="font-size" value="10" />
- <property zoom-level="5-10" name="color" value="#000000ff" />
+ <property zoom-level="5-10" name="font-size" value="10" />
+ <property zoom-level="5-10" name="color" value="#000000ff" />
</layer>
-
+
<layer data-source="railroads" draw-type="line-labels">
- <property zoom-level="5-7" name="font-size" value="10" />
- <property zoom-level="8" name="font-size" value="10" />
- <property zoom-level="9" name="font-size" value="12" />
- <property zoom-level="10" name="font-size" value="17" />
- <property zoom-level="6-10" name="color" value="#000000ff" />
+ <property zoom-level="5-7" name="font-size" value="10" />
+ <property zoom-level="8" name="font-size" value="10" />
+ <property zoom-level="9" name="font-size" value="12" />
+ <property zoom-level="10" name="font-size" value="17" />
+ <property zoom-level="6-10" name="color" value="#000000ff" />
<property zoom-level="6-10" name="halo-size" value="1" />
<property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
</layer>
<layer data-source="minor-roads" draw-type="line-labels">
- <property zoom-level="8" name="font-size" value="9" />
- <property zoom-level="9" name="font-size" value="12" />
- <property zoom-level="10" name="font-size" value="20" />
- <property zoom-level="8-10" name="color" value="#000000ff" />
+ <property zoom-level="8" name="font-size" value="9" />
+ <property zoom-level="9" name="font-size" value="12" />
+ <property zoom-level="10" name="font-size" value="20" />
+ <property zoom-level="8-10" name="color" value="#000000ff" />
</layer>
-
+
<layer data-source="parks" draw-type="polygon-labels">
-<!-- <property zoom-level="6" name="font-size" value="10" /> -->
- <property zoom-level="7" name="font-size" value="9" />
- <property zoom-level="8" name="font-size" value="11" />
- <property zoom-level="9" name="font-size" value="12" />
- <property zoom-level="10" name="font-size" value="22" />
- <property zoom-level="6-10" name="color" value="#304030FF" />
+<!-- <property zoom-level="7" name="font-size" value="9" /> -->
+ <property zoom-level="8" name="font-size" value="11" />
+ <property zoom-level="9" name="font-size" value="12" />
+ <property zoom-level="10" name="font-size" value="22" />
+ <property zoom-level="6-10" name="color" value="#304030FF" />
<property zoom-level="6-10" name="halo-size" value="1" />
<property zoom-level="6-10" name="halo-color" value="#FFFFFFB5" />
</layer>
-
+
<layer data-source="lakes" draw-type="polygon-labels">
-<!-- <property zoom-level="5" name="font-size" value="9" /> -->
- <property zoom-level="6" name="font-size" value="9" />
- <property zoom-level="7" name="font-size" value="9" />
- <property zoom-level="8" name="font-size" value="10" />
- <property zoom-level="9" name="font-size" value="11" />
- <property zoom-level="10" name="font-size" value="17" />
- <property zoom-level="6-10" name="color" value="#303030FF" />
+<!-- <property zoom-level="7" name="font-size" value="9" /> -->
+ <property zoom-level="8" name="font-size" value="10" />
+ <property zoom-level="9" name="font-size" value="11" />
+ <property zoom-level="10" name="font-size" value="17" />
+ <property zoom-level="6-10" name="color" value="#303030FF" />
<property zoom-level="6-10" name="halo-size" value="1" />
<property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
</layer>
-
+
<layer data-source="misc-areas" draw-type="polygon-labels">
-<!-- <property zoom-level="6" name="font-size" value="10" /> -->
- <property zoom-level="7" name="font-size" value="10" />
- <property zoom-level="8" name="font-size" value="11" />
- <property zoom-level="9" name="font-size" value="14" />
- <property zoom-level="10" name="font-size" value="24" />
- <property zoom-level="6-10" name="color" value="#303030FF" />
+ <property zoom-level="7" name="font-size" value="10" />
+ <property zoom-level="8" name="font-size" value="11" />
+ <property zoom-level="9" name="font-size" value="14" />
+ <property zoom-level="10" name="font-size" value="24" />
+ <property zoom-level="6-10" name="color" value="#303030FF" />
<property zoom-level="6-10" name="halo-size" value="1" />
<property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
</layer>
@@ -202,39 +197,39 @@
<layer data-source="railroads" draw-type="lines">
<!-- railroad dashed inner line -->
<property zoom-level="6-10" name="line-width" value="2" />
- <property zoom-level="6-10" name="dash-pattern" value="3 4 3" />
+ <property zoom-level="6-10" name="dash-pattern" value="5 5" />
<property zoom-level="6-10" name="line-cap" value="square" />
- <property zoom-level="6-10" name="color" value="#9C9A9CFF" />
+ <property zoom-level="6-10" name="color" value="#6C6A6CFF" />
</layer>
- <layer data-source="railroads" draw-type="lines">
+<!-- <layer data-source="railroads" draw-type="lines"> -->
<!-- railroad solid inner line -->
- <property zoom-level="6-10" name="line-width" value="1" />
- <property zoom-level="6-10" name="color" value="#F7EBDEFF" />
- <property zoom-level="6-10" name="line-cap" value="square" />
- </layer>
- <layer data-source="railroads" draw-type="lines">
+<!-- <property zoom-level="6-10" name="line-width" value="1" /> -->
+<!-- <property zoom-level="6-10" name="color" value="#F7EBDEFF" /> -->
+<!-- <property zoom-level="6-10" name="line-cap" value="square" /> -->
+<!-- </layer> -->
+<!-- <layer data-source="railroads" draw-type="lines"> -->
<!-- railroad solid outer line -->
- <property zoom-level="6-10" name="line-width" value="3" />
- <property zoom-level="6-10" name="color" value="#9C9A9CFF" />
- </layer>
-
+<!-- <property zoom-level="6-10" name="line-width" value="3" /> -->
+<!-- <property zoom-level="6-10" name="color" value="#ACAAACFF" /> -->
+<!-- </layer> -->
+
<layer data-source="rivers" draw-type="lines">
- <property zoom-level="1-6" name="line-width" value="1" />
- <property zoom-level="1-6" name="color" value="#E5E6FFFF" />
- <property zoom-level="7" name="line-width" value="2" />
+ <property zoom-level="7" name="line-width" value="1" />
+ <property zoom-level="7" name="color" value="#C9CAEFFF" />
+
<property zoom-level="8" name="line-width" value="2" />
<property zoom-level="9" name="line-width" value="2" />
<property zoom-level="10" name="line-width" value="2" />
- <property zoom-level="7-10" name="color" value="#B5C6D6FF" />
+ <property zoom-level="8-10" name="color" value="#B5C6D6FF" />
</layer>
-
+
<layer data-source="lakes" draw-type="polygons">
- <property zoom-level="1-10" name="color" value="#B6CCDEFF" />
- </layer>
- <layer data-source="lakes" draw-type="lines">
- <property zoom-level="1-10" name="line-width" value="2" />
- <property zoom-level="1-10" name="color" value="#9Db6bEFF" />
+ <property zoom-level="1-10" name="color" value="#B5C2D6FF" />
</layer>
+<!-- <layer data-source="lakes" draw-type="lines"> -->
+<!-- <property zoom-level="1-10" name="line-width" value="2" /> -->
+<!-- <property zoom-level="1-10" name="color" value="#9Db6bEFF" /> -->
+<!-- </layer> -->
<layer data-source="parks" draw-type="polygons">
<property zoom-level="1-10" name="fill-image" value="park-pattern" />
@@ -242,7 +237,8 @@
</layer>
<layer data-source="parks" draw-type="lines">
<property zoom-level="1-10" name="line-width" value="2" />
- <property zoom-level="1-10" name="color" value="#BEBB8Dff" />
+ <property zoom-level="1-6" name="color" value="#C5C59Dff" />
+ <property zoom-level="7-10" name="color" value="#BEBB8Dff" />
</layer>
<layer data-source="misc-areas" draw-type="polygons">
@@ -255,7 +251,7 @@
<layer draw-type="fill">
<!-- <property zoom-level="1-10" name="fill-image" value="ground-pattern" /> -->
- <property zoom-level="1-10" name="color" value="#F3EDDEFF" />
+ <property zoom-level="1-10" name="color" value="#F7EBFEFF" />
</layer>
</layers>
Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- roadster.glade 12 Oct 2005 03:04:05 -0000 1.36
+++ roadster.glade 18 Oct 2005 03:05:25 -0000 1.37
@@ -498,8 +498,8 @@
<child>
<widget class="GtkTable" id="table15">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
+ <property name="n_rows">7</property>
+ <property name="n_columns">3</property>
<property name="homogeneous">False</property>
<property name="row_spacing">8</property>
<property name="column_spacing">8</property>
@@ -526,8 +526,8 @@
[...1779 lines suppressed...]
+ <signal name="toggled" handler="test_poly_on_time_to_queue_draw" last_modification_time="Sat, 15 Oct 2005 18:18:17 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -5813,7 +6201,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="test_poly_on_hidecheck_toggled" last_modification_time="Wed, 12 Oct 2005 02:30:32 GMT"/>
+ <signal name="toggled" handler="test_poly_on_time_to_queue_draw" last_modification_time="Sat, 15 Oct 2005 18:18:06 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
- Previous message: [cairo-commit] roadster ChangeLog, 1.92, 1.93 TODO, 1.2,
1.3 configure.ac, 1.13, 1.14
- Next message: [cairo-commit] roadster/src animator.h, 1.2, 1.3 db.c, 1.34,
1.35 db.h, 1.15, 1.16 downloadmanager.c, 1.2, 1.3 glyph.h, 1.7,
1.8 import_tiger.c, 1.24, 1.25 locationeditwindow.c, 1.3,
1.4 locationeditwindow.h, 1.2, 1.3 main.c, 1.33,
1.34 mainwindow.c, 1.52, 1.53 mainwindow.h, 1.13, 1.14 map.c,
1.55, 1.56 map.h, 1.27, 1.28 map_draw_cairo.c, 1.29,
1.30 map_draw_gdk.c, 1.28, 1.29 map_hittest.c, 1.2,
1.3 map_hittest.h, 1.1, 1.2 map_math.c, 1.3, 1.4 map_math.h,
1.2, 1.3 map_tilemanager.c, 1.2, 1.3 map_tilemanager.h, 1.1,
1.2 mapinfowindow.c, 1.1, 1.2 search_city.h, 1.1,
1.2 search_location.h, 1.3, 1.4 search_road.h, 1.2,
1.3 test_poly.c, 1.2, 1.3 util.c, 1.17, 1.18 util.h, 1.17, 1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list