[cairo-commit] roadster/src animator.c, 1.6, 1.7 animator.h, 1.1,
1.2 db.c, 1.27, 1.28 db.h, 1.11, 1.12 glyph.c, 1.6,
1.7 glyph.h, 1.3, 1.4 gotowindow.c, 1.10, 1.11 gpsclient.c,
1.11, 1.12 gpsclient.h, 1.4, 1.5 history.c, 1.3, 1.4 history.h,
1.1, 1.2 import_tiger.c, 1.20, 1.21 importwindow.c, 1.10,
1.11 location.c, 1.6, 1.7 location.h, 1.4,
1.5 locationeditwindow.c, 1.2, 1.3 locationset.c, 1.13,
1.14 locationset.h, 1.7, 1.8 main.c, 1.24, 1.25 main.h, 1.4,
1.5 mainwindow.c, 1.41, 1.42 map.c, 1.45, 1.46 map.h, 1.22,
1.23 map_draw_cairo.c, 1.22, 1.23 map_draw_gdk.c, 1.18,
1.19 map_style.c, 1.1, 1.2 map_style.h, 1.1, 1.2 point.c, 1.6,
1.7 pointstring.c, 1.6, 1.7 pointstring.h, 1.2, 1.3 road.c,
1.6, 1.7 road.h, 1.2, 1.3 scenemanager.c, 1.14,
1.15 scenemanager.h, 1.6, 1.7 search.c, 1.7,
1.8 search_location.c, 1.12, 1.13 search_road.c, 1.23,
1.24 searchwindow.c, 1.21, 1.22 tooltip.c, 1.4, 1.5 tooltip.h,
1.2, 1.3 track.c, 1.6, 1.7 util.c, 1.11, 1.12 util.h, 1.11,
1.12 welcomewindow.c, 1.7, 1.8
Ian McIntosh
commit at pdx.freedesktop.org
Sun Sep 25 12:02:40 PDT 2005
Committed by: ian
Update of /cvs/cairo/roadster/src
In directory gabe:/tmp/cvs-serv13866/src
Modified Files:
animator.c animator.h db.c db.h glyph.c glyph.h gotowindow.c
gpsclient.c gpsclient.h history.c history.h import_tiger.c
importwindow.c location.c location.h locationeditwindow.c
locationset.c locationset.h main.c main.h mainwindow.c map.c
map.h map_draw_cairo.c map_draw_gdk.c map_style.c map_style.h
point.c pointstring.c pointstring.h road.c road.h
scenemanager.c scenemanager.h search.c search_location.c
search_road.c searchwindow.c tooltip.c tooltip.h track.c
util.c util.h welcomewindow.c
Log Message:
* src/*: Removed "m_" prefix from all struct variables! (It makes much more sense in C++ where you can access this-> without writing it.)
* src/searchwindow.c: Refactoring and changes to what/when messages get shown to users.
Index: animator.c
===================================================================
RCS file: /cvs/cairo/roadster/src/animator.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- animator.c 14 Sep 2005 20:06:53 -0000 1.6
+++ animator.c 25 Sep 2005 19:02:37 -0000 1.7
@@ -40,9 +40,9 @@
animator_t* pNew = g_new0(animator_t, 1);
- pNew->m_pTimer = g_timer_new();
- pNew->m_eAnimationType = eAnimationType;
- pNew->m_fAnimationTimeInSeconds = fAnimationTimeInSeconds;
+ pNew->pTimer = g_timer_new();
+ pNew->eAnimationType = eAnimationType;
+ pNew->fAnimationTimeInSeconds = fAnimationTimeInSeconds;
return pNew;
}
@@ -51,7 +51,7 @@
{
if(pAnimator == NULL) return; // allow NULL
- g_timer_destroy(pAnimator->m_pTimer);
+ g_timer_destroy(pAnimator->pTimer);
g_free(pAnimator);
}
@@ -60,21 +60,21 @@
{
g_assert(pAnimator != NULL);
- gdouble fElapsedSeconds = g_timer_elapsed(pAnimator->m_pTimer, NULL);
- return (fElapsedSeconds >= pAnimator->m_fAnimationTimeInSeconds);
+ gdouble fElapsedSeconds = g_timer_elapsed(pAnimator->pTimer, NULL);
+ return (fElapsedSeconds >= pAnimator->fAnimationTimeInSeconds);
}
gdouble animator_get_time_percent(animator_t* pAnimator)
{
g_assert(pAnimator != NULL);
- gdouble fElapsedSeconds = g_timer_elapsed(pAnimator->m_pTimer, NULL);
+ gdouble fElapsedSeconds = g_timer_elapsed(pAnimator->pTimer, NULL);
// Cap at 1.0
- if(fElapsedSeconds >= pAnimator->m_fAnimationTimeInSeconds) {
+ if(fElapsedSeconds >= pAnimator->fAnimationTimeInSeconds) {
return 1.0;
}
- return (fElapsedSeconds / pAnimator->m_fAnimationTimeInSeconds);
+ return (fElapsedSeconds / pAnimator->fAnimationTimeInSeconds);
}
// returns a floating point 0.0 to 1.0
@@ -89,7 +89,7 @@
// y is an output percetange (distance) from 0.0 to 1.0
gdouble fReturn;
- switch(pAnimator->m_eAnimationType) {
+ switch(pAnimator->eAnimationType) {
case ANIMATIONTYPE_SLIDE:
// Slide - accelerate for the first half (standard upward facing parabola going from x=0 to x=0.5)
if(fTimePercent < 0.5) {
Index: animator.h
===================================================================
RCS file: /cvs/cairo/roadster/src/animator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- animator.h 18 Mar 2005 08:37:35 -0000 1.1
+++ animator.h 25 Sep 2005 19:02:37 -0000 1.2
@@ -29,9 +29,9 @@
typedef enum { ANIMATIONTYPE_NONE=0, ANIMATIONTYPE_SLIDE=1, ANIMATIONTYPE_FAST_THEN_SLIDE=2 } EAnimationType;
typedef struct animator {
- GTimer* m_pTimer;
- EAnimationType m_eAnimationType;
- gdouble m_fAnimationTimeInSeconds;
+ GTimer* pTimer;
+ EAnimationType eAnimationType;
+ gdouble fAnimationTimeInSeconds;
} animator_t;
animator_t* animator_new(EAnimationType eAnimationType, gdouble fAnimationTimeInSeconds);
Index: db.c
===================================================================
RCS file: /cvs/cairo/roadster/src/db.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- db.c 24 Sep 2005 05:25:24 -0000 1.27
+++ db.c 25 Sep 2005 19:02:37 -0000 1.28
@@ -127,19 +127,19 @@
g_assert(pszSQL != NULL);
if(g_pDB == NULL) return FALSE;
- gint nResult = mysql_query(g_pDB->m_pMySQLConnection, pszSQL);
+ gint nResult = mysql_query(g_pDB->pMySQLConnection, pszSQL);
if(nResult != MYSQL_RESULT_SUCCESS) {
- gint nErrorNumber = mysql_errno(g_pDB->m_pMySQLConnection);
+ gint nErrorNumber = mysql_errno(g_pDB->pMySQLConnection);
if(nErrorNumber != MYSQL_ERROR_DUPLICATE_KEY) {
- g_warning("db_query: %d:%s (SQL: %s)\n", mysql_errno(g_pDB->m_pMySQLConnection), mysql_error(g_pDB->m_pMySQLConnection), pszSQL);
+ g_warning("db_query: %d:%s (SQL: %s)\n", mysql_errno(g_pDB->pMySQLConnection), mysql_error(g_pDB->pMySQLConnection), pszSQL);
}
return FALSE;
}
// get result?
if(ppResultSet != NULL) {
- *ppResultSet = (db_resultset_t*)MYSQL_GET_RESULT(g_pDB->m_pMySQLConnection);
+ *ppResultSet = (db_resultset_t*)MYSQL_GET_RESULT(g_pDB->pMySQLConnection);
}
return TRUE;
}
@@ -157,7 +157,7 @@
gint db_get_last_insert_id()
{
if(g_pDB == NULL) return 0;
- return mysql_insert_id(g_pDB->m_pMySQLConnection);
+ return mysql_insert_id(g_pDB->pMySQLConnection);
}
/******************************************************
@@ -179,11 +179,11 @@
// on success, alloc our connection struct and fill it
db_connection_t* pNewConnection = g_new0(db_connection_t, 1);
- pNewConnection->m_pMySQLConnection = pMySQLConnection;
- pNewConnection->m_pzHost = g_strdup(pzHost);
- pNewConnection->m_pzUserName = g_strdup(pzUserName);
- pNewConnection->m_pzPassword = g_strdup(pzPassword);
- pNewConnection->m_pzDatabase = g_strdup(pzDatabase);
+ pNewConnection->pMySQLConnection = pMySQLConnection;
+ pNewConnection->pzHost = g_strdup(pzHost);
+ pNewConnection->pzUserName = g_strdup(pzUserName);
+ pNewConnection->pzPassword = g_strdup(pzPassword);
+ pNewConnection->pzDatabase = g_strdup(pzDatabase);
g_assert(g_pDB == NULL);
g_pDB = pNewConnection;
@@ -195,17 +195,17 @@
static gboolean db_is_connected(void)
{
// 'mysql_ping' will also attempt a re-connect if necessary
- return (g_pDB != NULL && mysql_ping(g_pDB->m_pMySQLConnection) == MYSQL_RESULT_SUCCESS);
+ return (g_pDB != NULL && mysql_ping(g_pDB->pMySQLConnection) == MYSQL_RESULT_SUCCESS);
}
// gets a descriptive string about the connection. (do not free it.)
const gchar* db_get_connection_info()
{
- if(g_pDB == NULL || g_pDB->m_pMySQLConnection == NULL) {
+ if(g_pDB == NULL || g_pDB->pMySQLConnection == NULL) {
return "Not connected";
}
- return mysql_get_host_info(g_pDB->m_pMySQLConnection);
+ return mysql_get_host_info(g_pDB->pMySQLConnection);
}
@@ -221,7 +221,7 @@
gint nLength = (strlen(pszString)*2) + 1;
gchar* pszNew = g_malloc(nLength);
- mysql_real_escape_string(g_pDB->m_pMySQLConnection, pszNew, pszString, strlen(pszString));
+ mysql_real_escape_string(g_pDB->pMySQLConnection, pszNew, pszString, strlen(pszString));
return pszNew;
}
@@ -242,11 +242,11 @@
// count rows
g_snprintf(azQuery, MAX_SQLBUFFER_LEN, "SELECT COUNT(*) FROM %s;", pszTable);
- if(mysql_query(g_pDB->m_pMySQLConnection, azQuery) != MYSQL_RESULT_SUCCESS) {
- g_message("db_count_table_rows query failed: %s\n", mysql_error(g_pDB->m_pMySQLConnection));
+ if(mysql_query(g_pDB->pMySQLConnection, azQuery) != MYSQL_RESULT_SUCCESS) {
+ g_message("db_count_table_rows query failed: %s\n", mysql_error(g_pDB->pMySQLConnection));
return 0;
}
- if((pResultSet = MYSQL_GET_RESULT(g_pDB->m_pMySQLConnection)) != NULL) {
+ if((pResultSet = MYSQL_GET_RESULT(g_pDB->pMySQLConnection)) != NULL) {
if((aRow = mysql_fetch_row(pResultSet)) != NULL) {
uRows = atoi(aRow[0]);
}
@@ -269,12 +269,12 @@
g_assert(pszSQL != NULL);
if(g_pDB == NULL) return FALSE;
- if(mysql_query(g_pDB->m_pMySQLConnection, pszSQL) != MYSQL_RESULT_SUCCESS) {
- //g_warning("db_query: %s (SQL: %s)\n", mysql_error(g_pDB->m_pMySQLConnection), pszSQL);
+ if(mysql_query(g_pDB->pMySQLConnection, pszSQL) != MYSQL_RESULT_SUCCESS) {
+ //g_warning("db_query: %s (SQL: %s)\n", mysql_error(g_pDB->pMySQLConnection), pszSQL);
return FALSE;
}
- my_ulonglong uCount = mysql_affected_rows(g_pDB->m_pMySQLConnection);
+ my_ulonglong uCount = mysql_affected_rows(g_pDB->pMySQLConnection);
if(uCount > 0) {
if(pnReturnRowsInserted != NULL) {
*pnReturnRowsInserted = uCount;
@@ -299,8 +299,8 @@
gchar azNewest[40];
gchar azCoord1[20], azCoord2[20];
- if(nCount > 0) g_snprintf(azNewest, 40, ",%s %s", g_ascii_dtostr(azCoord1, 20, pPoint->m_fLatitude), g_ascii_dtostr(azCoord2, 20, pPoint->m_fLongitude));
- else g_snprintf(azNewest, 40, "%s %s", g_ascii_dtostr(azCoord1, 20, pPoint->m_fLatitude), g_ascii_dtostr(azCoord2, 20, pPoint->m_fLongitude));
+ if(nCount > 0) g_snprintf(azNewest, 40, ",%s %s", g_ascii_dtostr(azCoord1, 20, pPoint->fLatitude), g_ascii_dtostr(azCoord2, 20, pPoint->fLongitude));
+ else g_snprintf(azNewest, 40, "%s %s", g_ascii_dtostr(azCoord1, 20, pPoint->fLatitude), g_ascii_dtostr(azCoord2, 20, pPoint->fLongitude));
g_strlcat(azCoordinateList, azNewest, COORD_LIST_MAX);
nCount++;
@@ -317,12 +317,12 @@
nCityLeftID, nCityRightID,
pszZIPCodeLeft, pszZIPCodeRight);
- if(MYSQL_RESULT_SUCCESS != mysql_query(g_pDB->m_pMySQLConnection, azQuery)) {
- g_warning("db_insert_road failed: %s (SQL: %s)\n", mysql_error(g_pDB->m_pMySQLConnection), azQuery);
+ if(MYSQL_RESULT_SUCCESS != mysql_query(g_pDB->pMySQLConnection, azQuery)) {
+ g_warning("db_insert_road failed: %s (SQL: %s)\n", mysql_error(g_pDB->pMySQLConnection), azQuery);
return FALSE;
}
// return the new ID
- *pReturnID = mysql_insert_id(g_pDB->m_pMySQLConnection);
+ *pReturnID = mysql_insert_id(g_pDB->pMySQLConnection);
return TRUE;
}
@@ -513,9 +513,9 @@
data += sizeof(gint32);
g_assert(nGeometryType == WKB_POINT);
- pPoint->m_fLatitude = *((double*)data);
+ pPoint->fLatitude = *((double*)data);
data += sizeof(double);
- pPoint->m_fLongitude = *((double*)data);
+ pPoint->fLongitude = *((double*)data);
data += sizeof(double);
}
@@ -537,9 +537,9 @@
mappoint_t* pPoint = NULL;
if(!callback_alloc_point(&pPoint)) return;
- pPoint->m_fLatitude = *((double*)data);
+ pPoint->fLatitude = *((double*)data);
data += sizeof(double);
- pPoint->m_fLongitude = *((double*)data);
+ pPoint->fLongitude = *((double*)data);
data += sizeof(double);
g_ptr_array_add(pPointsArray, pPoint);
Index: db.h
===================================================================
RCS file: /cvs/cairo/roadster/src/db.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- db.h 14 Sep 2005 20:06:53 -0000 1.11
+++ db.h 25 Sep 2005 19:02:37 -0000 1.12
@@ -27,11 +27,11 @@
#include <mysql.h>
typedef struct db_connection {
- MYSQL *m_pMySQLConnection;
- gchar* m_pzHost;
- gchar* m_pzUserName;
- gchar* m_pzPassword;
- gchar* m_pzDatabase;
+ MYSQL* pMySQLConnection;
+ gchar* pzHost;
+ gchar* pzUserName;
+ gchar* pzPassword;
+ gchar* pzDatabase;
} db_connection_t;
typedef MYSQL_RES db_resultset_t;
Index: glyph.c
===================================================================
RCS file: /cvs/cairo/roadster/src/glyph.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- glyph.c 24 Sep 2005 05:25:24 -0000 1.6
+++ glyph.c 25 Sep 2005 19:02:37 -0000 1.7
@@ -27,12 +27,12 @@
#include "glyph.h"
struct {
- GPtrArray* m_pGlyphArray; // to store all glyphs we hand out
+ GPtrArray* pGlyphArray; // to store all glyphs we hand out
} g_Glyph;
void glyph_init(void)
{
- g_Glyph.m_pGlyphArray = g_ptr_array_new();
+ g_Glyph.pGlyphArray = g_ptr_array_new();
}
#define MAX_GLYPH_FILE_NAME_LEN (30)
@@ -99,9 +99,9 @@
pNewPixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, nMaxWidth, nMaxHeight);
gdk_pixbuf_fill(pNewPixbuf, 0xFF000080);
}
- pNewGlyph->m_pPixbuf = pNewPixbuf;
- pNewGlyph->m_nWidth = gdk_pixbuf_get_width(pNewPixbuf);
- pNewGlyph->m_nHeight = gdk_pixbuf_get_height(pNewPixbuf);
+ pNewGlyph->pPixbuf = pNewPixbuf;
+ pNewGlyph->nWidth = gdk_pixbuf_get_width(pNewPixbuf);
+ pNewGlyph->nHeight = gdk_pixbuf_get_height(pNewPixbuf);
}
glyph_t* glyph_load_at_size(const gchar* pszName, gint nMaxWidth, gint nMaxHeight)
@@ -109,14 +109,14 @@
// NOTE: We always return something!
glyph_t* pNewGlyph = g_new0(glyph_t, 1);
- pNewGlyph->m_pszName = g_strdup(pszName);
- pNewGlyph->m_nMaxWidth = nMaxWidth;
- pNewGlyph->m_nMaxHeight = nMaxHeight;
+ pNewGlyph->pszName = g_strdup(pszName);
+ pNewGlyph->nMaxWidth = nMaxWidth;
+ pNewGlyph->nMaxHeight = nMaxHeight;
// call internal function to fill the struct
_glyph_load_at_size_into_struct(pNewGlyph, pszName, nMaxWidth, nMaxHeight);
- g_ptr_array_add(g_Glyph.m_pGlyphArray, pNewGlyph);
+ g_ptr_array_add(g_Glyph.pGlyphArray, pNewGlyph);
return pNewGlyph;
}
@@ -124,16 +124,16 @@
GdkPixbuf* glyph_get_pixbuf(const glyph_t* pGlyph)
{
g_assert(pGlyph != NULL);
- g_assert(pGlyph->m_pPixbuf != NULL);
+ g_assert(pGlyph->pPixbuf != NULL);
- return pGlyph->m_pPixbuf;
+ return pGlyph->pPixbuf;
}
void glyph_draw_centered(cairo_t* pCairo, gint nGlyphHandle, gdouble fX, gdouble fY)
{
// GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file_at_size("/home/yella/Desktop/interstate-sign.svg", 32, 32, NULL);
-// gdk_draw_pixbuf(GTK_WIDGET(g_MainWindow.m_pDrawingArea)->window,
-// GTK_WIDGET(g_MainWindow.m_pDrawingArea)->style->fg_gc[GTK_WIDGET_STATE(g_MainWindow.m_pDrawingArea)],
+// gdk_draw_pixbuf(GTK_WIDGET(g_MainWindow.pDrawingArea)->window,
+// GTK_WIDGET(g_MainWindow.pDrawingArea)->style->fg_gc[GTK_WIDGET_STATE(g_MainWindow.pDrawingArea)],
// pixbuf,
// 0,0, // src
// 100,100, // x/y to draw to
@@ -144,30 +144,30 @@
void glyph_free(glyph_t* pGlyph)
{
g_assert(pGlyph);
- gdk_pixbuf_unref(pGlyph->m_pPixbuf);
- g_free(pGlyph->m_pszName);
+ gdk_pixbuf_unref(pGlyph->pPixbuf);
+ g_free(pGlyph->pszName);
g_free(pGlyph);
}
void glyph_deinit(void)
{
gint i;
- for(i=0 ; i<g_Glyph.m_pGlyphArray->len ; i++) {
- glyph_free(g_ptr_array_index(g_Glyph.m_pGlyphArray, i));
+ for(i=0 ; i<g_Glyph.pGlyphArray->len ; i++) {
+ glyph_free(g_ptr_array_index(g_Glyph.pGlyphArray, i));
}
- g_ptr_array_free(g_Glyph.m_pGlyphArray, TRUE);
+ g_ptr_array_free(g_Glyph.pGlyphArray, TRUE);
}
void glyph_reload_all(void)
{
gint i;
- for(i=0 ; i<g_Glyph.m_pGlyphArray->len ; i++) {
- glyph_t* pGlyph = g_ptr_array_index(g_Glyph.m_pGlyphArray, i);
+ for(i=0 ; i<g_Glyph.pGlyphArray->len ; i++) {
+ glyph_t* pGlyph = g_ptr_array_index(g_Glyph.pGlyphArray, i);
- gdk_pixbuf_unref(pGlyph->m_pPixbuf); pGlyph->m_pPixbuf = NULL;
+ gdk_pixbuf_unref(pGlyph->pPixbuf); pGlyph->pPixbuf = NULL;
// the rest of the fields remain.
- _glyph_load_at_size_into_struct(pGlyph, pGlyph->m_pszName, pGlyph->m_nMaxWidth, pGlyph->m_nMaxHeight);
+ _glyph_load_at_size_into_struct(pGlyph, pGlyph->pszName, pGlyph->nMaxWidth, pGlyph->nMaxHeight);
}
}
@@ -187,13 +187,13 @@
return 0;
}
glyph_t* pNewGlyph = g_new0(glyph_t, 1);
- pNewGlyph->m_pCairoSVG = pCairoSVG;
+ pNewGlyph->pCairoSVG = pCairoSVG;
- svg_cairo_get_size(pNewGlyph->m_pCairoSVG, &(pNewGlyph->m_nWidth), &(pNewGlyph->m_nHeight));
+ svg_cairo_get_size(pNewGlyph->pCairoSVG, &(pNewGlyph->nWidth), &(pNewGlyph->nHeight));
// add it to array
- gint nGlyphHandle = g_Glyph.m_pGlyphArray->len; // next available slot
- g_ptr_array_add(g_Glyph.m_pGlyphArray, pNewGlyph);
+ gint nGlyphHandle = g_Glyph.pGlyphArray->len; // next available slot
+ g_ptr_array_add(g_Glyph.pGlyphArray, pNewGlyph);
return nGlyphHandle;
@@ -208,8 +208,8 @@
cairo_save(pCairo);
cairo_set_alpha(pCairo, 0.5);
- cairo_translate(pCairo, (fX - (pGlyph->m_nWidth/2)), (fY - (pGlyph->m_nHeight/2)));
- svg_cairo_render(pGlyph->m_pCairoSVG, pCairo);
+ cairo_translate(pCairo, (fX - (pGlyph->nWidth/2)), (fY - (pGlyph->nHeight/2)));
+ svg_cairo_render(pGlyph->pCairoSVG, pCairo);
cairo_restore(pCairo);
*/
#endif
Index: glyph.h
===================================================================
RCS file: /cvs/cairo/roadster/src/glyph.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- glyph.h 24 Sep 2005 05:25:25 -0000 1.3
+++ glyph.h 25 Sep 2005 19:02:37 -0000 1.4
@@ -28,12 +28,12 @@
#include <cairo.h>
typedef struct {
- GdkPixbuf* m_pPixbuf;
- gint m_nWidth;
- gint m_nHeight;
- gint m_nMaxWidth;
- gint m_nMaxHeight;
- gchar* m_pszName;
+ GdkPixbuf* pPixbuf;
+ gint nWidth;
+ gint nHeight;
+ gint nMaxWidth;
+ gint nMaxHeight;
+ gchar* pszName;
} glyph_t;
void glyph_init(void);
Index: gotowindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/gotowindow.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gotowindow.c 14 Sep 2005 20:06:53 -0000 1.10
+++ gotowindow.c 25 Sep 2005 19:02:37 -0000 1.11
@@ -29,33 +29,33 @@
#include "gui.h"
struct {
- GtkWindow* m_pWindow;
- GtkEntry* m_pLongitudeEntry;
- GtkEntry* m_pLatitudeEntry;
+ GtkWindow* pWindow;
+ GtkEntry* pLongitudeEntry;
+ GtkEntry* pLatitudeEntry;
} g_GotoWindow;
void gotowindow_init(GladeXML* pGladeXML)
{
- GLADE_LINK_WIDGET(pGladeXML, g_GotoWindow.m_pWindow, GTK_WINDOW, "gotowindow");
- GLADE_LINK_WIDGET(pGladeXML, g_GotoWindow.m_pLongitudeEntry, GTK_ENTRY, "longitudeentry");
- GLADE_LINK_WIDGET(pGladeXML, g_GotoWindow.m_pLatitudeEntry, GTK_ENTRY, "latitudeentry");
+ GLADE_LINK_WIDGET(pGladeXML, g_GotoWindow.pWindow, GTK_WINDOW, "gotowindow");
+ GLADE_LINK_WIDGET(pGladeXML, g_GotoWindow.pLongitudeEntry, GTK_ENTRY, "longitudeentry");
+ GLADE_LINK_WIDGET(pGladeXML, g_GotoWindow.pLatitudeEntry, GTK_ENTRY, "latitudeentry");
// don't delete window on X, just hide it
- g_signal_connect(G_OBJECT(g_GotoWindow.m_pWindow), "delete_event", G_CALLBACK(gtk_widget_hide), NULL);
+ g_signal_connect(G_OBJECT(g_GotoWindow.pWindow), "delete_event", G_CALLBACK(gtk_widget_hide), NULL);
}
void gotowindow_show(void)
{
- if(!GTK_WIDGET_VISIBLE(g_GotoWindow.m_pWindow)) {
- gtk_widget_grab_focus(GTK_WIDGET(g_GotoWindow.m_pLatitudeEntry));
- gtk_widget_show(GTK_WIDGET(g_GotoWindow.m_pWindow));
+ if(!GTK_WIDGET_VISIBLE(g_GotoWindow.pWindow)) {
+ gtk_widget_grab_focus(GTK_WIDGET(g_GotoWindow.pLatitudeEntry));
+ gtk_widget_show(GTK_WIDGET(g_GotoWindow.pWindow));
}
- gtk_window_present(g_GotoWindow.m_pWindow);
+ gtk_window_present(g_GotoWindow.pWindow);
}
void gotowindow_hide(void)
{
- gtk_widget_hide(GTK_WIDGET(g_GotoWindow.m_pWindow));
+ gtk_widget_hide(GTK_WIDGET(g_GotoWindow.pWindow));
}
static gboolean util_string_to_double(const gchar* psz, gdouble* pReturn)
@@ -78,12 +78,12 @@
static gboolean gotowindow_go(void)
{
- const gchar* pszLatitude = gtk_entry_get_text(g_GotoWindow.m_pLatitudeEntry);
- const gchar* pszLongitude = gtk_entry_get_text(g_GotoWindow.m_pLongitudeEntry);
+ const gchar* pszLatitude = gtk_entry_get_text(g_GotoWindow.pLatitudeEntry);
+ const gchar* pszLongitude = gtk_entry_get_text(g_GotoWindow.pLongitudeEntry);
mappoint_t pt;
- if(!util_string_to_double(pszLatitude, &(pt.m_fLatitude))) return FALSE;
- if(!util_string_to_double(pszLongitude, &(pt.m_fLongitude))) return FALSE;
+ if(!util_string_to_double(pszLatitude, &(pt.fLatitude))) return FALSE;
+ if(!util_string_to_double(pszLongitude, &(pt.fLongitude))) return FALSE;
mainwindow_map_center_on_mappoint(&pt);
mainwindow_draw_map(DRAWFLAG_ALL);
Index: gpsclient.c
===================================================================
RCS file: /cvs/cairo/roadster/src/gpsclient.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gpsclient.c 14 Sep 2005 20:06:53 -0000 1.11
+++ gpsclient.c 25 Sep 2005 19:02:37 -0000 1.12
@@ -30,9 +30,9 @@
struct {
#ifdef HAVE_GPSD
- struct gps_data_t * m_pGPSConnection; // gps_data_t is from gpsd.h
+ struct gps_data_t * pGPSConnection; // gps_data_t is from gpsd.h
#endif
- gpsdata_t* m_pPublicGPSData; // our public struct (annoyingly similar name...)
+ gpsdata_t* pPublicGPSData; // our public struct (annoyingly similar name...)
} g_GPSClient = {0};
gboolean gpsclient_callback_data_waiting(GIOChannel *source, GIOCondition condition, gpointer data);
@@ -40,11 +40,11 @@
void gpsclient_init()
{
- g_GPSClient.m_pPublicGPSData = g_new0(gpsdata_t, 1);
+ g_GPSClient.pPublicGPSData = g_new0(gpsdata_t, 1);
#ifndef HAVE_GPSD
// No libgpsd at compile time
- g_GPSClient.m_pPublicGPSData->m_eStatus = GPS_STATUS_NO_GPS_COMPILED_IN;
+ g_GPSClient.pPublicGPSData->eStatus = GPS_STATUS_NO_GPS_COMPILED_IN;
#endif
gpsclient_connect();
}
@@ -53,30 +53,30 @@
{
#ifdef HAVE_GPSD
// don't do anything if already connected
- if(g_GPSClient.m_pPublicGPSData->m_eStatus != GPS_STATUS_NO_GPSD) return; // already connected
+ if(g_GPSClient.pPublicGPSData->eStatus != GPS_STATUS_NO_GPSD) return; // already connected
// make sure we clean up
- if(g_GPSClient.m_pGPSConnection) {
- gps_close(g_GPSClient.m_pGPSConnection);
+ if(g_GPSClient.pGPSConnection) {
+ gps_close(g_GPSClient.pGPSConnection);
}
// g_print("Attempting connection to GPSD...\n");
// connect
- g_GPSClient.m_pGPSConnection = gps_open("localhost", DEFAULT_GPSD_PORT);
+ g_GPSClient.pGPSConnection = gps_open("localhost", DEFAULT_GPSD_PORT);
- if(g_GPSClient.m_pGPSConnection) {
+ if(g_GPSClient.pGPSConnection) {
// turn on streaming of GPS data
- gps_query(g_GPSClient.m_pGPSConnection, "w+x\n");
+ gps_query(g_GPSClient.pGPSConnection, "w+x\n");
- g_io_add_watch(g_io_channel_unix_new(g_GPSClient.m_pGPSConnection->gps_fd),
+ g_io_add_watch(g_io_channel_unix_new(g_GPSClient.pGPSConnection->gps_fd),
G_IO_IN, gpsclient_callback_data_waiting, NULL);
// assume no GPS device is present
- g_GPSClient.m_pPublicGPSData->m_eStatus = GPS_STATUS_NO_DEVICE;
+ g_GPSClient.pPublicGPSData->eStatus = GPS_STATUS_NO_DEVICE;
}
else {
- g_GPSClient.m_pPublicGPSData->m_eStatus = GPS_STATUS_NO_GPSD;
+ g_GPSClient.pPublicGPSData->eStatus = GPS_STATUS_NO_GPSD;
}
#endif
}
@@ -85,7 +85,7 @@
{
gpsclient_connect(); // connect if necessary
- return g_GPSClient.m_pPublicGPSData;
+ return g_GPSClient.pPublicGPSData;
}
// callback for g_io_add_watch on the GPSD file descriptor
@@ -93,67 +93,67 @@
{
#ifdef HAVE_GPSD
// g_print("Data from GPSD...\n");
- g_assert(g_GPSClient.m_pGPSConnection != NULL);
- g_assert(g_GPSClient.m_pPublicGPSData != NULL);
+ g_assert(g_GPSClient.pGPSConnection != NULL);
+ g_assert(g_GPSClient.pPublicGPSData != NULL);
- gpsdata_t* l = g_GPSClient.m_pPublicGPSData; // our public data struct, for easy access
+ gpsdata_t* l = g_GPSClient.pPublicGPSData; // our public data struct, for easy access
// is there data waiting on the socket?
if(eCondition == G_IO_IN) {
// read new data
- if(gps_poll(g_GPSClient.m_pGPSConnection) == -1) {
- l->m_eStatus = GPS_STATUS_NO_GPSD;
+ if(gps_poll(g_GPSClient.pGPSConnection) == -1) {
+ l->eStatus = GPS_STATUS_NO_GPSD;
g_print("gps_poll failed\n");
return FALSE;
}
// parse new data
- struct gps_data_t* d = g_GPSClient.m_pGPSConnection; // gpsd data
+ struct gps_data_t* d = g_GPSClient.pGPSConnection; // gpsd data
// is a GPS device available?
if(d->online) {
// Do we have a satellite fix?
if(d->status != STATUS_NO_FIX) {
// a GPS device is present and working!
- l->m_eStatus = GPS_STATUS_LIVE;
- l->m_ptPosition.m_fLatitude = d->fix.latitude;
- l->m_ptPosition.m_fLongitude= d->fix.longitude;
+ l->eStatus = GPS_STATUS_LIVE;
+ l->ptPosition.fLatitude = d->fix.latitude;
+ l->ptPosition.fLongitude= d->fix.longitude;
if(d->pdop < PDOP_EXCELLENT) {
- l->m_fSignalQuality = GPS_SIGNALQUALITY_5_EXCELLENT;
+ l->fSignalQuality = GPS_SIGNALQUALITY_5_EXCELLENT;
}
else if(d->pdop < PDOP_GOOD) {
- l->m_fSignalQuality = GPS_SIGNALQUALITY_4_GOOD;
+ l->fSignalQuality = GPS_SIGNALQUALITY_4_GOOD;
}
else if(d->pdop < PDOP_FAIR) {
- l->m_fSignalQuality = GPS_SIGNALQUALITY_3_FAIR;
+ l->fSignalQuality = GPS_SIGNALQUALITY_3_FAIR;
}
else if(d->pdop < PDOP_POOR) {
- l->m_fSignalQuality = GPS_SIGNALQUALITY_2_POOR;
+ l->fSignalQuality = GPS_SIGNALQUALITY_2_POOR;
}
else {
- l->m_fSignalQuality = GPS_SIGNALQUALITY_1_TERRIBLE;
+ l->fSignalQuality = GPS_SIGNALQUALITY_1_TERRIBLE;
}
// Set speed
- l->m_fSpeedInKilometersPerHour = (d->fix.speed * KNOTS_TO_KPH);
- l->m_fSpeedInMilesPerHour = (d->fix.speed * KNOTS_TO_MPH);
+ l->fSpeedInKilometersPerHour = (d->fix.speed * KNOTS_TO_KPH);
+ l->fSpeedInMilesPerHour = (d->fix.speed * KNOTS_TO_MPH);
// Dampen Noise when not moving fast enough for trustworthy data
- if(l->m_fSignalQuality <= GPS_SIGNALQUALITY_2_POOR &&
- l->m_fSpeedInMilesPerHour <= 2.0)
+ if(l->fSignalQuality <= GPS_SIGNALQUALITY_2_POOR &&
+ l->fSpeedInMilesPerHour <= 2.0)
{
- l->m_fSpeedInMilesPerHour = 0.0;
- l->m_fSpeedInKilometersPerHour = 0.0;
+ l->fSpeedInMilesPerHour = 0.0;
+ l->fSpeedInKilometersPerHour = 0.0;
}
}
else {
- l->m_eStatus = GPS_STATUS_NO_SIGNAL;
- l->m_ptPosition.m_fLatitude = 0.0;
- l->m_ptPosition.m_fLongitude= 0.0;
+ l->eStatus = GPS_STATUS_NO_SIGNAL;
+ l->ptPosition.fLatitude = 0.0;
+ l->ptPosition.fLongitude= 0.0;
}
}
else {
- l->m_eStatus = GPS_STATUS_NO_DEVICE;
+ l->eStatus = GPS_STATUS_NO_DEVICE;
}
}
else {
@@ -167,7 +167,7 @@
/*
static void gpsclient_debug_print(void)
{
- struct gps_data_t* d = g_GPSClient.m_pGPSConnection; // gpsd data
+ struct gps_data_t* d = g_GPSClient.pGPSConnection; // gpsd data
g_print("online = %d, ", d->online);
g_print("latitude = %f, ", d->latitude);
Index: gpsclient.h
===================================================================
RCS file: /cvs/cairo/roadster/src/gpsclient.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gpsclient.h 14 Sep 2005 20:06:53 -0000 1.4
+++ gpsclient.h 25 Sep 2005 19:02:37 -0000 1.5
@@ -55,11 +55,11 @@
// public gpsdata
typedef struct gpsdata {
- EGPSClientStatus m_eStatus;
- mappoint_t m_ptPosition;
- gdouble m_fSignalQuality;
- gdouble m_fSpeedInKilometersPerHour;
- gdouble m_fSpeedInMilesPerHour;
+ EGPSClientStatus eStatus;
+ mappoint_t ptPosition;
+ gdouble fSignalQuality;
+ gdouble fSpeedInKilometersPerHour;
+ gdouble fSpeedInMilesPerHour;
} gpsdata_t;
void gpsclient_init(void);
Index: history.c
===================================================================
RCS file: /cvs/cairo/roadster/src/history.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- history.c 28 Aug 2005 22:23:14 -0000 1.3
+++ history.c 25 Sep 2005 19:02:37 -0000 1.4
@@ -27,8 +27,8 @@
#include "map.h"
typedef struct {
- mappoint_t m_MapPoint;
- gint m_nZoomLevel;
+ mappoint_t MapPoint;
+ gint nZoomLevel;
} mapview_t;
void history_init(void)
@@ -39,8 +39,8 @@
history_t* history_new()
{
history_t* pNew = g_new0(history_t, 1);
- pNew->m_MapViewArray = g_array_new(FALSE, FALSE, sizeof(mapview_t));
- pNew->m_nCurrentIndex = -1;
+ pNew->MapViewArray = g_array_new(FALSE, FALSE, sizeof(mapview_t));
+ pNew->nCurrentIndex = -1;
return pNew;
}
@@ -50,49 +50,49 @@
g_assert(pPoint != NULL);
// If user has clicked BACK a few times, we won't be at the last index in the array...
- if(pHistory->m_nCurrentIndex < (pHistory->m_MapViewArray->len - 1)) {
+ if(pHistory->nCurrentIndex < (pHistory->MapViewArray->len - 1)) {
// ...so clear out everything after where we are
- g_array_remove_range(pHistory->m_MapViewArray, pHistory->m_nCurrentIndex + 1, (pHistory->m_MapViewArray->len - pHistory->m_nCurrentIndex) - 1);
+ g_array_remove_range(pHistory->MapViewArray, pHistory->nCurrentIndex + 1, (pHistory->MapViewArray->len - pHistory->nCurrentIndex) - 1);
- pHistory->m_nTotalItems = (pHistory->m_nCurrentIndex + 1); // +1 to change it from an index to a count, it's NOT for the new item we're adding
+ pHistory->nTotalItems = (pHistory->nCurrentIndex + 1); // +1 to change it from an index to a count, it's NOT for the new item we're adding
}
// Move to next one
- pHistory->m_nCurrentIndex++;
+ pHistory->nCurrentIndex++;
// Grow array if necessary
- if(pHistory->m_nCurrentIndex >= pHistory->m_MapViewArray->len) {
+ if(pHistory->nCurrentIndex >= pHistory->MapViewArray->len) {
// XXX: is this doing a realloc every time? ouch. :)
- g_array_set_size(pHistory->m_MapViewArray, pHistory->m_MapViewArray->len + 1);
+ g_array_set_size(pHistory->MapViewArray, pHistory->MapViewArray->len + 1);
}
// Get pointer to new current index
- mapview_t* pNew = &g_array_index(pHistory->m_MapViewArray, mapview_t, pHistory->m_nCurrentIndex);
+ mapview_t* pNew = &g_array_index(pHistory->MapViewArray, mapview_t, pHistory->nCurrentIndex);
g_return_if_fail(pNew != NULL);
// Save details
- memcpy(&(pNew->m_MapPoint), pPoint, sizeof(mappoint_t));
- pNew->m_nZoomLevel = nZoomLevel;
+ memcpy(&(pNew->MapPoint), pPoint, sizeof(mappoint_t));
+ pNew->nZoomLevel = nZoomLevel;
- pHistory->m_nTotalItems++;
+ pHistory->nTotalItems++;
- g_assert(pHistory->m_nCurrentIndex < pHistory->m_nTotalItems);
+ g_assert(pHistory->nCurrentIndex < pHistory->nTotalItems);
}
gboolean history_can_go_forward(history_t* pHistory)
{
- return(pHistory->m_nCurrentIndex < (pHistory->m_nTotalItems - 1));
+ return(pHistory->nCurrentIndex < (pHistory->nTotalItems - 1));
}
gboolean history_can_go_back(history_t* pHistory)
{
- return(pHistory->m_nCurrentIndex > 0);
+ return(pHistory->nCurrentIndex > 0);
}
gboolean history_go_forward(history_t* pHistory)
{
if(history_can_go_forward(pHistory)) {
- pHistory->m_nCurrentIndex++;
+ pHistory->nCurrentIndex++;
return TRUE;
}
}
@@ -100,7 +100,7 @@
gboolean history_go_back(history_t* pHistory)
{
if(history_can_go_back(pHistory)) {
- pHistory->m_nCurrentIndex--;
+ pHistory->nCurrentIndex--;
return TRUE;
}
}
@@ -110,11 +110,11 @@
g_assert(pHistory != NULL);
g_assert(pReturnPoint != NULL);
g_assert(pnReturnZoomLevel != NULL);
- g_assert(pHistory->m_nCurrentIndex >= 0);
- g_assert(pHistory->m_nCurrentIndex < pHistory->m_nTotalItems);
+ g_assert(pHistory->nCurrentIndex >= 0);
+ g_assert(pHistory->nCurrentIndex < pHistory->nTotalItems);
- mapview_t* pCurrent = &g_array_index(pHistory->m_MapViewArray, mapview_t, pHistory->m_nCurrentIndex);
+ mapview_t* pCurrent = &g_array_index(pHistory->MapViewArray, mapview_t, pHistory->nCurrentIndex);
- memcpy(pReturnPoint, &(pCurrent->m_MapPoint), sizeof(mappoint_t));
- *pnReturnZoomLevel = pCurrent->m_nZoomLevel;
+ memcpy(pReturnPoint, &(pCurrent->MapPoint), sizeof(mappoint_t));
+ *pnReturnZoomLevel = pCurrent->nZoomLevel;
}
Index: history.h
===================================================================
RCS file: /cvs/cairo/roadster/src/history.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- history.h 20 Mar 2005 10:57:05 -0000 1.1
+++ history.h 25 Sep 2005 19:02:37 -0000 1.2
@@ -27,9 +27,9 @@
#include "map.h"
typedef struct {
- gint m_nCurrentIndex;
- gint m_nTotalItems;
- GArray* m_MapViewArray;
+ gint nCurrentIndex;
+ gint nTotalItems;
+ GArray* MapViewArray;
} history_t;
void history_init(void);
Index: import_tiger.c
===================================================================
RCS file: /cvs/cairo/roadster/src/import_tiger.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- import_tiger.c 14 Sep 2005 20:06:54 -0000 1.20
+++ import_tiger.c 25 Sep 2005 19:02:37 -0000 1.21
@@ -56,8 +56,8 @@
#define CALLBACKS_PER_PULSE (30) // call " after this many iterations over hash tables (writing to DB)
typedef struct {
- gchar* m_pszCode;
- gchar* m_pszName;
+ gchar* pszCode;
+ gchar* pszName;
} state_t;
extern state_t g_aStates[79];
@@ -73,76 +73,76 @@
#define TIGER_CHAIN_NAME_LEN (30)
typedef struct tiger_record_rt1
{
- gint m_nTLID; // index- TLID links a complete chain together
- gint m_nRecordType;
- mappoint_t m_PointA;
- mappoint_t m_PointB;
- gint m_nAddressLeftStart;
- gint m_nAddressLeftEnd;
- gint m_nAddressRightStart;
- gint m_nAddressRightEnd;
+ gint nTLID; // index- TLID links a complete chain together
+ gint nRecordType;
+ mappoint_t PointA;
+ mappoint_t PointB;
+ gint nAddressLeftStart;
+ gint nAddressLeftEnd;
+ gint nAddressRightStart;
+ gint nAddressRightEnd;
- gint m_nZIPCodeLeft;
- gint m_nZIPCodeRight;
+ gint nZIPCodeLeft;
+ gint nZIPCodeRight;
- char m_achName[TIGER_CHAIN_NAME_LEN + 1];
- gint m_nRoadNameSuffixID;
+ char achName[TIGER_CHAIN_NAME_LEN + 1];
+ gint nRoadNameSuffixID;
- gint m_nFIPS55Left;
- gint m_nFIPS55Right;
+ gint nFIPS55Left;
+ gint nFIPS55Right;
- gint m_nCountyIDLeft; // if left and right are in diff counties, we've found a boundary line!
- gint m_nCountyIDRight;
+ gint nCountyIDLeft; // if left and right are in diff counties, we've found a boundary line!
+ gint nCountyIDRight;
} tiger_record_rt1_t;
#define TIGER_RT2_MAX_POINTS (10)
typedef struct tiger_record_rt2
{
- gint m_nTLID; // index- TLID links a complete chain together
+ gint nTLID; // index- TLID links a complete chain together
- GPtrArray* m_pPointsArray;
+ GPtrArray* pPointsArray;
} tiger_record_rt2_t;
#define TIGER_LANDMARK_NAME_LEN (30)
typedef struct tiger_record_rt7
{
- gint m_nLANDID; // index- a unique landmark ID #
- gint m_nRecordType;
- char m_achName[TIGER_LANDMARK_NAME_LEN + 1]; // note the +1!!
- mappoint_t m_Point;
+ gint nLANDID; // index- a unique landmark ID #
+ gint nRecordType;
+ char achName[TIGER_LANDMARK_NAME_LEN + 1]; // note the +1!!
+ mappoint_t Point;
} tiger_record_rt7_t;
typedef struct tiger_record_rt8
{
- gint m_nPOLYID; // index (for each polygon, we'll get the
- gint m_nLANDID; // FK to table 7
+ gint nPOLYID; // index (for each polygon, we'll get the
+ gint nLANDID; // FK to table 7
} tiger_record_rt8_t;
typedef struct tiger_rt1_link
{
- gint m_nTLID;
- gint m_nPointATZID; // the unique # for the rt1's PointA, usefull for stiching chains together
- gint m_nPointBTZID; // the unique # for the rt1's PointB
+ gint nTLID;
+ gint nPointATZID; // the unique # for the rt1's PointA, usefull for stiching chains together
+ gint nPointBTZID; // the unique # for the rt1's PointB
} tiger_rt1_link_t;
typedef struct tiger_import_process {
- gchar* m_pszFileDescription;
+ gchar* pszFileDescription;
- GHashTable* m_pTableRT1;
- GHashTable* m_pTableRT2;
- GHashTable* m_pTableRT7;
- GHashTable* m_pTableRT8;
- GHashTable* m_pTableRTi;
- GHashTable* m_pTableRTc;
+ GHashTable* pTableRT1;
+ GHashTable* pTableRT2;
+ GHashTable* pTableRT7;
+ GHashTable* pTableRT8;
+ GHashTable* pTableRTi;
+ GHashTable* pTableRTc;
- GPtrArray* m_pBoundaryRT1s;
+ GPtrArray* pBoundaryRT1s;
} tiger_import_process_t;
typedef struct tiger_record_rti
{
// store a list of TLIDs for a polygonID
- gint m_nPOLYID; // index
- GPtrArray* m_pRT1LinksArray;
+ gint nPOLYID; // index
+ GPtrArray* pRT1LinksArray;
} tiger_record_rti_t;
#define TIGER_CITY_NAME_LEN (60)
@@ -150,9 +150,9 @@
typedef struct tiger_record_rtc
{
// store a list of city names
- gint m_nFIPS55; // index
- char m_achName[TIGER_CITY_NAME_LEN + 1]; // note the +1!!
- gint m_nCityID; // a database ID, stored here after it is inserted
+ gint nFIPS55; // index
+ char achName[TIGER_CITY_NAME_LEN + 1]; // note the +1!!
+ gint nCityID; // a database ID, stored here after it is inserted
} tiger_record_rtc_t;
@@ -449,7 +449,7 @@
if(g_str_has_prefix(p, "Title: ")) {
// found title line
p += 7; // move past "Title: "
- pImportProcess->m_pszFileDescription = import_tiger_copy_line(p);
+ pImportProcess->pszFileDescription = import_tiger_copy_line(p);
bSuccess = TRUE;
}
// move to end of line
@@ -474,60 +474,60 @@
tiger_record_rt1_t* pRecord = g_new0(tiger_record_rt1_t, 1);
- pRecord->m_nRecordType = nRecordType;
+ pRecord->nRecordType = nRecordType;
// addresses (these are really not numeric, they are alpha... how to handle this?)
- import_tiger_read_address(&pLine[59-1], 11, &pRecord->m_nAddressLeftStart);
- import_tiger_read_address(&pLine[70-1], 11, &pRecord->m_nAddressLeftEnd);
- import_tiger_read_address(&pLine[81-1], 11, &pRecord->m_nAddressRightStart);
- import_tiger_read_address(&pLine[92-1], 11, &pRecord->m_nAddressRightEnd);
+ import_tiger_read_address(&pLine[59-1], 11, &pRecord->nAddressLeftStart);
+ import_tiger_read_address(&pLine[70-1], 11, &pRecord->nAddressLeftEnd);
+ import_tiger_read_address(&pLine[81-1], 11, &pRecord->nAddressRightStart);
+ import_tiger_read_address(&pLine[92-1], 11, &pRecord->nAddressRightEnd);
// columns 107-111 and 112-116 are zip codes
- import_tiger_read_int(&pLine[107-1], 5, &pRecord->m_nZIPCodeLeft);
- import_tiger_read_int(&pLine[112-1], 5, &pRecord->m_nZIPCodeRight);
+ import_tiger_read_int(&pLine[107-1], 5, &pRecord->nZIPCodeLeft);
+ import_tiger_read_int(&pLine[112-1], 5, &pRecord->nZIPCodeRight);
// columns 6 to 15 is the TLID -
- import_tiger_read_int(&pLine[6-1], TIGER_TLID_LENGTH, &pRecord->m_nTLID);
+ import_tiger_read_int(&pLine[6-1], TIGER_TLID_LENGTH, &pRecord->nTLID);
// columns 20 to ? is the name
- import_tiger_read_string(&pLine[20-1], TIGER_CHAIN_NAME_LEN, &pRecord->m_achName[0]);
+ import_tiger_read_string(&pLine[20-1], TIGER_CHAIN_NAME_LEN, &pRecord->achName[0]);
// columns 141-145 and 146-150 are FIPS55 codes which link this road to a city
- import_tiger_read_int(&pLine[141-1], TIGER_FIPS55_LEN, &pRecord->m_nFIPS55Left);
- import_tiger_read_int(&pLine[146-1], TIGER_FIPS55_LEN, &pRecord->m_nFIPS55Right);
+ import_tiger_read_int(&pLine[141-1], TIGER_FIPS55_LEN, &pRecord->nFIPS55Left);
+ import_tiger_read_int(&pLine[146-1], TIGER_FIPS55_LEN, &pRecord->nFIPS55Right);
// Read suffix name and convert it to an integer
gchar achType[5];
import_tiger_read_string(&pLine[50-1], 4, &achType[0]);
-// g_print("%30s is type %s\n", pRecord->m_achName, achType);
- road_suffix_atoi(achType, &pRecord->m_nRoadNameSuffixID);
+// g_print("%30s is type %s\n", pRecord->achName, achType);
+ road_suffix_atoi(achType, &pRecord->nRoadNameSuffixID);
-if(achType[0] != '\0' && pRecord->m_nRoadNameSuffixID == ROAD_SUFFIX_NONE) {
+if(achType[0] != '\0' && pRecord->nRoadNameSuffixID == ROAD_SUFFIX_NONE) {
g_print("type '%s' couldn't be looked up\n", achType);
}
- import_tiger_read_int(&pLine[135-1], 3, &pRecord->m_nCountyIDLeft);
- import_tiger_read_int(&pLine[138-1], 3, &pRecord->m_nCountyIDRight);
+ import_tiger_read_int(&pLine[135-1], 3, &pRecord->nCountyIDLeft);
+ import_tiger_read_int(&pLine[138-1], 3, &pRecord->nCountyIDRight);
- if(pRecord->m_nCountyIDLeft != pRecord->m_nCountyIDRight) {
+ if(pRecord->nCountyIDLeft != pRecord->nCountyIDRight) {
g_ptr_array_add(pBoundaryRT1s, pRecord);
// g_print("county boundary\n");
}
//~ gint nFeatureType;
//~ import_tiger_read_int(&pLine[50-1], 4, &nFeatureType);
- //~ g_print("name: '%s' (%d)\n", pRecord->m_achName, nFeatureType);
+ //~ g_print("name: '%s' (%d)\n", pRecord->achName, nFeatureType);
-//g_print("for name %s\n", pRecord->m_achName);
+//g_print("for name %s\n", pRecord->achName);
// lat/lon coordinates...
- import_tiger_read_lon(&pLine[191-1], &pRecord->m_PointA.m_fLongitude);
- import_tiger_read_lat(&pLine[201-1], &pRecord->m_PointA.m_fLatitude);
- import_tiger_read_lon(&pLine[210-1], &pRecord->m_PointB.m_fLongitude);
- import_tiger_read_lat(&pLine[220-1], &pRecord->m_PointB.m_fLatitude);
+ import_tiger_read_lon(&pLine[191-1], &pRecord->PointA.fLongitude);
+ import_tiger_read_lat(&pLine[201-1], &pRecord->PointA.fLatitude);
+ import_tiger_read_lon(&pLine[210-1], &pRecord->PointB.fLongitude);
+ import_tiger_read_lat(&pLine[220-1], &pRecord->PointB.fLatitude);
-//g_print("name: %s, (%f,%f) (%f,%f)\n", pRecord->m_achName, pRecord->m_PointA.m_fLongitude, pRecord->m_PointA.m_fLatitude, pRecord->m_PointB.m_fLongitude, pRecord->m_PointB.m_fLatitude);
+//g_print("name: %s, (%f,%f) (%f,%f)\n", pRecord->achName, pRecord->PointA.fLongitude, pRecord->PointA.fLatitude, pRecord->PointB.fLongitude, pRecord->PointB.fLatitude);
// add to table
- g_hash_table_insert(pTable, &pRecord->m_nTLID, pRecord);
+ g_hash_table_insert(pTable, &pRecord->nTLID, pRecord);
}
return TRUE;
}
@@ -547,29 +547,29 @@
if(pRecord == NULL) {
// create new one and add it
pRecord = g_new0(tiger_record_rt2_t, 1);
- pRecord->m_nTLID = nTLID;
- pRecord->m_pPointsArray = g_ptr_array_new();
+ pRecord->nTLID = nTLID;
+ pRecord->pPointsArray = g_ptr_array_new();
// add to table
- g_hash_table_insert(pTable, &pRecord->m_nTLID, pRecord);
+ g_hash_table_insert(pTable, &pRecord->nTLID, pRecord);
}
else {
- // g_print("****** updating existing record %d\n", pRecord->m_nTLID);
+ // g_print("****** updating existing record %d\n", pRecord->nTLID);
}
mappoint_t point;
gint iPoint;
for(iPoint=0 ; iPoint< TIGER_RT2_MAX_POINTS ; iPoint++) {
- import_tiger_read_lon(&pLine[19-1 + (iPoint * 19)], &point.m_fLongitude);
- import_tiger_read_lat(&pLine[29-1 + (iPoint * 19)], &point.m_fLatitude);
- if(point.m_fLatitude == 0.0 && point.m_fLongitude == 0.0) {
+ import_tiger_read_lon(&pLine[19-1 + (iPoint * 19)], &point.fLongitude);
+ import_tiger_read_lat(&pLine[29-1 + (iPoint * 19)], &point.fLatitude);
+ if(point.fLatitude == 0.0 && point.fLongitude == 0.0) {
break;
}
mappoint_t* pNewPoint = g_new0(mappoint_t, 1);
- pNewPoint->m_fLatitude = point.m_fLatitude;
- pNewPoint->m_fLongitude = point.m_fLongitude;
+ pNewPoint->fLatitude = point.fLatitude;
+ pNewPoint->fLongitude = point.fLongitude;
- g_ptr_array_add(pRecord->m_pPointsArray, pNewPoint);
+ g_ptr_array_add(pRecord->pPointsArray, pNewPoint);
}
}
return TRUE;
@@ -590,21 +590,21 @@
import_tiger_read_layer_type(&pLine[22-1], &nRecordType);
pRecord = g_new0(tiger_record_rt7_t, 1);
- pRecord->m_nRecordType = nRecordType;
+ pRecord->nRecordType = nRecordType;
// columns 11 to 20 is the TLID -
- import_tiger_read_int(&pLine[11-1], TIGER_LANDID_LENGTH, &pRecord->m_nLANDID);
+ import_tiger_read_int(&pLine[11-1], TIGER_LANDID_LENGTH, &pRecord->nLANDID);
- import_tiger_read_string(&pLine[25-1], TIGER_LANDMARK_NAME_LEN, &pRecord->m_achName[0]);
+ import_tiger_read_string(&pLine[25-1], TIGER_LANDMARK_NAME_LEN, &pRecord->achName[0]);
//if(nRecordType == MAP_OBJECT_TYPE_MISC_AREA) {
- // g_print("misc area: %s\n", pRecord->m_achName);
+ // g_print("misc area: %s\n", pRecord->achName);
//}
-// g_print("record 7: TypeID=%d LANDID=%d\n", pRecord->m_nRecordType, pRecord->m_nLANDID);
-//g_print("name: '%s'\n", pRecord->m_achName);
+// g_print("record 7: TypeID=%d LANDID=%d\n", pRecord->nRecordType, pRecord->nLANDID);
+//g_print("name: '%s'\n", pRecord->achName);
// add to table
- g_hash_table_insert(pTable, &pRecord->m_nLANDID, pRecord);
+ g_hash_table_insert(pTable, &pRecord->nLANDID, pRecord);
}
return TRUE;
}
@@ -621,15 +621,15 @@
pRecord = g_new0(tiger_record_rt8_t, 1);
// columns 16 to 25 is the POLYGON ID -
- import_tiger_read_int(&pLine[16-1], TIGER_POLYID_LENGTH, &pRecord->m_nPOLYID);
+ import_tiger_read_int(&pLine[16-1], TIGER_POLYID_LENGTH, &pRecord->nPOLYID);
// columns 26 to 35 is the LANDMARK ID -
- import_tiger_read_int(&pLine[26-1], TIGER_LANDID_LENGTH, &pRecord->m_nLANDID);
+ import_tiger_read_int(&pLine[26-1], TIGER_LANDID_LENGTH, &pRecord->nLANDID);
-// g_print("record 8: POLYID=%d LANDID=%d\n", pRecord->m_nPOLYID, pRecord->m_nLANDID);
+// g_print("record 8: POLYID=%d LANDID=%d\n", pRecord->nPOLYID, pRecord->nLANDID);
// add to table
- g_hash_table_insert(pTable, &pRecord->m_nPOLYID, pRecord);
+ g_hash_table_insert(pTable, &pRecord->nPOLYID, pRecord);
}
return TRUE;
}
@@ -650,13 +650,13 @@
pRecord = g_new0(tiger_record_rtc_t, 1);
// columns 15 to 19 is the FIPS number (links roads to cities)
- import_tiger_read_int(&pLine[15-1], TIGER_FIPS55_LEN, &pRecord->m_nFIPS55);
- import_tiger_read_string(&pLine[63-1], TIGER_CITY_NAME_LEN, &pRecord->m_achName[0]);
+ import_tiger_read_int(&pLine[15-1], TIGER_FIPS55_LEN, &pRecord->nFIPS55);
+ import_tiger_read_string(&pLine[63-1], TIGER_CITY_NAME_LEN, &pRecord->achName[0]);
-g_print("record c: FIPS55=%d NAME=%s\n", pRecord->m_nFIPS55, pRecord->m_achName);
+g_print("record c: FIPS55=%d NAME=%s\n", pRecord->nFIPS55, pRecord->achName);
// add to table
- g_hash_table_insert(pTable, &pRecord->m_nFIPS55, pRecord);
+ g_hash_table_insert(pTable, &pRecord->nFIPS55, pRecord);
}
return TRUE;
}
@@ -703,43 +703,43 @@
if(pRecord == NULL) {
// create new RTi record and add the link to it
pRecord = g_new0(tiger_record_rti_t, 1);
- pRecord->m_nPOLYID = nLeftPolygonID;
- pRecord->m_pRT1LinksArray = g_ptr_array_new();
+ pRecord->nPOLYID = nLeftPolygonID;
+ pRecord->pRT1LinksArray = g_ptr_array_new();
// add new RTi record to the RTi hash table (indexed by POLYID)
- g_hash_table_insert(pTable, &pRecord->m_nPOLYID, pRecord);
+ g_hash_table_insert(pTable, &pRecord->nPOLYID, pRecord);
- //g_print("(L)added TLID %d to new polygon %d ", nTLID, pRecord->m_nPOLYID);
+ //g_print("(L)added TLID %d to new polygon %d ", nTLID, pRecord->nPOLYID);
}
else {
- //g_print("(L)added TLID %d to existing polygon %d ", nTLID, pRecord->m_nPOLYID);
+ //g_print("(L)added TLID %d to existing polygon %d ", nTLID, pRecord->nPOLYID);
}
tiger_rt1_link_t* pNewRT1Link = g_new0(tiger_rt1_link_t, 1);
- pNewRT1Link->m_nTLID = nTLID;
- pNewRT1Link->m_nPointATZID = nZeroCellA;
- pNewRT1Link->m_nPointBTZID = nZeroCellB;
- g_ptr_array_add(pRecord->m_pRT1LinksArray, pNewRT1Link);
+ pNewRT1Link->nTLID = nTLID;
+ pNewRT1Link->nPointATZID = nZeroCellA;
+ pNewRT1Link->nPointBTZID = nZeroCellB;
+ g_ptr_array_add(pRecord->pRT1LinksArray, pNewRT1Link);
}
if(nRightPolygonID != 0) {
pRecord = g_hash_table_lookup(pTable, &nRightPolygonID);
if(pRecord == NULL) {
// create new one and add it
pRecord = g_new0(tiger_record_rti_t, 1);
- pRecord->m_nPOLYID = nRightPolygonID;
- pRecord->m_pRT1LinksArray = g_ptr_array_new();
+ pRecord->nPOLYID = nRightPolygonID;
+ pRecord->pRT1LinksArray = g_ptr_array_new();
// add new RTi record to the RTi hash table (indexed by POLYID)
- g_hash_table_insert(pTable, &pRecord->m_nPOLYID, pRecord);
- //g_print("(R)adding TLID %d to new polygon %d ", nTLID, pRecord->m_nPOLYID);
+ g_hash_table_insert(pTable, &pRecord->nPOLYID, pRecord);
+ //g_print("(R)adding TLID %d to new polygon %d ", nTLID, pRecord->nPOLYID);
}
else {
- //g_print("(R)adding TLID %d to existing polygon %d ", nTLID, pRecord->m_nPOLYID);
+ //g_print("(R)adding TLID %d to existing polygon %d ", nTLID, pRecord->nPOLYID);
}
tiger_rt1_link_t* pNewRT1Link = g_new0(tiger_rt1_link_t, 1);
- pNewRT1Link->m_nTLID = nTLID;
- pNewRT1Link->m_nPointATZID = nZeroCellA;
- pNewRT1Link->m_nPointBTZID = nZeroCellB;
- g_ptr_array_add(pRecord->m_pRT1LinksArray, pNewRT1Link);
+ pNewRT1Link->nTLID = nTLID;
+ pNewRT1Link->nPointATZID = nZeroCellA;
+ pNewRT1Link->nPointBTZID = nZeroCellB;
+ g_ptr_array_add(pRecord->pRT1LinksArray, pNewRT1Link);
}
}
return TRUE;
@@ -757,37 +757,37 @@
tiger_import_process_t* pImportProcess = (tiger_import_process_t*)user_data;
tiger_record_rt1_t* pRecordRT1 = (tiger_record_rt1_t*)value;
// lookup table2 record by TLID
- tiger_record_rt2_t* pRecordRT2 = g_hash_table_lookup(pImportProcess->m_pTableRT2, &pRecordRT1->m_nTLID);
+ tiger_record_rt2_t* pRecordRT2 = g_hash_table_lookup(pImportProcess->pTableRT2, &pRecordRT1->nTLID);
// add RT1's point A, (optionally) add all points from RT2, then add RT1's point B
- g_ptr_array_add(pTempPointsArray, &pRecordRT1->m_PointA);
+ g_ptr_array_add(pTempPointsArray, &pRecordRT1->PointA);
if(pRecordRT2 != NULL) {
- // append all points from pRecordRT2->m_pPointsArray to pTempPointsArray
+ // append all points from pRecordRT2->pPointsArray to pTempPointsArray
gint i;
- for(i=0 ; i<pRecordRT2->m_pPointsArray->len ; i++) {
- g_ptr_array_add(pTempPointsArray, g_ptr_array_index(pRecordRT2->m_pPointsArray, i));
+ for(i=0 ; i<pRecordRT2->pPointsArray->len ; i++) {
+ g_ptr_array_add(pTempPointsArray, g_ptr_array_index(pRecordRT2->pPointsArray, i));
}
}
- g_ptr_array_add(pTempPointsArray, &pRecordRT1->m_PointB);
+ g_ptr_array_add(pTempPointsArray, &pRecordRT1->PointB);
//
// Change rivers into lakes if they are circular (why doesn't this work here?)
//
-// if(pRecordRT1->m_nRecordType == MAP_OBJECT_TYPE_RIVER) {
-// if(((gint)(pRecordRT1->m_PointA.m_fLongitude * 1000.0)) == ((gint)(pRecordRT1->m_PointB.m_fLongitude * 1000.0)) &&
-// ((gint)(pRecordRT1->m_PointA.m_fLatitude * 1000.0)) == ((gint)(pRecordRT1->m_PointB.m_fLatitude * 1000.0)))
+// if(pRecordRT1->nRecordType == MAP_OBJECT_TYPE_RIVER) {
+// if(((gint)(pRecordRT1->PointA.fLongitude * 1000.0)) == ((gint)(pRecordRT1->PointB.fLongitude * 1000.0)) &&
+// ((gint)(pRecordRT1->PointA.fLatitude * 1000.0)) == ((gint)(pRecordRT1->PointB.fLatitude * 1000.0)))
// {
-// if(pRecordRT1->m_PointA.m_fLongitude != pRecordRT1->m_PointB.m_fLongitude) {
-// g_print("OOPS: %20.20f != %20.20f\n", pRecordRT1->m_PointA.m_fLongitude, pRecordRT1->m_PointB.m_fLongitude);
+// if(pRecordRT1->PointA.fLongitude != pRecordRT1->PointB.fLongitude) {
+// g_print("OOPS: %20.20f != %20.20f\n", pRecordRT1->PointA.fLongitude, pRecordRT1->PointB.fLongitude);
// }
-// if(pRecordRT1->m_PointA.m_fLatitude != pRecordRT1->m_PointB.m_fLatitude) {
-// g_print("OOPS: %20.20f != %20.20f\n", pRecordRT1->m_PointA.m_fLatitude, pRecordRT1->m_PointB.m_fLatitude);
+// if(pRecordRT1->PointA.fLatitude != pRecordRT1->PointB.fLatitude) {
+// g_print("OOPS: %20.20f != %20.20f\n", pRecordRT1->PointA.fLatitude, pRecordRT1->PointB.fLatitude);
// }
-// g_print("converting circular river to lake: %s\n", pRecordRT1->m_achName);
-// pRecordRT1->m_nRecordType = MAP_OBJECT_TYPE_LAKE;
+// g_print("converting circular river to lake: %s\n", pRecordRT1->achName);
+// pRecordRT1->nRecordType = MAP_OBJECT_TYPE_LAKE;
// }
// else {
-// // g_print("NOT converting river: %s (%f != %f)(%f != %f)\n", pRecordRT1->m_achName, pRecordRT1->m_PointA.m_fLongitude, pRecordRT1->m_PointB.m_fLongitude, pRecordRT1->m_PointA.m_fLatitude, pRecordRT1->m_PointB.m_fLatitude);
+// // g_print("NOT converting river: %s (%f != %f)(%f != %f)\n", pRecordRT1->achName, pRecordRT1->PointA.fLongitude, pRecordRT1->PointB.fLongitude, pRecordRT1->PointA.fLatitude, pRecordRT1->PointB.fLatitude);
// }
// }
@@ -798,47 +798,47 @@
tiger_record_rtc_t* pRecordRTc;
// lookup left CityID, if the FIPS is valid
- if(pRecordRT1->m_nFIPS55Left != 0) {
- pRecordRTc = g_hash_table_lookup(pImportProcess->m_pTableRTc, &pRecordRT1->m_nFIPS55Left);
+ if(pRecordRT1->nFIPS55Left != 0) {
+ pRecordRTc = g_hash_table_lookup(pImportProcess->pTableRTc, &pRecordRT1->nFIPS55Left);
if(pRecordRTc) {
- nCityLeftID = pRecordRTc->m_nCityID;
+ nCityLeftID = pRecordRTc->nCityID;
}
else {
- g_warning("couldn't lookup CityID by FIPS %d for road %s\n", pRecordRT1->m_nFIPS55Left, pRecordRT1->m_achName);
+ g_warning("couldn't lookup CityID by FIPS %d for road %s\n", pRecordRT1->nFIPS55Left, pRecordRT1->achName);
}
}
// lookup right CityID, if the FIPS is valid
- if(pRecordRT1->m_nFIPS55Right != 0) {
- pRecordRTc = g_hash_table_lookup(pImportProcess->m_pTableRTc, &pRecordRT1->m_nFIPS55Right);
+ if(pRecordRT1->nFIPS55Right != 0) {
+ pRecordRTc = g_hash_table_lookup(pImportProcess->pTableRTc, &pRecordRT1->nFIPS55Right);
if(pRecordRTc) {
- nCityRightID = pRecordRTc->m_nCityID;
+ nCityRightID = pRecordRTc->nCityID;
}
else {
- g_warning("couldn't lookup city ID by FIPS %d for road %s\n", pRecordRT1->m_nFIPS55Right, pRecordRT1->m_achName);
+ g_warning("couldn't lookup city ID by FIPS %d for road %s\n", pRecordRT1->nFIPS55Right, pRecordRT1->achName);
}
}
// insert, then free temp array
- if(pRecordRT1->m_nRecordType != MAP_OBJECT_TYPE_NONE) {
+ if(pRecordRT1->nRecordType != MAP_OBJECT_TYPE_NONE) {
gchar azZIPCodeLeft[6];
- g_snprintf(azZIPCodeLeft, 6, "%05d", pRecordRT1->m_nZIPCodeLeft);
+ g_snprintf(azZIPCodeLeft, 6, "%05d", pRecordRT1->nZIPCodeLeft);
gchar azZIPCodeRight[6];
- g_snprintf(azZIPCodeRight, 6, "%05d", pRecordRT1->m_nZIPCodeRight);
+ g_snprintf(azZIPCodeRight, 6, "%05d", pRecordRT1->nZIPCodeRight);
gint nRoadNameID = 0;
- if(pRecordRT1->m_achName[0] != '\0') {
- //printf("inserting road name %s\n", pRecordRT1->m_achName);
- db_insert_roadname(pRecordRT1->m_achName, pRecordRT1->m_nRoadNameSuffixID, &nRoadNameID);
+ if(pRecordRT1->achName[0] != '\0') {
+ //printf("inserting road name %s\n", pRecordRT1->achName);
+ db_insert_roadname(pRecordRT1->achName, pRecordRT1->nRoadNameSuffixID, &nRoadNameID);
}
gint nRoadID;
db_insert_road(nRoadNameID,
- pRecordRT1->m_nRecordType,
- pRecordRT1->m_nAddressLeftStart,
- pRecordRT1->m_nAddressLeftEnd,
- pRecordRT1->m_nAddressRightStart,
- pRecordRT1->m_nAddressRightEnd,
+ pRecordRT1->nRecordType,
+ pRecordRT1->nAddressLeftStart,
+ pRecordRT1->nAddressLeftEnd,
+ pRecordRT1->nAddressRightStart,
+ pRecordRT1->nAddressRightEnd,
nCityLeftID, nCityRightID,
azZIPCodeLeft, azZIPCodeRight,
pTempPointsArray, &nRoadID);
@@ -854,36 +854,36 @@
static void tiger_util_add_RT1_points_to_array(tiger_import_process_t* pImportProcess, gint nTLID, GPtrArray* pPointsArray, EOrder eOrder)
{
g_assert(pImportProcess != NULL);
- g_assert(pImportProcess->m_pTableRT1 != NULL);
- g_assert(pImportProcess->m_pTableRT2 != NULL);
+ g_assert(pImportProcess->pTableRT1 != NULL);
+ g_assert(pImportProcess->pTableRT2 != NULL);
// lookup table1 record by TLID
- tiger_record_rt1_t* pRecordRT1 = g_hash_table_lookup(pImportProcess->m_pTableRT1, &nTLID);
+ tiger_record_rt1_t* pRecordRT1 = g_hash_table_lookup(pImportProcess->pTableRT1, &nTLID);
if(pRecordRT1 == NULL) return;
// lookup table2 record by TLID
- tiger_record_rt2_t* pRecordRT2 = g_hash_table_lookup(pImportProcess->m_pTableRT2, &pRecordRT1->m_nTLID);
+ tiger_record_rt2_t* pRecordRT2 = g_hash_table_lookup(pImportProcess->pTableRT2, &pRecordRT1->nTLID);
if(eOrder == ORDER_FORWARD) {
- g_ptr_array_add(pPointsArray, &pRecordRT1->m_PointA);
+ g_ptr_array_add(pPointsArray, &pRecordRT1->PointA);
if(pRecordRT2 != NULL) {
- // append all points from pRecordRT2->m_pPointsArray
+ // append all points from pRecordRT2->pPointsArray
gint i;
- for(i=0 ; i<pRecordRT2->m_pPointsArray->len ; i++) {
- g_ptr_array_add(pPointsArray, g_ptr_array_index(pRecordRT2->m_pPointsArray, i));
+ for(i=0 ; i<pRecordRT2->pPointsArray->len ; i++) {
+ g_ptr_array_add(pPointsArray, g_ptr_array_index(pRecordRT2->pPointsArray, i));
}
}
- g_ptr_array_add(pPointsArray, &pRecordRT1->m_PointB);
+ g_ptr_array_add(pPointsArray, &pRecordRT1->PointB);
} else {
- g_ptr_array_add(pPointsArray, &pRecordRT1->m_PointB);
+ g_ptr_array_add(pPointsArray, &pRecordRT1->PointB);
if(pRecordRT2 != NULL) {
- // append all points from pRecordRT2->m_pPointsArray in REVERSE order
+ // append all points from pRecordRT2->pPointsArray in REVERSE order
gint i;
- for(i=pRecordRT2->m_pPointsArray->len-1 ; i>=0 ; i--) {
- g_ptr_array_add(pPointsArray, g_ptr_array_index(pRecordRT2->m_pPointsArray, i));
+ for(i=pRecordRT2->pPointsArray->len-1 ; i>=0 ; i--) {
+ g_ptr_array_add(pPointsArray, g_ptr_array_index(pRecordRT2->pPointsArray, i));
}
}
- g_ptr_array_add(pPointsArray, &pRecordRT1->m_PointA);
+ g_ptr_array_add(pPointsArray, &pRecordRT1->PointA);
}
}
@@ -893,10 +893,10 @@
g_assert(pRecordRTc != NULL);
gint nCityID = 0;
- if(!db_insert_city(pRecordRTc->m_achName, g_nStateID, &nCityID)) {
- g_warning("insert city %s failed\n", pRecordRTc->m_achName);
+ if(!db_insert_city(pRecordRTc->achName, g_nStateID, &nCityID)) {
+ g_warning("insert city %s failed\n", pRecordRTc->achName);
}
- pRecordRTc->m_nCityID = nCityID;
+ pRecordRTc->nCityID = nCityID;
}
static void callback_save_rti_polygons(gpointer key, gpointer value, gpointer user_data)
@@ -915,17 +915,17 @@
g_assert(pRecordRTi != NULL);
// lookup table8 (polygon-landmark link) record by POLYID
- tiger_record_rt8_t* pRecordRT8 = g_hash_table_lookup(pImportProcess->m_pTableRT8, &pRecordRTi->m_nPOLYID);
+ tiger_record_rt8_t* pRecordRT8 = g_hash_table_lookup(pImportProcess->pTableRT8, &pRecordRTi->nPOLYID);
if(pRecordRT8 == NULL) return; // allowed to be null(?)
// lookup table7 (landmark) record by LANDID
- tiger_record_rt7_t* pRecordRT7 = g_hash_table_lookup(pImportProcess->m_pTableRT7, &pRecordRT8->m_nLANDID);
+ tiger_record_rt7_t* pRecordRT7 = g_hash_table_lookup(pImportProcess->pTableRT7, &pRecordRT8->nLANDID);
if(pRecordRT7 == NULL) return; // allowed to be null(?)
// now we have landmark data (name, type)
- g_assert(pRecordRTi->m_pRT1LinksArray != NULL);
- g_assert(pRecordRTi->m_pRT1LinksArray->len >= 1);
+ g_assert(pRecordRTi->pRT1LinksArray != NULL);
+ g_assert(pRecordRTi->pRT1LinksArray->len >= 1);
GPtrArray* pTempPointsArray = NULL;
// create a temp array to hold the points for this polygon (in order)
@@ -933,17 +933,17 @@
pTempPointsArray = g_ptr_array_new();
// start with the RT1Link at index 0 (and remove it)
- tiger_rt1_link_t* pCurrentRT1Link = g_ptr_array_index(pRecordRTi->m_pRT1LinksArray, 0);
- g_ptr_array_remove_index(pRecordRTi->m_pRT1LinksArray, 0); // TODO: should maybe choose the last one instead? :) easier to remove and arbitrary anyway!
+ tiger_rt1_link_t* pCurrentRT1Link = g_ptr_array_index(pRecordRTi->pRT1LinksArray, 0);
+ g_ptr_array_remove_index(pRecordRTi->pRT1LinksArray, 0); // TODO: should maybe choose the last one instead? :) easier to remove and arbitrary anyway!
// we'll use the first RT1 in forward order, that is A->B...
- tiger_util_add_RT1_points_to_array(pImportProcess, pCurrentRT1Link->m_nTLID,
+ tiger_util_add_RT1_points_to_array(pImportProcess, pCurrentRT1Link->nTLID,
pTempPointsArray, ORDER_FORWARD);
// ...so B is the last TZID for now.
- gint nLastTZID = pCurrentRT1Link->m_nPointBTZID;
+ gint nLastTZID = pCurrentRT1Link->nPointBTZID;
while(TRUE) {
- if(pRecordRTi->m_pRT1LinksArray->len == 0) break;
+ if(pRecordRTi->pRT1LinksArray->len == 0) break;
// Loop through the RT1Links and try to find the next RT1 by matching TZID fields.
// NOTE: This is just like dominos! Only instead of matching white dots we're
@@ -952,14 +952,14 @@
gboolean bFound = FALSE;
gint iRT1Link;
- for(iRT1Link=0 ; iRT1Link < pRecordRTi->m_pRT1LinksArray->len ; iRT1Link++) {
- tiger_rt1_link_t* pNextRT1Link = g_ptr_array_index(pRecordRTi->m_pRT1LinksArray, iRT1Link);
+ for(iRT1Link=0 ; iRT1Link < pRecordRTi->pRT1LinksArray->len ; iRT1Link++) {
+ tiger_rt1_link_t* pNextRT1Link = g_ptr_array_index(pRecordRTi->pRT1LinksArray, iRT1Link);
- if(nLastTZID == pNextRT1Link->m_nPointATZID) {
+ if(nLastTZID == pNextRT1Link->nPointATZID) {
// add pNextRT1Link's points in order (A->B)
// this (pNextRT1Link) RT1Link becomes the new "current"
// remove it from the array!
- g_ptr_array_remove_index(pRecordRTi->m_pRT1LinksArray, iRT1Link);
+ g_ptr_array_remove_index(pRecordRTi->pRT1LinksArray, iRT1Link);
iRT1Link--; // undo the next ++ in the for loop
// we're done forever with the old 'current'
@@ -968,28 +968,28 @@
pCurrentRT1Link = pNextRT1Link;
// add this new RT1's points
- tiger_util_add_RT1_points_to_array(pImportProcess, pCurrentRT1Link->m_nTLID,
+ tiger_util_add_RT1_points_to_array(pImportProcess, pCurrentRT1Link->nTLID,
pTempPointsArray, ORDER_FORWARD);
- nLastTZID = pCurrentRT1Link->m_nPointBTZID; // Note: point *B* of this RT1Link
+ nLastTZID = pCurrentRT1Link->nPointBTZID; // Note: point *B* of this RT1Link
bFound = TRUE;
break;
}
- else if(nLastTZID == pNextRT1Link->m_nPointBTZID) {
+ else if(nLastTZID == pNextRT1Link->nPointBTZID) {
// add pNextRT1Link's points in REVERSE order (B->A)
// (otherwise same as above)
- g_ptr_array_remove_index(pRecordRTi->m_pRT1LinksArray, iRT1Link);
+ g_ptr_array_remove_index(pRecordRTi->pRT1LinksArray, iRT1Link);
iRT1Link--; // undo the next ++ in the for loop
g_free(pCurrentRT1Link);
pCurrentRT1Link = pNextRT1Link;
// add this new RT1's points
- tiger_util_add_RT1_points_to_array(pImportProcess, pCurrentRT1Link->m_nTLID,
+ tiger_util_add_RT1_points_to_array(pImportProcess, pCurrentRT1Link->nTLID,
pTempPointsArray, ORDER_BACKWARD);
- nLastTZID = pCurrentRT1Link->m_nPointATZID; // Note: point *A* of this RT1Link
+ nLastTZID = pCurrentRT1Link->nPointATZID; // Note: point *A* of this RT1Link
bFound = TRUE;
break;
}
@@ -1008,8 +1008,8 @@
mappoint_t* p1 = g_ptr_array_index(pTempPointsArray, 0);
mappoint_t* p2 = g_ptr_array_index(pTempPointsArray, pTempPointsArray->len-1);
- if(p1->m_fLatitude != p2->m_fLatitude || p1->m_fLongitude != p2->m_fLongitude) {
- g_print("Found a polygon that doesn't loop %s\n", pRecordRT7->m_achName);
+ if(p1->fLatitude != p2->fLatitude || p1->fLongitude != p2->fLongitude) {
+ g_print("Found a polygon that doesn't loop %s\n", pRecordRT7->achName);
}
// XXX: looking up a city for a polygon? unimplemented.
@@ -1019,17 +1019,17 @@
gchar* pszZIPCodeRight = "";
// insert record
- if(pRecordRT7->m_nRecordType != MAP_OBJECT_TYPE_NONE) {
+ if(pRecordRT7->nRecordType != MAP_OBJECT_TYPE_NONE) {
gint nRoadNameID = 0;
- if(pRecordRT7->m_achName[0] != '\0') {
- //g_printf("inserting area name %s\n", pRecordRT7->m_achName);
- db_insert_roadname(pRecordRT7->m_achName, 0, &nRoadNameID);
+ if(pRecordRT7->achName[0] != '\0') {
+ //g_printf("inserting area name %s\n", pRecordRT7->achName);
+ db_insert_roadname(pRecordRT7->achName, 0, &nRoadNameID);
}
gint nRoadID;
db_insert_road(
nRoadNameID,
- pRecordRT7->m_nRecordType,
+ pRecordRT7->nRecordType,
0,0,0,0,
nCityLeftID, nCityRightID,
pszZIPCodeLeft, pszZIPCodeRight,
@@ -1040,11 +1040,11 @@
g_ptr_array_free(pTempPointsArray, TRUE);
// we SHOULD have used all RT1 links up!
- if(pRecordRTi->m_pRT1LinksArray->len > 0) {
+ if(pRecordRTi->pRT1LinksArray->len > 0) {
//g_warning("RT1 Links remain:\n");
- while(pRecordRTi->m_pRT1LinksArray->len > 0) {
- tiger_rt1_link_t* pTemp = g_ptr_array_remove_index(pRecordRTi->m_pRT1LinksArray, 0);
- //g_print(" (A-TZID:%d B-TZID:%d)\n", pTemp->m_nPointATZID, pTemp->m_nPointBTZID);
+ while(pRecordRTi->pRT1LinksArray->len > 0) {
+ tiger_rt1_link_t* pTemp = g_ptr_array_remove_index(pRecordRTi->pRT1LinksArray, 0);
+ //g_print(" (A-TZID:%d B-TZID:%d)\n", pTemp->nPointATZID, pTemp->nPointBTZID);
g_free( pTemp );
}
}
@@ -1143,7 +1143,7 @@
gint nStateID = (nTigerSetNumber / 1000); // int division (eg. turn 25017 into 25)
if(nStateID < G_N_ELEMENTS(g_aStates)) {
gint nCountryID = 1; // USA is #1 *gag*
- db_insert_state(g_aStates[nStateID].m_pszName, g_aStates[nStateID].m_pszCode, nCountryID, &g_nStateID);
+ db_insert_state(g_aStates[nStateID].pszName, g_aStates[nStateID].pszCode, nCountryID, &g_nStateID);
}
g_assert(G_N_ELEMENTS(apszExtensions) == 7);
@@ -1180,55 +1180,55 @@
pszZeroTerminatedBufferMET[nLengthMET] = '\0';
import_tiger_parse_MET(pszZeroTerminatedBufferMET, &importProcess);
g_free(pszZeroTerminatedBufferMET);
- g_print("MET Title: %s\n", importProcess.m_pszFileDescription );
+ g_print("MET Title: %s\n", importProcess.pszFileDescription );
importwindow_log_append(".");
importwindow_progress_pulse();
// a list of RT1 records that make up the boundary of this county
- importProcess.m_pBoundaryRT1s = g_ptr_array_new();
+ importProcess.pBoundaryRT1s = g_ptr_array_new();
g_print("parsing RT1\n");
- importProcess.m_pTableRT1 = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
- import_tiger_parse_table_1(pBufferRT1, nLengthRT1, importProcess.m_pTableRT1, importProcess.m_pBoundaryRT1s);
- g_print("RT1: %d records\n", g_hash_table_size(importProcess.m_pTableRT1));
+ importProcess.pTableRT1 = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
+ import_tiger_parse_table_1(pBufferRT1, nLengthRT1, importProcess.pTableRT1, importProcess.pBoundaryRT1s);
+ g_print("RT1: %d records\n", g_hash_table_size(importProcess.pTableRT1));
importwindow_log_append(".");
importwindow_progress_pulse();
g_print("parsing RT2\n");
- importProcess.m_pTableRT2 = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
- import_tiger_parse_table_2(pBufferRT2, nLengthRT2, importProcess.m_pTableRT2);
- g_print("RT2: %d records\n", g_hash_table_size(importProcess.m_pTableRT2));
+ importProcess.pTableRT2 = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
+ import_tiger_parse_table_2(pBufferRT2, nLengthRT2, importProcess.pTableRT2);
+ g_print("RT2: %d records\n", g_hash_table_size(importProcess.pTableRT2));
importwindow_log_append(".");
importwindow_progress_pulse();
g_print("parsing RT7\n");
- importProcess.m_pTableRT7 = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
- import_tiger_parse_table_7(pBufferRT7, nLengthRT7, importProcess.m_pTableRT7);
- g_print("RT7: %d records\n", g_hash_table_size(importProcess.m_pTableRT7));
+ importProcess.pTableRT7 = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
+ import_tiger_parse_table_7(pBufferRT7, nLengthRT7, importProcess.pTableRT7);
+ g_print("RT7: %d records\n", g_hash_table_size(importProcess.pTableRT7));
importwindow_log_append(".");
importwindow_progress_pulse();
g_print("parsing RT8\n");
- importProcess.m_pTableRT8 = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
- import_tiger_parse_table_8(pBufferRT8, nLengthRT8, importProcess.m_pTableRT8);
- g_print("RT8: %d records\n", g_hash_table_size(importProcess.m_pTableRT8));
+ importProcess.pTableRT8 = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
+ import_tiger_parse_table_8(pBufferRT8, nLengthRT8, importProcess.pTableRT8);
+ g_print("RT8: %d records\n", g_hash_table_size(importProcess.pTableRT8));
importwindow_log_append(".");
importwindow_progress_pulse();
g_print("parsing RTc\n");
- importProcess.m_pTableRTc = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
- import_tiger_parse_table_c(pBufferRTc, nLengthRTc, importProcess.m_pTableRTc);
- g_print("RTc: %d records\n", g_hash_table_size(importProcess.m_pTableRTc));
+ importProcess.pTableRTc = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
+ import_tiger_parse_table_c(pBufferRTc, nLengthRTc, importProcess.pTableRTc);
+ g_print("RTc: %d records\n", g_hash_table_size(importProcess.pTableRTc));
g_print("parsing RTi\n");
- importProcess.m_pTableRTi = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
- import_tiger_parse_table_i(pBufferRTi, nLengthRTi, importProcess.m_pTableRTi);
- g_print("RTi: %d records\n", g_hash_table_size(importProcess.m_pTableRTi));
+ importProcess.pTableRTi = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, NULL);
+ import_tiger_parse_table_i(pBufferRTi, nLengthRTi, importProcess.pTableRTi);
+ g_print("RTi: %d records\n", g_hash_table_size(importProcess.pTableRTi));
importwindow_log_append(".");
importwindow_progress_pulse();
@@ -1237,7 +1237,7 @@
// Insert cities first
//
g_print("iterating over RTc cities...\n");
- g_hash_table_foreach(importProcess.m_pTableRTc, callback_save_rtc_cities, &importProcess);
+ g_hash_table_foreach(importProcess.pTableRTc, callback_save_rtc_cities, &importProcess);
g_print("done.\n");
importwindow_log_append(".");
@@ -1247,7 +1247,7 @@
// Stitch and insert polygons
//
g_print("iterating over RTi polygons...\n");
- g_hash_table_foreach(importProcess.m_pTableRTi, callback_save_rti_polygons, &importProcess);
+ g_hash_table_foreach(importProcess.pTableRTi, callback_save_rti_polygons, &importProcess);
g_print("done.\n");
importwindow_log_append(".");
@@ -1257,7 +1257,7 @@
// Roads
//
g_print("iterating over RT1 chains...\n");
- g_hash_table_foreach(importProcess.m_pTableRT1, callback_save_rt1_chains, &importProcess);
+ g_hash_table_foreach(importProcess.pTableRT1, callback_save_rt1_chains, &importProcess);
g_print("done.\n");
importwindow_log_append(".");
@@ -1266,15 +1266,15 @@
//
// free up the importprocess structure
//
- g_hash_table_destroy(importProcess.m_pTableRT1);
- g_hash_table_destroy(importProcess.m_pTableRT2);
- g_hash_table_destroy(importProcess.m_pTableRT7);
- g_hash_table_destroy(importProcess.m_pTableRT8);
- g_hash_table_destroy(importProcess.m_pTableRTc);
+ g_hash_table_destroy(importProcess.pTableRT1);
+ g_hash_table_destroy(importProcess.pTableRT2);
+ g_hash_table_destroy(importProcess.pTableRT7);
+ g_hash_table_destroy(importProcess.pTableRT8);
+ g_hash_table_destroy(importProcess.pTableRTc);
// XXX: this call sometimes segfaults:
g_warning("leaking some memory due to unsolved bug in import. just restart roadster after/between imports ;)\n");
- //g_hash_table_destroy(importProcess.m_pTableRTi);
- g_free(importProcess.m_pszFileDescription);
+ //g_hash_table_destroy(importProcess.pTableRTi);
+ g_free(importProcess.pszFileDescription);
return TRUE;
}
Index: importwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/importwindow.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- importwindow.c 24 Sep 2005 05:25:25 -0000 1.10
+++ importwindow.c 25 Sep 2005 19:02:37 -0000 1.11
@@ -32,33 +32,33 @@
#include "gui.h"
struct {
- GtkWindow* m_pWindow;
- GtkProgressBar* m_pProgressBar;
- GtkButton* m_pOKButton;
-// GtkButton* m_pCancelButton;
- GtkTextView* m_pLogTextView;
+ GtkWindow* pWindow;
+ GtkProgressBar* pProgressBar;
+ GtkButton* pOKButton;
+// GtkButton* pCancelButton;
+ GtkTextView* pLogTextView;
- gint m_nCurrentFile;
- gint m_nTotalFiles;
+ gint nCurrentFile;
+ gint nTotalFiles;
} g_ImportWindow;
void importwindow_init(GladeXML* pGladeXML)
{
- GLADE_LINK_WIDGET(pGladeXML, g_ImportWindow.m_pWindow, GTK_WINDOW, "importwindow");
- GLADE_LINK_WIDGET(pGladeXML, g_ImportWindow.m_pProgressBar, GTK_PROGRESS_BAR, "importprogressbar");
- GLADE_LINK_WIDGET(pGladeXML, g_ImportWindow.m_pOKButton, GTK_BUTTON, "importokbutton");
- GLADE_LINK_WIDGET(pGladeXML, g_ImportWindow.m_pLogTextView, GTK_TEXT_VIEW, "importlogtextview");
+ GLADE_LINK_WIDGET(pGladeXML, g_ImportWindow.pWindow, GTK_WINDOW, "importwindow");
+ GLADE_LINK_WIDGET(pGladeXML, g_ImportWindow.pProgressBar, GTK_PROGRESS_BAR, "importprogressbar");
+ GLADE_LINK_WIDGET(pGladeXML, g_ImportWindow.pOKButton, GTK_BUTTON, "importokbutton");
+ GLADE_LINK_WIDGET(pGladeXML, g_ImportWindow.pLogTextView, GTK_TEXT_VIEW, "importlogtextview");
}
void importwindow_show(void)
{
- gtk_widget_show(GTK_WIDGET(g_ImportWindow.m_pWindow));
- gtk_window_present(g_ImportWindow.m_pWindow);
+ gtk_widget_show(GTK_WIDGET(g_ImportWindow.pWindow));
+ gtk_window_present(g_ImportWindow.pWindow);
}
void importwindow_hide(void)
{
- gtk_widget_hide(GTK_WIDGET(g_ImportWindow.m_pWindow));
+ gtk_widget_hide(GTK_WIDGET(g_ImportWindow.pWindow));
}
void importwindow_log_append(const gchar* pszFormat, ...)
@@ -70,22 +70,22 @@
g_vsnprintf(azNewText, 5000, pszFormat, args);
va_end(args);
- GtkTextBuffer* pBuffer = gtk_text_view_get_buffer(g_ImportWindow.m_pLogTextView);
+ GtkTextBuffer* pBuffer = gtk_text_view_get_buffer(g_ImportWindow.pLogTextView);
gtk_text_buffer_insert_at_cursor(pBuffer, azNewText, -1);
// Scroll to end of text
GtkTextIter iter;
gtk_text_buffer_get_end_iter(pBuffer, &iter);
- gtk_text_view_scroll_to_iter(g_ImportWindow.m_pLogTextView, &iter, 0.0, FALSE,0,0);
+ gtk_text_view_scroll_to_iter(g_ImportWindow.pLogTextView, &iter, 0.0, FALSE,0,0);
GTK_PROCESS_MAINLOOP;
}
void importwindow_progress_pulse(void)
{
-// gtk_progress_bar_set_text(g_ImportWindow.m_pProgressBar, azBuffer);
+// gtk_progress_bar_set_text(g_ImportWindow.pProgressBar, azBuffer);
- gtk_progress_bar_pulse(g_ImportWindow.m_pProgressBar);
+ gtk_progress_bar_pulse(g_ImportWindow.pProgressBar);
// ensure the UI gets updated
GTK_PROCESS_MAINLOOP;
@@ -94,19 +94,19 @@
void importwindow_begin(GSList* pSelectedFileList)
{
// empty progress buffer
- GtkTextBuffer* pBuffer = gtk_text_view_get_buffer(g_ImportWindow.m_pLogTextView);
+ GtkTextBuffer* pBuffer = gtk_text_view_get_buffer(g_ImportWindow.pLogTextView);
gtk_text_buffer_set_text(pBuffer, "", -1);
- gtk_widget_show(GTK_WIDGET(g_ImportWindow.m_pWindow));
- gtk_window_present(g_ImportWindow.m_pWindow);
- gtk_widget_set_sensitive(GTK_WIDGET(g_ImportWindow.m_pOKButton), FALSE);
+ gtk_widget_show(GTK_WIDGET(g_ImportWindow.pWindow));
+ gtk_window_present(g_ImportWindow.pWindow);
+ gtk_widget_set_sensitive(GTK_WIDGET(g_ImportWindow.pOKButton), FALSE);
GTK_PROCESS_MAINLOOP;
- g_ImportWindow.m_nTotalFiles = g_slist_length(pSelectedFileList);
- g_ImportWindow.m_nCurrentFile = 1;
+ g_ImportWindow.nTotalFiles = g_slist_length(pSelectedFileList);
+ g_ImportWindow.nCurrentFile = 1;
- g_print("Importing %d file(s)\n", g_ImportWindow.m_nTotalFiles);
+ g_print("Importing %d file(s)\n", g_ImportWindow.nTotalFiles);
gint nTotalSuccess = 0;
GSList* pFile = pSelectedFileList;
@@ -118,18 +118,18 @@
// Move to next file
pFile = pFile->next;
- g_ImportWindow.m_nCurrentFile++;
+ g_ImportWindow.nCurrentFile++;
}
- // nTotalSuccess / g_ImportWindow.m_nTotalFiles
+ // nTotalSuccess / g_ImportWindow.nTotalFiles
- gtk_progress_bar_set_fraction(g_ImportWindow.m_pProgressBar, 1.0);
- gtk_widget_set_sensitive(GTK_WIDGET(g_ImportWindow.m_pOKButton), TRUE);
+ gtk_progress_bar_set_fraction(g_ImportWindow.pProgressBar, 1.0);
+ gtk_widget_set_sensitive(GTK_WIDGET(g_ImportWindow.pOKButton), TRUE);
- if(nTotalSuccess == g_ImportWindow.m_nTotalFiles) {
- gtk_progress_bar_set_text(g_ImportWindow.m_pProgressBar, "Completed Successfully");
+ if(nTotalSuccess == g_ImportWindow.nTotalFiles) {
+ gtk_progress_bar_set_text(g_ImportWindow.pProgressBar, "Completed Successfully");
}
else {
- gtk_progress_bar_set_text(g_ImportWindow.m_pProgressBar, "Completed with Errors");
+ gtk_progress_bar_set_text(g_ImportWindow.pProgressBar, "Completed with Errors");
}
GTK_PROCESS_MAINLOOP;
@@ -142,8 +142,8 @@
//~ void importwindow_on_okbutton_clicked(GtkWidget* pWidget, gpointer pdata)
//~ {
//~ // set button insensitive
- //~ gtk_widget_set_sensitive(GTK_WIDGET(g_ImportWindow.m_pOKButton), FALSE);
+ //~ gtk_widget_set_sensitive(GTK_WIDGET(g_ImportWindow.pOKButton), FALSE);
//~ // hide dialog
- //~ gtk_widget_hide(GTK_WIDGET(g_ImportWindow.m_pWindow));
+ //~ gtk_widget_hide(GTK_WIDGET(g_ImportWindow.pWindow));
//~ }
Index: location.c
===================================================================
RCS file: /cvs/cairo/roadster/src/location.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- location.c 23 Apr 2005 18:13:39 -0000 1.6
+++ location.c 25 Sep 2005 19:02:37 -0000 1.7
@@ -28,14 +28,14 @@
#include "db.h"
struct {
- GMemChunk* m_pLocationChunkAllocator;
+ GMemChunk* pLocationChunkAllocator;
} g_Location;
void location_init()
{
- g_Location.m_pLocationChunkAllocator = g_mem_chunk_new("ROADSTER locations",
+ g_Location.pLocationChunkAllocator = g_mem_chunk_new("ROADSTER locations",
sizeof(location_t), 1000, G_ALLOC_AND_FREE);
- g_return_if_fail(g_Location.m_pLocationChunkAllocator != NULL);
+ g_return_if_fail(g_Location.pLocationChunkAllocator != NULL);
}
// get a new point struct from the allocator
@@ -43,9 +43,9 @@
{
g_return_val_if_fail(ppLocation != NULL, FALSE);
g_return_val_if_fail(*ppLocation == NULL, FALSE); // must be a pointer to a NULL pointer
- g_return_val_if_fail(g_Location.m_pLocationChunkAllocator != NULL, FALSE);
+ g_return_val_if_fail(g_Location.pLocationChunkAllocator != NULL, FALSE);
- location_t* pNew = g_mem_chunk_alloc0(g_Location.m_pLocationChunkAllocator);
+ location_t* pNew = g_mem_chunk_alloc0(g_Location.pLocationChunkAllocator);
if(pNew) {
*ppLocation = pNew;
return TRUE;
@@ -57,12 +57,12 @@
void location_free(location_t* pLocation)
{
g_return_if_fail(pLocation != NULL);
- g_return_if_fail(g_Location.m_pLocationChunkAllocator != NULL);
+ g_return_if_fail(g_Location.pLocationChunkAllocator != NULL);
- g_free(pLocation->m_pszName);
+ g_free(pLocation->pszName);
// give back to allocator
- g_mem_chunk_free(g_Location.m_pLocationChunkAllocator, pLocation);
+ g_mem_chunk_free(g_Location.pLocationChunkAllocator, pLocation);
}
gboolean location_insert(gint nLocationSetID, mappoint_t* pPoint, gint* pnReturnID)
@@ -76,7 +76,7 @@
// create query SQL
gchar* pszSQL = g_strdup_printf(
"INSERT INTO Location SET ID=NULL, LocationSetID=%d, Coordinates=GeometryFromText('POINT(%f %f)');",
- nLocationSetID, pPoint->m_fLatitude, pPoint->m_fLongitude);
+ nLocationSetID, pPoint->fLatitude, pPoint->fLongitude);
db_query(pszSQL, NULL);
g_free(pszSQL);
@@ -161,9 +161,9 @@
while((aRow = db_fetch_row(pResultSet))) {
locationattribute_t* pNew = g_new0(locationattribute_t, 1);
- pNew->m_nValueID = atoi(aRow[0]);
- pNew->m_pszName = g_strdup((aRow[1] == NULL) ? "" : aRow[1]);
- pNew->m_pszValue = g_strdup((aRow[2] == NULL) ? "" : aRow[2]);
+ pNew->nValueID = atoi(aRow[0]);
+ pNew->pszName = g_strdup((aRow[1] == NULL) ? "" : aRow[1]);
+ pNew->pszValue = g_strdup((aRow[2] == NULL) ? "" : aRow[2]);
g_ptr_array_add(pAttributeArray, pNew);
}
@@ -176,8 +176,8 @@
gint i;
for(i=(pAttributeArray->len-1) ; i>=0 ; i--) {
locationattribute_t* pAttribute = g_ptr_array_remove_index_fast(pAttributeArray, i);
- g_free(pAttribute->m_pszName);
- g_free(pAttribute->m_pszValue);
+ g_free(pAttribute->pszName);
+ g_free(pAttribute->pszValue);
g_free(pAttribute);
}
g_assert(pAttributeArray->len == 0);
Index: location.h
===================================================================
RCS file: /cvs/cairo/roadster/src/location.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- location.h 23 Apr 2005 18:13:39 -0000 1.4
+++ location.h 25 Sep 2005 19:02:37 -0000 1.5
@@ -34,15 +34,15 @@
// a single location (eg. "Someday Cafe"). this is all that's needed for drawing lots of points (with mouse-over name).
typedef struct {
- gint m_nID;
- gchar* m_pszName;
- mappoint_t m_Coordinates;
+ gint nID;
+ gchar* pszName;
+ mappoint_t Coordinates;
} location_t;
typedef struct {
- gchar* m_pszName;
- gchar* m_pszValue;
- gint m_nValueID;
+ gchar* pszName;
+ gchar* pszValue;
+ gint nValueID;
} locationattribute_t;
void location_init();
Index: locationeditwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/locationeditwindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- locationeditwindow.c 24 Sep 2005 05:25:25 -0000 1.2
+++ locationeditwindow.c 25 Sep 2005 19:02:37 -0000 1.3
@@ -34,25 +34,25 @@
#include "util.h"
struct {
- GtkWindow* m_pWindow;
+ GtkWindow* pWindow;
- GtkTreeView* m_pAttributeTreeView;
- GtkListStore* m_pAttributeListStore;
+ GtkTreeView* pAttributeTreeView;
+ GtkListStore* pAttributeListStore;
- GtkLabel* m_pCustomAttributesLabel;
- GtkEntry* m_pLocationNameEntry;
- GtkComboBox* m_pLocationSetComboBox;
- GtkTextView* m_pLocationAddressTextView;
+ GtkLabel* pCustomAttributesLabel;
+ GtkEntry* pLocationNameEntry;
+ GtkComboBox* pLocationSetComboBox;
+ GtkTextView* pLocationAddressTextView;
- GtkExpander* m_pAttributeExpander;
- GtkButton* m_pAttributeAddButton;
- GtkButton* m_pAttributeRemoveButton;
+ GtkExpander* pAttributeExpander;
+ GtkButton* pAttributeAddButton;
+ GtkButton* pAttributeRemoveButton;
- GtkListStore* m_pAttributeNameListStore;
+ GtkListStore* pAttributeNameListStore;
//
- gint m_nEditingLocationID;
- gboolean m_bModified;
+ gint nEditingLocationID;
+ gboolean bModified;
} g_LocationEditWindow = {0};
@@ -90,44 +90,44 @@
GtkTreeIter iter;
GtkTreePath* pPath = gtk_tree_path_new_from_string(pszTreePath);
- if(gtk_tree_model_get_iter(GTK_TREE_MODEL(g_LocationEditWindow.m_pAttributeListStore), &iter, pPath)) {
- gtk_list_store_set(g_LocationEditWindow.m_pAttributeListStore, &iter, nColumn, pszNewValue, -1);
+ if(gtk_tree_model_get_iter(GTK_TREE_MODEL(g_LocationEditWindow.pAttributeListStore), &iter, pPath)) {
+ gtk_list_store_set(g_LocationEditWindow.pAttributeListStore, &iter, nColumn, pszNewValue, -1);
}
gtk_tree_path_free(pPath);
// data is now modified
- g_LocationEditWindow.m_bModified = TRUE;
+ g_LocationEditWindow.bModified = TRUE;
locationeditwindow_set_title();
}
void locationeditwindow_init(GladeXML* pGladeXML)
{
// Widgets
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pWindow, GTK_WINDOW, "locationeditwindow");
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pAttributeTreeView, GTK_TREE_VIEW, "locationattributestreeview");
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pCustomAttributesLabel, GTK_LABEL, "customattributeslabel");
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pLocationNameEntry, GTK_ENTRY, "locationnameentry");
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pLocationSetComboBox, GTK_COMBO_BOX, "locationsetcombobox");
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pLocationAddressTextView, GTK_TEXT_VIEW, "locationaddresstextview");
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pWindow, GTK_WINDOW, "locationeditwindow");
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pAttributeTreeView, GTK_TREE_VIEW, "locationattributestreeview");
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pCustomAttributesLabel, GTK_LABEL, "customattributeslabel");
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pLocationNameEntry, GTK_ENTRY, "locationnameentry");
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pLocationSetComboBox, GTK_COMBO_BOX, "locationsetcombobox");
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pLocationAddressTextView, GTK_TEXT_VIEW, "locationaddresstextview");
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pAttributeExpander, GTK_EXPANDER, "attributeexpander");
- gtk_expander_set_use_markup(g_LocationEditWindow.m_pAttributeExpander, TRUE);
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pAttributeExpander, GTK_EXPANDER, "attributeexpander");
+ gtk_expander_set_use_markup(g_LocationEditWindow.pAttributeExpander, TRUE);
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pAttributeAddButton, GTK_BUTTON, "attributeaddbutton");
- GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.m_pAttributeRemoveButton, GTK_BUTTON, "attributeremovebutton");
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pAttributeAddButton, GTK_BUTTON, "attributeaddbutton");
+ GLADE_LINK_WIDGET(pGladeXML, g_LocationEditWindow.pAttributeRemoveButton, GTK_BUTTON, "attributeremovebutton");
locationeditwindow_configure_attribute_list();
//
- g_signal_connect(G_OBJECT(g_LocationEditWindow.m_pLocationNameEntry), "changed", G_CALLBACK(locationeditwindow_something_changed_callback), NULL);
- g_signal_connect(G_OBJECT(g_LocationEditWindow.m_pLocationSetComboBox), "changed", G_CALLBACK(locationeditwindow_something_changed_callback), NULL);
- g_signal_connect(G_OBJECT(gtk_text_view_get_buffer(g_LocationEditWindow.m_pLocationAddressTextView)), "changed", G_CALLBACK(locationeditwindow_something_changed_callback), NULL);
+ g_signal_connect(G_OBJECT(g_LocationEditWindow.pLocationNameEntry), "changed", G_CALLBACK(locationeditwindow_something_changed_callback), NULL);
+ g_signal_connect(G_OBJECT(g_LocationEditWindow.pLocationSetComboBox), "changed", G_CALLBACK(locationeditwindow_something_changed_callback), NULL);
+ g_signal_connect(G_OBJECT(gtk_text_view_get_buffer(g_LocationEditWindow.pLocationAddressTextView)), "changed", G_CALLBACK(locationeditwindow_something_changed_callback), NULL);
-// g_signal_connect(G_OBJECT(g_LocationEditWindow.m_pLocationAddressTextView), "changed", G_CALLBACK(locationeditwindow_something_changed_callback), NULL);
+// g_signal_connect(G_OBJECT(g_LocationEditWindow.pLocationAddressTextView), "changed", G_CALLBACK(locationeditwindow_something_changed_callback), NULL);
// locationeditwindow_show_for_new(1); // XXX: debug
// don't delete window on X, just hide it
- g_signal_connect(G_OBJECT(g_LocationEditWindow.m_pWindow), "delete_event", G_CALLBACK(gtk_widget_hide), NULL);
+ g_signal_connect(G_OBJECT(g_LocationEditWindow.pWindow), "delete_event", G_CALLBACK(gtk_widget_hide), NULL);
}
static void locationeditwindow_configure_attribute_list()
@@ -137,19 +137,19 @@
GtkTreeIter iter;
// set up the location attributes list
- g_LocationEditWindow.m_pAttributeListStore = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
- gtk_tree_view_set_model(g_LocationEditWindow.m_pAttributeTreeView, GTK_TREE_MODEL(g_LocationEditWindow.m_pAttributeListStore));
+ g_LocationEditWindow.pAttributeListStore = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
+ gtk_tree_view_set_model(g_LocationEditWindow.pAttributeTreeView, GTK_TREE_MODEL(g_LocationEditWindow.pAttributeListStore));
- g_LocationEditWindow.m_pAttributeNameListStore = gtk_list_store_new(1, G_TYPE_STRING);
- gtk_list_store_append (g_LocationEditWindow.m_pAttributeNameListStore, &iter);
- gtk_list_store_set (g_LocationEditWindow.m_pAttributeNameListStore, &iter, 0, "url", -1);
- gtk_list_store_append (g_LocationEditWindow.m_pAttributeNameListStore, &iter);
- gtk_list_store_set (g_LocationEditWindow.m_pAttributeNameListStore, &iter, 0, "phone", -1);
+ g_LocationEditWindow.pAttributeNameListStore = gtk_list_store_new(1, G_TYPE_STRING);
+ gtk_list_store_append (g_LocationEditWindow.pAttributeNameListStore, &iter);
+ gtk_list_store_set (g_LocationEditWindow.pAttributeNameListStore, &iter, 0, "url", -1);
+ gtk_list_store_append (g_LocationEditWindow.pAttributeNameListStore, &iter);
+ gtk_list_store_set (g_LocationEditWindow.pAttributeNameListStore, &iter, 0, "phone", -1);
// NEW COLUMN: Editable "name" column (combobox-entry control)
pCellRenderer = gtk_cell_renderer_combo_new();
g_object_set(G_OBJECT(pCellRenderer),
- "model", g_LocationEditWindow.m_pAttributeNameListStore,
+ "model", g_LocationEditWindow.pAttributeNameListStore,
"editable", TRUE,
NULL);
g_object_set(G_OBJECT(pCellRenderer),
@@ -164,7 +164,7 @@
"edited", G_CALLBACK(callback_store_attribute_editing),
ATTRIBUTELIST_COLUMN_NAME);
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(g_LocationEditWindow.m_pAttributeTreeView), -1, "Field", pCellRenderer,
+ gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(g_LocationEditWindow.pAttributeTreeView), -1, "Field", pCellRenderer,
"text", ATTRIBUTELIST_COLUMN_NAME,
"text-column", ATTRIBUTELIST_COLUMN_NAMELISTMODEL_COLUMN,
NULL);
@@ -186,16 +186,16 @@
pColumn = gtk_tree_view_column_new_with_attributes("Value", pCellRenderer,
"text", ATTRIBUTELIST_COLUMN_VALUE,
NULL);
- gtk_tree_view_append_column(g_LocationEditWindow.m_pAttributeTreeView, pColumn);
+ gtk_tree_view_append_column(g_LocationEditWindow.pAttributeTreeView, pColumn);
// Add test data
- gtk_list_store_append(g_LocationEditWindow.m_pAttributeListStore, &iter);
- gtk_list_store_set(g_LocationEditWindow.m_pAttributeListStore, &iter,
+ gtk_list_store_append(g_LocationEditWindow.pAttributeListStore, &iter);
+ gtk_list_store_set(g_LocationEditWindow.pAttributeListStore, &iter,
ATTRIBUTELIST_COLUMN_NAME, "phone", ATTRIBUTELIST_COLUMN_VALUE, "(617) 555-3314",
ATTRIBUTELIST_COLUMN_NAMELISTMODEL_COLUMN, ATTRIBUTENAMELIST_COLUMN_NAME,
-1);
- gtk_list_store_append(g_LocationEditWindow.m_pAttributeListStore, &iter);
- gtk_list_store_set(g_LocationEditWindow.m_pAttributeListStore, &iter,
+ gtk_list_store_append(g_LocationEditWindow.pAttributeListStore, &iter);
+ gtk_list_store_set(g_LocationEditWindow.pAttributeListStore, &iter,
ATTRIBUTELIST_COLUMN_NAME, "url", ATTRIBUTELIST_COLUMN_VALUE, "http://www.fusionrestaurant.com",
ATTRIBUTELIST_COLUMN_NAMELISTMODEL_COLUMN, ATTRIBUTENAMELIST_COLUMN_NAME,
-1);
@@ -203,33 +203,33 @@
void locationeditwindow_hide(void)
{
- gtk_widget_hide(GTK_WIDGET(g_LocationEditWindow.m_pWindow));
+ gtk_widget_hide(GTK_WIDGET(g_LocationEditWindow.pWindow));
}
void locationeditwindow_show_for_new(gint nDefaultLocationSetID)
{
// Set controls to default values
- gtk_entry_set_text(g_LocationEditWindow.m_pLocationNameEntry, "");
- gtk_text_buffer_set_text(gtk_text_view_get_buffer(g_LocationEditWindow.m_pLocationAddressTextView), "", -1);
- gtk_combo_box_set_active(g_LocationEditWindow.m_pLocationSetComboBox, nDefaultLocationSetID);
- gtk_list_store_clear(g_LocationEditWindow.m_pAttributeListStore);
+ gtk_entry_set_text(g_LocationEditWindow.pLocationNameEntry, "");
+ gtk_text_buffer_set_text(gtk_text_view_get_buffer(g_LocationEditWindow.pLocationAddressTextView), "", -1);
+ gtk_combo_box_set_active(g_LocationEditWindow.pLocationSetComboBox, nDefaultLocationSetID);
+ gtk_list_store_clear(g_LocationEditWindow.pAttributeListStore);
// Don't change user's previous setting here
- //gtk_expander_set_expanded(g_LocationEditWindow.m_pAttributeExpander, FALSE);
+ //gtk_expander_set_expanded(g_LocationEditWindow.pAttributeExpander, FALSE);
- g_LocationEditWindow.m_bModified = FALSE;
+ g_LocationEditWindow.bModified = FALSE;
locationeditwindow_set_title();
locationeditwindow_set_expander_label(NULL);
- gtk_widget_grab_focus(GTK_WIDGET(g_LocationEditWindow.m_pLocationNameEntry));
- gtk_widget_show(GTK_WIDGET(g_LocationEditWindow.m_pWindow));
- gtk_window_present(g_LocationEditWindow.m_pWindow);
+ gtk_widget_grab_focus(GTK_WIDGET(g_LocationEditWindow.pLocationNameEntry));
+ gtk_widget_show(GTK_WIDGET(g_LocationEditWindow.pWindow));
+ gtk_window_present(g_LocationEditWindow.pWindow);
}
void locationeditwindow_show_for_edit(gint nLocationID)
{
// void location_load_attributes(gint nLocationID, GPtrArray* pAttributeArray);
- g_LocationEditWindow.m_bModified = FALSE;
+ g_LocationEditWindow.bModified = FALSE;
locationeditwindow_set_title();
locationeditwindow_set_expander_label(NULL);
@@ -237,17 +237,17 @@
gboolean locationeditwindow_set_expander_label(gpointer _unused)
{
- gint nNumLocationAttributes = 0; //g_LocationEditWindow.m_pAttributeNameListStore; // XXX: use a real count
+ gint nNumLocationAttributes = 0; //g_LocationEditWindow.pAttributeNameListStore; // XXX: use a real count
// NOTE: Do not expand/close the expander-- keep the user's old setting
gchar* pszExpanderLabel;
-// if(gtk_expander_get_expanded(g_LocationEditWindow.m_pAttributeExpander)) {
+// if(gtk_expander_get_expanded(g_LocationEditWindow.pAttributeExpander)) {
pszExpanderLabel = g_strdup_printf("Custom Values <i>(%d)</i>", nNumLocationAttributes);
// }
// else {
// pszExpanderLabel = g_strdup_printf("Show Custom Values <i>(%d)</i>", nNumLocationAttributes);
// }
- gtk_expander_set_label(g_LocationEditWindow.m_pAttributeExpander, pszExpanderLabel);
+ gtk_expander_set_label(g_LocationEditWindow.pAttributeExpander, pszExpanderLabel);
g_free(pszExpanderLabel);
return FALSE; // "don't call us again" -- we're unfortunately an idle-time callback
@@ -255,17 +255,17 @@
static void locationeditwindow_set_title()
{
- const gchar* pszNameValue = gtk_entry_get_text(g_LocationEditWindow.m_pLocationNameEntry); // note: pointer to internal memory
+ const gchar* pszNameValue = gtk_entry_get_text(g_LocationEditWindow.pLocationNameEntry); // note: pointer to internal memory
gchar* pszNewName;
if(pszNameValue[0] == '\0') {
- pszNewName = g_strdup_printf("%sunnamed POI", (g_LocationEditWindow.m_bModified) ? "*" : "");
+ pszNewName = g_strdup_printf("%sunnamed POI", (g_LocationEditWindow.bModified) ? "*" : "");
}
else {
- pszNewName = g_strdup_printf("%s%s", (g_LocationEditWindow.m_bModified) ? "*" : "", pszNameValue);
+ pszNewName = g_strdup_printf("%s%s", (g_LocationEditWindow.bModified) ? "*" : "", pszNameValue);
}
- gtk_window_set_title(g_LocationEditWindow.m_pWindow, pszNewName);
+ gtk_window_set_title(g_LocationEditWindow.pWindow, pszNewName);
g_free(pszNewName);
}
@@ -274,7 +274,7 @@
static void locationeditwindow_something_changed_callback(GtkEditable *_unused, gpointer __unused)
{
// NOTE: This callback is shared by several widgets
- g_LocationEditWindow.m_bModified = TRUE;
+ g_LocationEditWindow.bModified = TRUE;
locationeditwindow_set_title();
}
Index: locationset.c
===================================================================
RCS file: /cvs/cairo/roadster/src/locationset.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- locationset.c 24 Sep 2005 05:25:25 -0000 1.13
+++ locationset.c 25 Sep 2005 19:02:37 -0000 1.14
@@ -34,32 +34,32 @@
#include "util.h"
struct {
- GPtrArray* m_pLocationSetArray; // an array of locationsets
- GHashTable* m_pLocationSetHash; // stores pointers to locationsets, indexed by ID
+ GPtrArray* pLocationSetArray; // an array of locationsets
+ GHashTable* pLocationSetHash; // stores pointers to locationsets, indexed by ID
- GMemChunk* m_pLocationSetChunkAllocator; // allocs locationset_t objects
+ GMemChunk* pLocationSetChunkAllocator; // allocs locationset_t objects
} g_LocationSet;
void locationset_init()
{
- g_LocationSet.m_pLocationSetArray = g_ptr_array_new();
- g_LocationSet.m_pLocationSetHash = g_hash_table_new(g_int_hash, g_int_equal);
+ g_LocationSet.pLocationSetArray = g_ptr_array_new();
+ g_LocationSet.pLocationSetHash = g_hash_table_new(g_int_hash, g_int_equal);
// create memory allocator
- g_LocationSet.m_pLocationSetChunkAllocator = g_mem_chunk_new("ROADSTER locationsets",
+ g_LocationSet.pLocationSetChunkAllocator = g_mem_chunk_new("ROADSTER locationsets",
sizeof(locationset_t), 20, G_ALLOC_AND_FREE);
- g_return_if_fail(g_LocationSet.m_pLocationSetChunkAllocator != NULL);
+ g_return_if_fail(g_LocationSet.pLocationSetChunkAllocator != NULL);
}
// get a new locationset struct from the allocator
static gboolean locationset_alloc(locationset_t** ppReturn)
{
- g_return_val_if_fail(g_LocationSet.m_pLocationSetChunkAllocator != NULL, FALSE);
+ g_return_val_if_fail(g_LocationSet.pLocationSetChunkAllocator != NULL, FALSE);
- locationset_t* pNew = g_mem_chunk_alloc0(g_LocationSet.m_pLocationSetChunkAllocator);
+ locationset_t* pNew = g_mem_chunk_alloc0(g_LocationSet.pLocationSetChunkAllocator);
// set defaults
- pNew->m_bVisible = TRUE;
+ pNew->bVisible = TRUE;
// return it
*ppReturn = pNew;
@@ -97,14 +97,14 @@
locationset_t* pNewLocationSet = NULL;
locationset_alloc(&pNewLocationSet);
- pNewLocationSet->m_nID = atoi(aRow[0]);
- pNewLocationSet->m_pszName = g_strdup(aRow[1]);
- pNewLocationSet->m_pszIconName = g_strdup(aRow[2]);
- pNewLocationSet->m_nLocationCount = atoi(aRow[3]);
+ pNewLocationSet->nID = atoi(aRow[0]);
+ pNewLocationSet->pszName = g_strdup(aRow[1]);
+ pNewLocationSet->pszIconName = g_strdup(aRow[2]);
+ pNewLocationSet->nLocationCount = atoi(aRow[3]);
// Add the new set to both data structures
- g_ptr_array_add(g_LocationSet.m_pLocationSetArray, pNewLocationSet);
- g_hash_table_insert(g_LocationSet.m_pLocationSetHash, &pNewLocationSet->m_nID, pNewLocationSet);
+ g_ptr_array_add(g_LocationSet.pLocationSetArray, pNewLocationSet);
+ g_hash_table_insert(g_LocationSet.pLocationSetHash, &pNewLocationSet->nID, pNewLocationSet);
}
db_free_result(pResultSet);
}
@@ -114,12 +114,12 @@
const GPtrArray* locationset_get_array(void)
{
- return g_LocationSet.m_pLocationSetArray;
+ return g_LocationSet.pLocationSetArray;
}
gboolean locationset_find_by_id(gint nLocationSetID, locationset_t** ppLocationSet)
{
- locationset_t* pLocationSet = g_hash_table_lookup(g_LocationSet.m_pLocationSetHash, &nLocationSetID);
+ locationset_t* pLocationSet = g_hash_table_lookup(g_LocationSet.pLocationSetHash, &nLocationSetID);
if(pLocationSet) {
*ppLocationSet = pLocationSet;
return TRUE;
@@ -129,12 +129,12 @@
gboolean locationset_is_visible(locationset_t* pLocationSet)
{
- return pLocationSet->m_bVisible;
+ return pLocationSet->bVisible;
}
void locationset_set_visible(locationset_t* pLocationSet, gboolean bVisible)
{
- pLocationSet->m_bVisible = bVisible;
+ pLocationSet->bVisible = bVisible;
}
#ifdef ROADSTER_DEAD_CODE
@@ -145,19 +145,19 @@
locationset_clear(pLocationSet);
// give back to allocator
- g_mem_chunk_free(g_LocationSet.m_pLocationSetChunkAllocator, pLocationSet);
+ g_mem_chunk_free(g_LocationSet.pLocationSetChunkAllocator, pLocationSet);
}
static void locationset_clear_all_locations(void)
{
// delete all sets but don't delete array of sets
gint i;
- for(i=(g_LocationSet.m_pLocationSetArray->len)-1 ; i>=0 ; i--) {
- locationset_t* pLocationSet = g_ptr_array_index(g_LocationSet.m_pLocationSetArray, i);
+ for(i=(g_LocationSet.pLocationSetArray->len)-1 ; i>=0 ; i--) {
+ locationset_t* pLocationSet = g_ptr_array_index(g_LocationSet.pLocationSetArray, i);
locationset_clear(pLocationSet);
}
-// g_hash_table_foreach_steal(g_LocationSet.m_pLocationSets, callback_delete_pointset, NULL);
-// g_assert(g_hash_table_size(g_LocationSet.m_pLocationSets) == 0);
+// g_hash_table_foreach_steal(g_LocationSet.pLocationSets, callback_delete_pointset, NULL);
+// g_assert(g_hash_table_size(g_LocationSet.pLocationSets) == 0);
}
*/
#endif
Index: locationset.h
===================================================================
RCS file: /cvs/cairo/roadster/src/locationset.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- locationset.h 24 Sep 2005 05:25:25 -0000 1.7
+++ locationset.h 25 Sep 2005 19:02:37 -0000 1.8
@@ -36,12 +36,12 @@
// a set of locations (eg. "Coffee Shops")
typedef struct locationset {
- gint m_nID;
- gchar* m_pszName;
- gchar* m_pszIconName;
- gint m_nLocationCount;
- gboolean m_bVisible; // user has chosen to view these
-// locationsetstyle_t m_Style;
+ gint nID;
+ gchar* pszName;
+ gchar* pszIconName;
+ gint nLocationCount;
+ gboolean bVisible; // user has chosen to view these
+// locationsetstyle_t Style;
} locationset_t;
void locationset_init(void);
Index: main.c
===================================================================
RCS file: /cvs/cairo/roadster/src/main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- main.c 24 Sep 2005 05:25:25 -0000 1.24
+++ main.c 25 Sep 2005 19:02:37 -0000 1.25
@@ -66,15 +66,15 @@
gint nNewLocationID;
mappoint_t pt;
- pt.m_fLatitude = 42.37382;
- pt.m_fLongitude = -71.10054;
+ pt.fLatitude = 42.37382;
+ pt.fLongitude = -71.10054;
nNewLocationID = 0;
location_insert(nNewLocationSetID, &pt, &nNewLocationID);
location_insert_attribute(nNewLocationID, LOCATION_ATTRIBUTE_ID_NAME, "1369 Coffee House", NULL);
location_insert_attribute(nNewLocationID, LOCATION_ATTRIBUTE_ID_ADDRESS, "1369 Cambridge Street\nCambridge, MA, 02141", NULL);
- pt.m_fLatitude = 42.36650;
- pt.m_fLongitude = -71.10554;
+ pt.fLatitude = 42.36650;
+ pt.fLongitude = -71.10554;
nNewLocationID = 0;
location_insert(nNewLocationSetID, &pt, &nNewLocationID);
location_insert_attribute(nNewLocationID, LOCATION_ATTRIBUTE_ID_NAME, "1369 Coffee House", NULL);
Index: main.h
===================================================================
RCS file: /cvs/cairo/roadster/src/main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- main.h 24 Sep 2005 05:25:25 -0000 1.4
+++ main.h 25 Sep 2005 19:02:37 -0000 1.5
@@ -35,10 +35,10 @@
//#define ENABLE_TIMING
typedef struct color {
- gfloat m_fRed;
- gfloat m_fGreen;
- gfloat m_fBlue;
- gfloat m_fAlpha;
+ gfloat fRed;
+ gfloat fGreen;
+ gfloat fBlue;
+ gfloat fAlpha;
} color_t;
#endif
Index: mainwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/mainwindow.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- mainwindow.c 24 Sep 2005 05:25:25 -0000 1.41
+++ mainwindow.c 25 Sep 2005 19:02:37 -0000 1.42
@@ -110,13 +110,13 @@
// Types
typedef struct {
- GdkCursorType m_CursorType;
- GdkCursor* m_pGdkCursor;
+ GdkCursorType CursorType;
+ GdkCursor* pGdkCursor;
} cursor_t;
typedef struct {
- char* m_szName;
[...1605 lines suppressed...]
+ apszReplacements[4].pszReplace = g_strdup_printf("%d", map_get_zoomlevel_scale(g_MainWindow.pMap));
//
gchar* pszURL = util_str_replace_many(pszURLPattern, apszReplacements, G_N_ELEMENTS(apszReplacements));
@@ -1732,13 +1752,11 @@
// cleanup
gint i;
for(i=0 ; i<G_N_ELEMENTS(apszReplacements) ; i++) {
- g_free(apszReplacements[i].m_pszNew);
- apszReplacements[i].m_pszNew = NULL;
+ g_free(apszReplacements[i].pszReplace);
+ apszReplacements[i].pszReplace = NULL;
}
}
-
-
#ifdef ROADSTER_DEAD_CODE
/*
static gboolean on_searchbox_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
Index: map.c
===================================================================
RCS file: /cvs/cairo/roadster/src/map.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- map.c 24 Sep 2005 05:25:25 -0000 1.45
+++ map.c 25 Sep 2005 19:02:37 -0000 1.46
@@ -142,30 +142,30 @@
map_t* pMap = g_new0(map_t, 1);
// Create array of Track handles
- pMap->m_pTracksArray = g_array_new(FALSE, /* not zero-terminated */
+ pMap->pTracksArray = g_array_new(FALSE, /* not zero-terminated */
TRUE, /* clear to 0 (?) */
sizeof(gint));
map_init_location_hash(pMap);
- pMap->m_pTargetWidget = pTargetWidget;
[...1022 lines suppressed...]
- g_ptr_array_sort(pMap->m_pLocationSelectionArray, map_location_selection_latitude_sort_callback);
+ g_ptr_array_sort(pMap->pLocationSelectionArray, map_location_selection_latitude_sort_callback);
return TRUE; // added
}
@@ -1366,10 +1366,10 @@
gboolean map_location_selection_remove(map_t* pMap, gint nLocationID)
{
gint i;
- for(i=0 ; i<pMap->m_pLocationSelectionArray->len ; i++) {
- locationselection_t* pSel = g_ptr_array_index(pMap->m_pLocationSelectionArray, i);
- if(pSel->m_nLocationID == nLocationID) {
- g_ptr_array_remove_index(pMap->m_pLocationSelectionArray, i);
+ for(i=0 ; i<pMap->pLocationSelectionArray->len ; i++) {
+ locationselection_t* pSel = g_ptr_array_index(pMap->pLocationSelectionArray, i);
+ if(pSel->nLocationID == nLocationID) {
+ g_ptr_array_remove_index(pMap->pLocationSelectionArray, i);
return TRUE;
}
}
Index: map.h
===================================================================
RCS file: /cvs/cairo/roadster/src/map.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- map.h 24 Sep 2005 05:25:25 -0000 1.22
+++ map.h 25 Sep 2005 19:02:37 -0000 1.23
@@ -108,29 +108,29 @@
// World space
typedef struct {
- gdouble m_fLatitude;
- gdouble m_fLongitude;
+ gdouble fLatitude;
+ gdouble fLongitude;
} mappoint_t;
typedef struct {
- mappoint_t m_A;
- mappoint_t m_B;
+ mappoint_t A;
+ mappoint_t B;
} maprect_t;
// Screen space
typedef struct {
- gint16 m_nX;
- gint16 m_nY;
+ gint16 nX;
+ gint16 nY;
} screenpoint_t;
typedef struct {
- screenpoint_t m_A;
- screenpoint_t m_B;
+ screenpoint_t A;
+ screenpoint_t B;
} screenrect_t;
typedef struct {
- guint16 m_uWidth;
- guint16 m_uHeight;
+ guint16 uWidth;
+ guint16 uHeight;
} dimensions_t;
typedef enum {
@@ -144,15 +144,15 @@
#define DEFAULT_UNIT (UNIT_MILES)
typedef struct {
- guint32 m_uScale; // ex. 10000 for 1:10000 scale
+ guint32 uScale; // ex. 10000 for 1:10000 scale
- EDistanceUnits m_eScaleImperialUnit; // eg. "feet"
- gint m_nScaleImperialNumber; // eg. 200
+ EDistanceUnits eScaleImperialUnit; // eg. "feet"
+ gint nScaleImperialNumber; // eg. 200
- EDistanceUnits m_eScaleMetricUnit;
- gint m_nScaleMetricNumber;
+ EDistanceUnits eScaleMetricUnit;
+ gint nScaleMetricNumber;
- gchar* m_szName;
+ gchar* szName;
} zoomlevel_t;
extern zoomlevel_t g_sZoomLevels[];
@@ -166,52 +166,52 @@
extern gchar* g_aDistanceUnitNames[];
typedef struct {
- gint m_nZoomLevel;
- gdouble m_fScreenLatitude;
- gdouble m_fScreenLongitude;
- maprect_t m_rWorldBoundingBox;
- gint m_nWindowWidth;
- gint m_nWindowHeight;
+ gint nZoomLevel;
+ gdouble fScreenLatitude;
+ gdouble fScreenLongitude;
+ maprect_t rWorldBoundingBox;
+ gint nWindowWidth;
+ gint nWindowHeight;
} rendermetrics_t;
-#define SCALE_X(p, x) ((((x) - (p)->m_rWorldBoundingBox.m_A.m_fLongitude) / (p)->m_fScreenLongitude) * (p)->m_nWindowWidth)
-#define SCALE_Y(p, y) ((p)->m_nWindowHeight - ((((y) - (p)->m_rWorldBoundingBox.m_A.m_fLatitude) / (p)->m_fScreenLatitude) * (p)->m_nWindowHeight))
+#define SCALE_X(p, x) ((((x) - (p)->rWorldBoundingBox.A.fLongitude) / (p)->fScreenLongitude) * (p)->nWindowWidth)
+#define SCALE_Y(p, y) ((p)->nWindowHeight - ((((y) - (p)->rWorldBoundingBox.A.fLatitude) / (p)->fScreenLatitude) * (p)->nWindowHeight))
typedef struct {
- GPtrArray* m_pRoadsArray;
+ GPtrArray* pRoadsArray;
} maplayer_data_t;
typedef struct {
- GPtrArray* m_pLocationsArray;
+ GPtrArray* pLocationsArray;
} maplayer_locations_t;
typedef struct {
- mappoint_t m_MapCenter;
- dimensions_t m_MapDimensions;
- guint16 m_uZoomLevel;
- GtkWidget *m_pTargetWidget;
- scenemanager_t *m_pSceneManager;
+ mappoint_t MapCenter;
+ dimensions_t MapDimensions;
+ guint16 uZoomLevel;
+ GtkWidget* pTargetWidget;
+ scenemanager_t* pSceneManager;
// data
- GArray *m_pTracksArray;
- maplayer_data_t *m_apLayerData[ MAP_NUM_OBJECT_TYPES + 1 ];
+ GArray *pTracksArray;
+ maplayer_data_t *apLayerData[ MAP_NUM_OBJECT_TYPES + 1 ];
// Locationsets
- GHashTable *m_pLocationArrayHashTable;
+ GHashTable *pLocationArrayHashTable;
- GPtrArray *m_pLocationSelectionArray;
- GFreeList *m_pLocationSelectionAllocator;
+ GPtrArray *pLocationSelectionArray;
+ GFreeList *pLocationSelectionAllocator;
- GdkPixmap* m_pPixmap;
+ GdkPixmap* pPixmap;
- GPtrArray* m_pLayersArray;
+ GPtrArray* pLayersArray;
} map_t;
typedef enum {
MAP_HITTYPE_LOCATION,
MAP_HITTYPE_ROAD,
- // the following all use m_LocationSelectionHit in the union below
+ // the following all use LocationSelectionHit in the union below
MAP_HITTYPE_LOCATIONSELECTION, // hit somewhere on a locationselection graphic (info balloon)
MAP_HITTYPE_LOCATIONSELECTION_CLOSE, // hit locationselection graphic close graphic (info balloon [X])
MAP_HITTYPE_LOCATIONSELECTION_EDIT, // hit locationselection graphic edit graphic (info balloon "edit")
@@ -220,26 +220,26 @@
} EMapHitType;
typedef struct {
- EMapHitType m_eHitType;
- gchar* m_pszText;
+ EMapHitType eHitType;
+ gchar* pszText;
union {
struct {
- gint m_nLocationID;
- mappoint_t m_Coordinates;
- } m_LocationHit;
+ gint nLocationID;
+ mappoint_t Coordinates;
+ } LocationHit;
struct {
- gint m_nRoadID;
- mappoint_t m_ClosestPoint;
- } m_RoadHit;
+ gint nRoadID;
+ mappoint_t ClosestPoint;
+ } RoadHit;
struct {
- gint m_nLocationID;
- } m_LocationSelectionHit;
+ gint nLocationID;
+ } LocationSelectionHit;
struct {
- gchar* m_pszURL;
- } m_URLHit;
+ gchar* pszURL;
+ } URLHit;
};
} maphit_t;
@@ -260,21 +260,21 @@
#define MAX_LOCATIONSELECTION_URLS (5)
typedef struct {
- gint m_nLocationID;
- gboolean m_bVisible;
+ gint nLocationID;
+ gboolean bVisible;
- mappoint_t m_Coordinates;
- GPtrArray *m_pAttributesArray;
+ mappoint_t Coordinates;
+ GPtrArray* pAttributesArray;
- screenrect_t m_InfoBoxRect;
- screenrect_t m_InfoBoxCloseRect;
- screenrect_t m_EditRect;
+ screenrect_t InfoBoxRect;
+ screenrect_t InfoBoxCloseRect;
+ screenrect_t EditRect;
- gint m_nNumURLs;
+ gint nNumURLs;
struct {
- screenrect_t m_Rect;
- gchar* m_pszURL;
- } m_aURLs[MAX_LOCATIONSELECTION_URLS];
+ screenrect_t Rect;
+ gchar* pszURL;
+ } aURLs[MAX_LOCATIONSELECTION_URLS];
} locationselection_t;
// Draw flags
Index: map_draw_cairo.c
===================================================================
RCS file: /cvs/cairo/roadster/src/map_draw_cairo.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- map_draw_cairo.c 14 Sep 2005 20:06:54 -0000 1.22
+++ map_draw_cairo.c 25 Sep 2005 19:02:37 -0000 1.23
@@ -96,7 +96,7 @@
void map_draw_cairo_set_rgba(cairo_t* pCairo, color_t* pColor)
{
- cairo_set_source_rgba(pCairo, pColor->m_fRed, pColor->m_fGreen, pColor->m_fBlue, pColor->m_fAlpha);
+ cairo_set_source_rgba(pCairo, pColor->fRed, pColor->fGreen, pColor->fBlue, pColor->fAlpha);
}
void map_draw_cairo(map_t* pMap, rendermetrics_t* pRenderMetrics, GdkPixmap* pPixmap, gint nDrawFlags)
@@ -119,7 +119,7 @@
# define MAP_SCALE_HEIGHT (35)
[...1051 lines suppressed...]
- if(pPointString->m_pPointsArray->len > 2) {
- mappoint_t* pPoint = g_ptr_array_index(pPointString->m_pPointsArray, 0);
+ if(pPointString->pPointsArray->len > 2) {
+ mappoint_t* pPoint = g_ptr_array_index(pPointString->pPointsArray, 0);
// move to index 0
- cairo_move_to(pCairo, SCALE_X(pRenderMetrics, pPoint->m_fLongitude), SCALE_Y(pRenderMetrics, pPoint->m_fLatitude));
+ cairo_move_to(pCairo, SCALE_X(pRenderMetrics, pPoint->fLongitude), SCALE_Y(pRenderMetrics, pPoint->fLatitude));
gint i;
- for(i=1 ; i<pPointString->m_pPointsArray->len ; i++) {
- pPoint = g_ptr_array_index(pPointString->m_pPointsArray, i);
- cairo_line_to(pCairo, SCALE_X(pRenderMetrics, pPoint->m_fLongitude), SCALE_Y(pRenderMetrics, pPoint->m_fLatitude));
+ for(i=1 ; i<pPointString->pPointsArray->len ; i++) {
+ pPoint = g_ptr_array_index(pPointString->pPointsArray, i);
+ cairo_line_to(pCairo, SCALE_X(pRenderMetrics, pPoint->fLongitude), SCALE_Y(pRenderMetrics, pPoint->fLatitude));
}
cairo_set_source_rgb(pCairo, 0.0, 0.0, 0.7);
Index: map_draw_gdk.c
===================================================================
RCS file: /cvs/cairo/roadster/src/map_draw_gdk.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- map_draw_gdk.c 14 Sep 2005 20:06:54 -0000 1.18
+++ map_draw_gdk.c 25 Sep 2005 19:02:37 -0000 1.19
@@ -61,11 +61,11 @@
GdkColor clr;
#ifdef ENABLE_MAP_GRAYSCALE_HACK
- clr.red = clr.green = clr.blue = ((pColor->m_fRed + pColor->m_fGreen + pColor->m_fBlue) / 3.0) * 65535;
+ clr.red = clr.green = clr.blue = ((pColor->fRed + pColor->fGreen + pColor->fBlue) / 3.0) * 65535;
#else
- clr.red = pColor->m_fRed * 65535;
- clr.green = pColor->m_fGreen * 65535;
- clr.blue = pColor->m_fBlue * 65535;
+ clr.red = pColor->fRed * 65535;
+ clr.green = pColor->fGreen * 65535;
+ clr.blue = pColor->fBlue * 65535;
#endif
gdk_gc_set_rgb_fg_color(pGC, &clr);
}
@@ -74,7 +74,7 @@
{
TIMER_BEGIN(maptimer, "BEGIN RENDER MAP (gdk)");
- GdkGC* pGC = pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)];
+ GdkGC* pGC = pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)];
// 1. Save values (so we can restore them)
GdkGCValues gcValues;
@@ -88,22 +88,22 @@
// map_draw_gdk_background(pMap, pPixmap);
// 2.2. Draw layer list in reverse order (painter's algorithm: http://en.wikipedia.org/wiki/Painter's_algorithm )
- for(i=pMap->m_pLayersArray->len-1 ; i>=0 ; i--) {
- maplayer_t* pLayer = g_ptr_array_index(pMap->m_pLayersArray, i);
+ for(i=pMap->pLayersArray->len-1 ; i>=0 ; i--) {
+ maplayer_t* pLayer = g_ptr_array_index(pMap->pLayersArray, i);
- if(pLayer->m_nDrawType == MAP_LAYER_RENDERTYPE_FILL) {
+ if(pLayer->nDrawType == MAP_LAYER_RENDERTYPE_FILL) {
map_draw_gdk_layer_fill(pMap, pPixmap, pRenderMetrics,
- pLayer->m_paStylesAtZoomLevels[pRenderMetrics->m_nZoomLevel-1]); // style
+ pLayer->paStylesAtZoomLevels[pRenderMetrics->nZoomLevel-1]); // style
}
- else if(pLayer->m_nDrawType == MAP_LAYER_RENDERTYPE_LINES) {
+ else if(pLayer->nDrawType == MAP_LAYER_RENDERTYPE_LINES) {
map_draw_gdk_layer_lines(pMap, pPixmap, pRenderMetrics,
- pMap->m_apLayerData[pLayer->m_nDataSource]->m_pRoadsArray, // data
- pLayer->m_paStylesAtZoomLevels[pRenderMetrics->m_nZoomLevel-1]); // style
+ pMap->apLayerData[pLayer->nDataSource]->pRoadsArray, // data
+ pLayer->paStylesAtZoomLevels[pRenderMetrics->nZoomLevel-1]); // style
}
- else if(pLayer->m_nDrawType == MAP_LAYER_RENDERTYPE_POLYGONS) {
+ else if(pLayer->nDrawType == MAP_LAYER_RENDERTYPE_POLYGONS) {
map_draw_gdk_layer_polygons(pMap, pPixmap, pRenderMetrics,
- pMap->m_apLayerData[pLayer->m_nDataSource]->m_pRoadsArray, // data
- pLayer->m_paStylesAtZoomLevels[pRenderMetrics->m_nZoomLevel-1]); // style
+ pMap->apLayerData[pLayer->nDataSource]->pRoadsArray, // data
+ pLayer->paStylesAtZoomLevels[pRenderMetrics->nZoomLevel-1]); // style
}
}
@@ -115,7 +115,7 @@
// ...GDK just shouldn't attempt text. :)
// 4. Restore values
- gdk_gc_set_values(pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)], &gcValues, GDK_GC_FOREGROUND | GDK_GC_BACKGROUND | GDK_GC_LINE_WIDTH | GDK_GC_LINE_STYLE | GDK_GC_CAP_STYLE | GDK_GC_JOIN_STYLE);
+ gdk_gc_set_values(pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)], &gcValues, GDK_GC_FOREGROUND | GDK_GC_BACKGROUND | GDK_GC_LINE_WIDTH | GDK_GC_LINE_STYLE | GDK_GC_CAP_STYLE | GDK_GC_JOIN_STYLE);
TIMER_END(maptimer, "END RENDER MAP (gdk)");
}
@@ -125,10 +125,10 @@
// clr.red = 236/255.0 * 65535;
// clr.green = 230/255.0 * 65535;
// clr.blue = 230/255.0 * 65535;
-// gdk_gc_set_rgb_fg_color(pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)], &clr);
+// gdk_gc_set_rgb_fg_color(pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)], &clr);
//
-// gdk_draw_rectangle(pPixmap, pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)],
-// TRUE, 0,0, pMap->m_MapDimensions.m_uWidth, pMap->m_MapDimensions.m_uHeight);
+// gdk_draw_rectangle(pPixmap, pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)],
+// TRUE, 0,0, pMap->MapDimensions.uWidth, pMap->MapDimensions.uHeight);
// }
static void map_draw_gdk_layer_polygons(map_t* pMap, GdkPixmap* pPixmap, rendermetrics_t* pRenderMetrics, GPtrArray* pRoadsArray, maplayerstyle_t* pLayerStyle)
@@ -138,9 +138,9 @@
gint iString;
gint iPoint;
- if(pLayerStyle->m_clrPrimary.m_fAlpha == 0.0) return; // invisible? (not that we respect it in gdk drawing anyway)
+ if(pLayerStyle->clrPrimary.fAlpha == 0.0) return; // invisible? (not that we respect it in gdk drawing anyway)
- map_draw_gdk_set_color(pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)], &(pLayerStyle->m_clrPrimary));
+ map_draw_gdk_set_color(pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)], &(pLayerStyle->clrPrimary));
for(iString=0 ; iString<pRoadsArray->len ; iString++) {
pRoad = g_ptr_array_index(pRoadsArray, iString);
@@ -150,37 +150,37 @@
gdouble fMaxLon = MIN_LONGITUDE;
gdouble fMinLon = MAX_LONGITUDE;
- if(pRoad->m_pPointsArray->len >= 2) {
+ if(pRoad->pPointsArray->len >= 2) {
GdkPoint aPoints[MAX_GDK_LINE_SEGMENTS];
- if(pRoad->m_pPointsArray->len > MAX_GDK_LINE_SEGMENTS) {
+ if(pRoad->pPointsArray->len > MAX_GDK_LINE_SEGMENTS) {
//g_warning("not drawing line with > %d segments\n", MAX_GDK_LINE_SEGMENTS);
continue;
}
- for(iPoint=0 ; iPoint<pRoad->m_pPointsArray->len ; iPoint++) {
- pPoint = g_ptr_array_index(pRoad->m_pPointsArray, iPoint);
+ for(iPoint=0 ; iPoint<pRoad->pPointsArray->len ; iPoint++) {
+ pPoint = g_ptr_array_index(pRoad->pPointsArray, iPoint);
// find extents
- fMaxLat = max(pPoint->m_fLatitude,fMaxLat);
- fMinLat = min(pPoint->m_fLatitude,fMinLat);
- fMaxLon = max(pPoint->m_fLongitude,fMaxLon);
- fMinLon = min(pPoint->m_fLongitude,fMinLon);
+ fMaxLat = max(pPoint->fLatitude,fMaxLat);
+ fMinLat = min(pPoint->fLatitude,fMinLat);
+ fMaxLon = max(pPoint->fLongitude,fMaxLon);
+ fMinLon = min(pPoint->fLongitude,fMinLon);
- aPoints[iPoint].x = pLayerStyle->m_nPixelOffsetX + (gint)SCALE_X(pRenderMetrics, pPoint->m_fLongitude);
- aPoints[iPoint].y = pLayerStyle->m_nPixelOffsetY + (gint)SCALE_Y(pRenderMetrics, pPoint->m_fLatitude);
+ aPoints[iPoint].x = pLayerStyle->nPixelOffsetX + (gint)SCALE_X(pRenderMetrics, pPoint->fLongitude);
+ aPoints[iPoint].y = pLayerStyle->nPixelOffsetY + (gint)SCALE_Y(pRenderMetrics, pPoint->fLatitude);
}
// rectangle overlap test
- if(fMaxLat < pRenderMetrics->m_rWorldBoundingBox.m_A.m_fLatitude
- || fMaxLon < pRenderMetrics->m_rWorldBoundingBox.m_A.m_fLongitude
- || fMinLat > pRenderMetrics->m_rWorldBoundingBox.m_B.m_fLatitude
- || fMinLon > pRenderMetrics->m_rWorldBoundingBox.m_B.m_fLongitude)
+ if(fMaxLat < pRenderMetrics->rWorldBoundingBox.A.fLatitude
+ || fMaxLon < pRenderMetrics->rWorldBoundingBox.A.fLongitude
+ || fMinLat > pRenderMetrics->rWorldBoundingBox.B.fLatitude
+ || fMinLon > pRenderMetrics->rWorldBoundingBox.B.fLongitude)
{
continue; // not visible
}
- gdk_draw_polygon(pPixmap, pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)],
- TRUE, aPoints, pRoad->m_pPointsArray->len);
+ gdk_draw_polygon(pPixmap, pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)],
+ TRUE, aPoints, pRoad->pPointsArray->len);
}
}
}
@@ -188,9 +188,9 @@
// useful for filling the screen with a color. not much else.
static void map_draw_gdk_layer_fill(map_t* pMap, GdkPixmap* pPixmap, rendermetrics_t* pRenderMetrics, maplayerstyle_t* pLayerStyle)
{
- map_draw_gdk_set_color(pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)], &(pLayerStyle->m_clrPrimary));
- gdk_draw_rectangle(pPixmap, pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)],
- TRUE, 0,0, pMap->m_MapDimensions.m_uWidth, pMap->m_MapDimensions.m_uHeight);
+ map_draw_gdk_set_color(pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)], &(pLayerStyle->clrPrimary));
+ gdk_draw_rectangle(pPixmap, pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)],
+ TRUE, 0,0, pMap->MapDimensions.uWidth, pMap->MapDimensions.uHeight);
}
static void map_draw_gdk_layer_lines(map_t* pMap, GdkPixmap* pPixmap, rendermetrics_t* pRenderMetrics, GPtrArray* pRoadsArray, maplayerstyle_t* pLayerStyle)
@@ -200,12 +200,12 @@
gint iString;
gint iPoint;
- if(pLayerStyle->m_fLineWidth <= 0.0) return; // Don't draw invisible lines
- if(pLayerStyle->m_clrPrimary.m_fAlpha == 0.0) return; // invisible? (not that we respect it in gdk drawing anyway)
+ if(pLayerStyle->fLineWidth <= 0.0) return; // Don't draw invisible lines
+ if(pLayerStyle->clrPrimary.fAlpha == 0.0) return; // invisible? (not that we respect it in gdk drawing anyway)
// Translate generic cap style into GDK constant
gint nCapStyle;
- if(pLayerStyle->m_nCapStyle == MAP_CAP_STYLE_ROUND) {
+ if(pLayerStyle->nCapStyle == MAP_CAP_STYLE_ROUND) {
nCapStyle = GDK_CAP_ROUND;
}
else {
@@ -213,30 +213,30 @@
}
// Convert to integer width. Ouch!
- gint nLineWidth = (gint)(pLayerStyle->m_fLineWidth);
+ gint nLineWidth = (gint)(pLayerStyle->fLineWidth);
// Use GDK dash style if ANY dash pattern is set
gint nDashStyle = GDK_LINE_SOLID;
- if(pLayerStyle->m_pDashStyle != NULL) {
- gdk_gc_set_dashes(pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)],
+ if(pLayerStyle->pDashStyle != NULL) {
+ gdk_gc_set_dashes(pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)],
0, /* offset to start at */
- pLayerStyle->m_pDashStyle->m_panDashList,
- pLayerStyle->m_pDashStyle->m_nDashCount);
+ pLayerStyle->pDashStyle->panDashList,
+ pLayerStyle->pDashStyle->nDashCount);
nDashStyle = GDK_LINE_ON_OFF_DASH;
// further set line attributes below...
}
// Set line style
- gdk_gc_set_line_attributes(pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)],
+ gdk_gc_set_line_attributes(pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)],
nLineWidth, nDashStyle, nCapStyle, GDK_JOIN_ROUND);
- map_draw_gdk_set_color(pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)], &(pLayerStyle->m_clrPrimary));
+ map_draw_gdk_set_color(pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)], &(pLayerStyle->clrPrimary));
for(iString=0 ; iString<pRoadsArray->len ; iString++) {
pRoad = g_ptr_array_index(pRoadsArray, iString);
- if(pRoad->m_pPointsArray->len > MAX_GDK_LINE_SEGMENTS) {
+ if(pRoad->pPointsArray->len > MAX_GDK_LINE_SEGMENTS) {
//g_warning("not drawing line with > %d segments\n", MAX_GDK_LINE_SEGMENTS);
continue;
}
@@ -246,35 +246,35 @@
gdouble fMaxLon = MIN_LONGITUDE;
gdouble fMinLon = MAX_LONGITUDE;
- if(pRoad->m_pPointsArray->len >= 2) {
+ if(pRoad->pPointsArray->len >= 2) {
// Copy all points into this array. Yuuup this is slow. :)
GdkPoint aPoints[MAX_GDK_LINE_SEGMENTS];
- for(iPoint=0 ; iPoint<pRoad->m_pPointsArray->len ; iPoint++) {
- pPoint = g_ptr_array_index(pRoad->m_pPointsArray, iPoint);
+ for(iPoint=0 ; iPoint<pRoad->pPointsArray->len ; iPoint++) {
+ pPoint = g_ptr_array_index(pRoad->pPointsArray, iPoint);
// find extents
- fMaxLat = max(pPoint->m_fLatitude,fMaxLat);
- fMinLat = min(pPoint->m_fLatitude,fMinLat);
- fMaxLon = max(pPoint->m_fLongitude,fMaxLon);
- fMinLon = min(pPoint->m_fLongitude,fMinLon);
+ fMaxLat = max(pPoint->fLatitude,fMaxLat);
+ fMinLat = min(pPoint->fLatitude,fMinLat);
+ fMaxLon = max(pPoint->fLongitude,fMaxLon);
+ fMinLon = min(pPoint->fLongitude,fMinLon);
- aPoints[iPoint].x = pLayerStyle->m_nPixelOffsetX + (gint)SCALE_X(pRenderMetrics, pPoint->m_fLongitude);
- aPoints[iPoint].y = pLayerStyle->m_nPixelOffsetY + (gint)SCALE_Y(pRenderMetrics, pPoint->m_fLatitude);
+ aPoints[iPoint].x = pLayerStyle->nPixelOffsetX + (gint)SCALE_X(pRenderMetrics, pPoint->fLongitude);
+ aPoints[iPoint].y = pLayerStyle->nPixelOffsetY + (gint)SCALE_Y(pRenderMetrics, pPoint->fLatitude);
}
// basic rectangle overlap test
// XXX: not quite right. the points that make up a road may be offscreen,
// but a thick road should still be visible
- if(fMaxLat < pRenderMetrics->m_rWorldBoundingBox.m_A.m_fLatitude
- || fMaxLon < pRenderMetrics->m_rWorldBoundingBox.m_A.m_fLongitude
- || fMinLat > pRenderMetrics->m_rWorldBoundingBox.m_B.m_fLatitude
- || fMinLon > pRenderMetrics->m_rWorldBoundingBox.m_B.m_fLongitude)
+ if(fMaxLat < pRenderMetrics->rWorldBoundingBox.A.fLatitude
+ || fMaxLon < pRenderMetrics->rWorldBoundingBox.A.fLongitude
+ || fMinLat > pRenderMetrics->rWorldBoundingBox.B.fLatitude
+ || fMinLon > pRenderMetrics->rWorldBoundingBox.B.fLongitude)
{
continue; // not visible
}
- gdk_draw_lines(pPixmap, pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)], aPoints, pRoad->m_pPointsArray->len);
+ gdk_draw_lines(pPixmap, pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)], aPoints, pRoad->pPointsArray->len);
}
}
}
@@ -282,21 +282,21 @@
static void map_draw_gdk_tracks(map_t* pMap, GdkPixmap* pPixmap, rendermetrics_t* pRenderMetrics)
{
gint i;
- for(i=0 ; i<pMap->m_pTracksArray->len ; i++) {
- gint hTrack = g_array_index(pMap->m_pTracksArray, gint, i);
+ for(i=0 ; i<pMap->pTracksArray->len ; i++) {
+ gint hTrack = g_array_index(pMap->pTracksArray, gint, i);
GdkColor clr;
clr.red = (gint)(0.5 * 65535.0);
clr.green = (gint)(0.5 * 65535.0);
clr.blue = (gint)(1.0 * 65535.0);
- gdk_gc_set_rgb_fg_color(pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)], &clr);
+ gdk_gc_set_rgb_fg_color(pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)], &clr);
pointstring_t* pPointString = track_get_pointstring(hTrack);
if(pPointString == NULL) continue;
- if(pPointString->m_pPointsArray->len >= 2) {
+ if(pPointString->pPointsArray->len >= 2) {
- if(pPointString->m_pPointsArray->len > MAX_GDK_LINE_SEGMENTS) {
+ if(pPointString->pPointsArray->len > MAX_GDK_LINE_SEGMENTS) {
//g_warning("not drawing track with > %d segments\n", MAX_GDK_LINE_SEGMENTS);
continue;
}
@@ -309,29 +309,29 @@
gdouble fMinLon = MAX_LONGITUDE;
gint iPoint;
- for(iPoint=0 ; iPoint<pPointString->m_pPointsArray->len ; iPoint++) {
- mappoint_t* pPoint = g_ptr_array_index(pPointString->m_pPointsArray, iPoint);
+ for(iPoint=0 ; iPoint<pPointString->pPointsArray->len ; iPoint++) {
+ mappoint_t* pPoint = g_ptr_array_index(pPointString->pPointsArray, iPoint);
// find extents
- fMaxLat = max(pPoint->m_fLatitude,fMaxLat);
- fMinLat = min(pPoint->m_fLatitude,fMinLat);
- fMaxLon = max(pPoint->m_fLongitude,fMaxLon);
- fMinLon = min(pPoint->m_fLongitude,fMinLon);
+ fMaxLat = max(pPoint->fLatitude,fMaxLat);
+ fMinLat = min(pPoint->fLatitude,fMinLat);
+ fMaxLon = max(pPoint->fLongitude,fMaxLon);
+ fMinLon = min(pPoint->fLongitude,fMinLon);
- aPoints[iPoint].x = (gint)SCALE_X(pRenderMetrics, pPoint->m_fLongitude);
- aPoints[iPoint].y = (gint)SCALE_Y(pRenderMetrics, pPoint->m_fLatitude);
+ aPoints[iPoint].x = (gint)SCALE_X(pRenderMetrics, pPoint->fLongitude);
+ aPoints[iPoint].y = (gint)SCALE_Y(pRenderMetrics, pPoint->fLatitude);
}
// rectangle overlap test
- if(fMaxLat < pRenderMetrics->m_rWorldBoundingBox.m_A.m_fLatitude
- || fMaxLon < pRenderMetrics->m_rWorldBoundingBox.m_A.m_fLongitude
- || fMinLat > pRenderMetrics->m_rWorldBoundingBox.m_B.m_fLatitude
- || fMinLon > pRenderMetrics->m_rWorldBoundingBox.m_B.m_fLongitude)
+ if(fMaxLat < pRenderMetrics->rWorldBoundingBox.A.fLatitude
+ || fMaxLon < pRenderMetrics->rWorldBoundingBox.A.fLongitude
+ || fMinLat > pRenderMetrics->rWorldBoundingBox.B.fLatitude
+ || fMinLon > pRenderMetrics->rWorldBoundingBox.B.fLongitude)
{
continue; // not visible
}
- gdk_draw_lines(pPixmap, pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)], aPoints, pPointString->m_pPointsArray->len);
+ gdk_draw_lines(pPixmap, pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)], aPoints, pPointString->pPointsArray->len);
}
}
}
@@ -347,7 +347,7 @@
// 2. Get array of Locations from the hash table using LocationSetID
GPtrArray* pLocationsArray;
- pLocationsArray = g_hash_table_lookup(pMap->m_pLocationArrayHashTable, &(pLocationSet->m_nID));
+ pLocationsArray = g_hash_table_lookup(pMap->pLocationArrayHashTable, &(pLocationSet->nID));
if(pLocationsArray != NULL) {
// found existing array
map_draw_gdk_locationset(pMap, pPixmap, pRenderMetrics, pLocationSet, pLocationsArray);
@@ -365,20 +365,20 @@
location_t* pLocation = g_ptr_array_index(pLocationsArray, i);
// bounding box test
- if(pLocation->m_Coordinates.m_fLatitude < pRenderMetrics->m_rWorldBoundingBox.m_A.m_fLatitude
- || pLocation->m_Coordinates.m_fLongitude < pRenderMetrics->m_rWorldBoundingBox.m_A.m_fLongitude
- || pLocation->m_Coordinates.m_fLatitude > pRenderMetrics->m_rWorldBoundingBox.m_B.m_fLatitude
- || pLocation->m_Coordinates.m_fLongitude > pRenderMetrics->m_rWorldBoundingBox.m_B.m_fLongitude)
+ if(pLocation->Coordinates.fLatitude < pRenderMetrics->rWorldBoundingBox.A.fLatitude
+ || pLocation->Coordinates.fLongitude < pRenderMetrics->rWorldBoundingBox.A.fLongitude
+ || pLocation->Coordinates.fLatitude > pRenderMetrics->rWorldBoundingBox.B.fLatitude
+ || pLocation->Coordinates.fLongitude > pRenderMetrics->rWorldBoundingBox.B.fLongitude)
{
continue; // not visible
}
- gint nX = (gint)SCALE_X(pRenderMetrics, pLocation->m_Coordinates.m_fLongitude);
- gint nY = (gint)SCALE_Y(pRenderMetrics, pLocation->m_Coordinates.m_fLatitude);
+ gint nX = (gint)SCALE_X(pRenderMetrics, pLocation->Coordinates.fLongitude);
+ gint nY = (gint)SCALE_Y(pRenderMetrics, pLocation->Coordinates.fLatitude);
// g_print("drawing at %d,%d\n", nX,nY);
- GdkGC* pGC = pMap->m_pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->m_pTargetWidget)];
+ GdkGC* pGC = pMap->pTargetWidget->style->fg_gc[GTK_WIDGET_STATE(pMap->pTargetWidget)];
GdkColor clr1;
clr1.red = 255/255.0 * 65535;
Index: map_style.c
===================================================================
RCS file: /cvs/cairo/roadster/src/map_style.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- map_style.c 14 Sep 2005 20:06:54 -0000 1.1
+++ map_style.c 25 Sep 2005 19:02:37 -0000 1.2
@@ -80,12 +80,12 @@
g_assert(pMap != NULL);
g_assert(pszFileName != NULL);
- if(pMap->m_pLayersArray != NULL) {
+ if(pMap->pLayersArray != NULL) {
g_warning("reloading styles currently leaks memory so... don't do it very often :)\n");
- pMap->m_pLayersArray = NULL;
+ pMap->pLayersArray = NULL;
}
- pMap->m_pLayersArray = g_ptr_array_new();
+ pMap->pLayersArray = g_ptr_array_new();
if(g_pConstantsHash != NULL) {
g_hash_table_destroy(g_pConstantsHash); // NOTE: This frees all keys and values for us.
@@ -106,10 +106,8 @@
gchar* pszValue = g_hash_table_lookup(g_pConstantsHash, pszName);
if(pszValue != NULL) {
*ppszReturnValue = pszValue;
-// g_print("map_style_constant_get(%s) == TRUE\n", pszName);
return TRUE;
}
-// g_print("map_style_constant_get(%s) == FALSE\n", pszName);
return FALSE;
}
@@ -118,7 +116,6 @@
g_assert(pszName != NULL);
g_assert(pszValue != NULL);
-// g_print("map_style_constant_set(%s, %s)\n", pszName, pszValue);
// NOTE: if there was an existing key with this name, the old key and old value will get auto-freed by glib
g_hash_table_replace(g_pConstantsHash, (gchar*)pszName, (gchar*)pszValue);
}
@@ -131,12 +128,11 @@
for(i=0 ; i<NUM_ZOOM_LEVELS ; i++) {
maplayerstyle_t* pLayerStyle = g_new0(maplayerstyle_t, 1);
- pLayerStyle->m_nCapStyle = MAP_CAP_STYLE_DEFAULT;
+ pLayerStyle->nCapStyle = MAP_CAP_STYLE_DEFAULT;
// XXX: need to init the maplayerstyle_t's?
- pLayer->m_paStylesAtZoomLevels[i] = pLayerStyle;
+ pLayer->paStylesAtZoomLevels[i] = pLayerStyle;
}
-
return pLayer;
}
@@ -194,11 +190,11 @@
dashstyle_t* pNewDashStyle = g_new0(dashstyle_t, 1);
// The list of gdouble's can just be copied in
- pNewDashStyle->m_pafDashList = g_malloc(sizeof(gdouble) * nValueCount);
- memcpy(pNewDashStyle->m_pafDashList, pafValues, sizeof(gdouble) * nValueCount);
+ pNewDashStyle->pafDashList = g_malloc(sizeof(gdouble) * nValueCount);
+ memcpy(pNewDashStyle->pafDashList, pafValues, sizeof(gdouble) * nValueCount);
// The list of int8's has to be converted list
- pNewDashStyle->m_panDashList = g_malloc(sizeof(gint8) * nValueCount);
+ pNewDashStyle->panDashList = g_malloc(sizeof(gint8) * nValueCount);
gint i;
for(i=0 ; i<nValueCount ; i++) {
gint8 nVal = (gint)pafValues[i];
@@ -207,10 +203,10 @@
nVal = MIN(nVal, MAX_DASH_LENGTH);
nVal = MAX(nVal, MIN_DASH_LENGTH);
- pNewDashStyle->m_panDashList[i] = nVal;
+ pNewDashStyle->panDashList[i] = nVal;
}
- pNewDashStyle->m_nDashCount = nValueCount;
+ pNewDashStyle->nDashCount = nValueCount;
return pNewDashStyle;
}
@@ -410,14 +406,14 @@
if(strcmp(pAttribute->name, "data-source") == 0) {
gchar* pszDataSource = xmlNodeListGetString(pDoc, pAttribute->xmlChildrenNode, 1);
- if(!map_object_type_atoi(pszDataSource, &(pLayer->m_nDataSource))) {
+ if(!map_object_type_atoi(pszDataSource, &(pLayer->nDataSource))) {
g_error("bad data source name %s\n", pszDataSource);
}
}
else if(strcmp(pAttribute->name, "draw-type") == 0) {
gchar* pszDrawType = xmlNodeListGetString(pDoc, pAttribute->xmlChildrenNode, 1);
- if(!map_layer_render_type_atoi(pszDrawType, &(pLayer->m_nDrawType))) {
+ if(!map_layer_render_type_atoi(pszDrawType, &(pLayer->nDrawType))) {
g_error("bad layer draw type name %s\n", pszDrawType);
}
}
@@ -432,7 +428,7 @@
}
// add it to list
- g_ptr_array_add(pMap->m_pLayersArray, pLayer);
+ g_ptr_array_add(pMap->pLayersArray, pLayer);
// map_style_print_layer(pLayer);
}
@@ -482,32 +478,32 @@
gint i;
if(strcmp(pszName, "line-width") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_fLineWidth = (gdouble)atof(pszValue);
+ pLayer->paStylesAtZoomLevels[i]->fLineWidth = (gdouble)atof(pszValue);
}
}
else if(strcmp(pszName, "line-width") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_fLineWidth = (gdouble)atof(pszValue);
+ pLayer->paStylesAtZoomLevels[i]->fLineWidth = (gdouble)atof(pszValue);
}
}
else if(strcmp(pszName, "pixel-offset-x") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_nPixelOffsetX = (gint)atoi(pszValue);
+ pLayer->paStylesAtZoomLevels[i]->nPixelOffsetX = (gint)atoi(pszValue);
}
}
else if(strcmp(pszName, "pixel-offset-y") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_nPixelOffsetY = (gint)atoi(pszValue);
+ pLayer->paStylesAtZoomLevels[i]->nPixelOffsetY = (gint)atoi(pszValue);
}
}
else if(strcmp(pszName, "color") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- util_parse_hex_color(pszValue, &(pLayer->m_paStylesAtZoomLevels[i]->m_clrPrimary));
+ util_parse_hex_color(pszValue, &(pLayer->paStylesAtZoomLevels[i]->clrPrimary));
}
}
else if(strcmp(pszName, "halo-size") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_fHaloSize = (gdouble)atof(pszValue);
+ pLayer->paStylesAtZoomLevels[i]->fHaloSize = (gdouble)atof(pszValue);
}
}
else if(strcmp(pszName, "dash-pattern") == 0) {
@@ -516,7 +512,7 @@
// layer should have its own copy
dashstyle_t* pNewDashStyle = NULL;
if(map_style_parse_dashstyle(pszValue, &pNewDashStyle)) {
- pLayer->m_paStylesAtZoomLevels[i]->m_pDashStyle = pNewDashStyle;
+ pLayer->paStylesAtZoomLevels[i]->pDashStyle = pNewDashStyle;
}
else {
g_warning("bad dash style '%s' (should look like \"5.0 3.5\"\n", pszValue);
@@ -527,40 +523,40 @@
else if(strcmp(pszName, "bold") == 0) {
gboolean bBold = (strcmp(pszValue, "yes") == 0);
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_bFontBold = bBold;
+ pLayer->paStylesAtZoomLevels[i]->bFontBold = bBold;
}
}
else if(strcmp(pszName, "halo-color") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- util_parse_hex_color(pszValue, &(pLayer->m_paStylesAtZoomLevels[i]->m_clrHalo));
+ util_parse_hex_color(pszValue, &(pLayer->paStylesAtZoomLevels[i]->clrHalo));
}
}
else if(strcmp(pszName, "font-size") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_fFontSize = (gdouble)atof(pszValue);
+ pLayer->paStylesAtZoomLevels[i]->fFontSize = (gdouble)atof(pszValue);
}
}
// else if(strcmp(pszName, "join-style") == 0) {
// for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
// if(strcmp(pszValue, "mitre") == 0) {
-// pLayer->m_paStylesAtZoomLevels[i]->m_nJoinStyle = CAIRO_LINE_JOIN_MITER;
+// pLayer->paStylesAtZoomLevels[i]->nJoinStyle = CAIRO_LINE_JOIN_MITER;
// }
// else if(strcmp(pszValue, "round") == 0) {
-// pLayer->m_paStylesAtZoomLevels[i]->m_nJoinStyle = CAIRO_LINE_JOIN_ROUND;
+// pLayer->paStylesAtZoomLevels[i]->nJoinStyle = CAIRO_LINE_JOIN_ROUND;
// }
// }
// }
else if(strcmp(pszName, "line-cap") == 0) {
if(strcmp(pszValue, "square") == 0) {
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_nCapStyle = MAP_CAP_STYLE_SQUARE;
+ pLayer->paStylesAtZoomLevels[i]->nCapStyle = MAP_CAP_STYLE_SQUARE;
}
}
else {
if(strcmp(pszValue, "round") != 0) { g_warning("bad value for line-cap found: '%s' (valid options are 'square' and 'round')\n", pszValue); }
for(i = nMinZoomLevel - 1; i < nMaxZoomLevel ; i++) {
- pLayer->m_paStylesAtZoomLevels[i]->m_nCapStyle = MAP_CAP_STYLE_ROUND;
+ pLayer->paStylesAtZoomLevels[i]->nCapStyle = MAP_CAP_STYLE_ROUND;
}
}
}
@@ -577,26 +573,26 @@
map_style_print_color(color_t* pColor)
{
g_assert(pColor != NULL);
- g_print("color: %3.2f, %3.2f, %3.2f, %3.2f\n", pColor->m_fRed, pColor->m_fGreen, pColor->m_fBlue, pColor->m_fAlpha);
+ g_print("color: %3.2f, %3.2f, %3.2f, %3.2f\n", pColor->fRed, pColor->fGreen, pColor->fBlue, pColor->fAlpha);
}
/*
- color_t m_clrPrimary; // Color used for polygon fill or line stroke
- gdouble m_fLineWidth;
+ color_t clrPrimary; // Color used for polygon fill or line stroke
+ gdouble fLineWidth;
- gint m_nJoinStyle;
- gint m_nCapStyle;
+ gint nJoinStyle;
+ gint nCapStyle;
- gint m_nDashStyle;
+ gint nDashStyle;
// XXX: switch to this:
- //dashstyle_t m_pDashStyle; // can be NULL
+ //dashstyle_t pDashStyle; // can be NULL
// Used just for text
- gdouble m_fFontSize;
- gboolean m_bBold;
- gdouble m_fHaloSize; // actually a stroke width
- color_t m_clrHalo;
+ gdouble fFontSize;
+ gboolean bBold;
+ gdouble fHaloSize; // actually a stroke width
+ color_t clrHalo;
*/
static void
@@ -607,12 +603,12 @@
int i;
for(i = 0 ; i < NUM_ZOOM_LEVELS ; i++) {
g_print("\nzoom level %d\n", i+1);
- maplayerstyle_t* pStyle = pLayer->m_paStylesAtZoomLevels[i];
+ maplayerstyle_t* pStyle = pLayer->paStylesAtZoomLevels[i];
- g_print(" line width: %f\n", pStyle->m_fLineWidth);
- g_print(" primary "); map_style_print_color(&(pStyle->m_clrPrimary));
- g_print(" join style: %d\n", pStyle->m_nJoinStyle);
- g_print(" cap style: %d\n", pStyle->m_nCapStyle);
- //g_print(" dash style: %d\n", pStyle->m_nDashStyle);
+ g_print(" line width: %f\n", pStyle->fLineWidth);
+ g_print(" primary "); map_style_print_color(&(pStyle->clrPrimary));
+ g_print(" join style: %d\n", pStyle->nJoinStyle);
+ g_print(" cap style: %d\n", pStyle->nCapStyle);
+ //g_print(" dash style: %d\n", pStyle->nDashStyle);
}
}
Index: map_style.h
===================================================================
RCS file: /cvs/cairo/roadster/src/map_style.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- map_style.h 14 Sep 2005 20:06:54 -0000 1.1
+++ map_style.h 25 Sep 2005 19:02:37 -0000 1.2
@@ -33,39 +33,39 @@
#include "map.h"
typedef struct dashstyle {
- gdouble* m_pafDashList; // the dashes, as an array of gdouble's (for Cairo)
- gint8* m_panDashList; // the dashes, as an array of gint8's (for GDK)
- gint m_nDashCount; // how many
+ gdouble* pafDashList; // the dashes, as an array of gdouble's (for Cairo)
+ gint8* panDashList; // the dashes, as an array of gint8's (for GDK)
+ gint nDashCount; // how many
} dashstyle_t;
// defines the look of a layer
typedef struct layerstyle {
- color_t m_clrPrimary; // Color used for polygon fill or line stroke
- gdouble m_fLineWidth;
+ color_t clrPrimary; // Color used for polygon fill or line stroke
+ gdouble fLineWidth;
- gint m_nJoinStyle;
- gint m_nCapStyle;
+ gint nJoinStyle;
+ gint nCapStyle;
- dashstyle_t* m_pDashStyle;
+ dashstyle_t* pDashStyle;
// XXX: switch to this:
- //dashstyle_t m_pDashStyle; // can be NULL
+ //dashstyle_t pDashStyle; // can be NULL
// Used just for text
- gdouble m_fFontSize;
- gboolean m_bFontBold;
- gdouble m_fHaloSize; // actually a stroke width
- color_t m_clrHalo;
- gint m_nPixelOffsetX;
- gint m_nPixelOffsetY;
+ gdouble fFontSize;
+ gboolean bFontBold;
+ gdouble fHaloSize; // actually a stroke width
+ color_t clrHalo;
+ gint nPixelOffsetX;
+ gint nPixelOffsetY;
} maplayerstyle_t;
typedef struct layer {
- gint m_nDataSource; // which data to use (lakes, roads...)
- gint m_nDrawType; // as lines, polygons, etc.
+ gint nDataSource; // which data to use (lakes, roads...)
+ gint nDrawType; // as lines, polygons, etc.
// A layer has a style for each zoomlevel
- maplayerstyle_t* m_paStylesAtZoomLevels[ NUM_ZOOM_LEVELS ];
+ maplayerstyle_t* paStylesAtZoomLevels[ NUM_ZOOM_LEVELS ];
} maplayer_t;
//extern layer_t * g_aLayers[NUM_LAYERS+1];
Index: point.c
===================================================================
RCS file: /cvs/cairo/roadster/src/point.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- point.c 24 Sep 2005 05:25:25 -0000 1.6
+++ point.c 25 Sep 2005 19:02:37 -0000 1.7
@@ -80,6 +80,6 @@
void point_debug_print(mappoint_t* pPoint)
{
- g_print("pt (%f, %f)\n", pPoint->m_fLatitude, pPoint->m_fLongitude);
+ g_print("pt (%f, %f)\n", pPoint->fLatitude, pPoint->fLongitude);
}
Index: pointstring.c
===================================================================
RCS file: /cvs/cairo/roadster/src/pointstring.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pointstring.c 28 Aug 2005 22:23:14 -0000 1.6
+++ pointstring.c 25 Sep 2005 19:02:37 -0000 1.7
@@ -65,7 +65,7 @@
#endif
if(pNew) {
// configure it
- pNew->m_pPointsArray = g_ptr_array_sized_new(2);
+ pNew->pPointsArray = g_ptr_array_sized_new(2);
*ppPointString = pNew;
return TRUE;
}
@@ -78,14 +78,14 @@
g_return_if_fail(pPointString != NULL);
int i;
- for(i = (pPointString->m_pPointsArray->len - 1) ; i>=0 ; i--) {
- mappoint_t* pPoint = g_ptr_array_remove_index_fast(pPointString->m_pPointsArray, i);
+ for(i = (pPointString->pPointsArray->len - 1) ; i>=0 ; i--) {
+ mappoint_t* pPoint = g_ptr_array_remove_index_fast(pPointString->pPointsArray, i);
point_free(pPoint);
}
- g_assert(pPointString->m_pPointsArray->len == 0);
+ g_assert(pPointString->pPointsArray->len == 0);
- g_ptr_array_free(pPointString->m_pPointsArray, TRUE);
- g_free(pPointString->m_pszName);
+ g_ptr_array_free(pPointString->pPointsArray, TRUE);
+ g_free(pPointString->pszName);
#ifdef USE_GFREELIST
g_free_list_free(g_pPointStringFreeList, pPointString);
@@ -102,14 +102,14 @@
memcpy(pNewPoint, pPoint, sizeof(mappoint_t));
- g_ptr_array_add(pPointString->m_pPointsArray, pNewPoint);
+ g_ptr_array_add(pPointString->pPointsArray, pNewPoint);
}
void pointstring_debug_print(pointstring_t* pPointString)
{
int i;
- for(i=0 ; i<pPointString->m_pPointsArray->len ; i++) {
- mappoint_t* pPoint = g_ptr_array_index(pPointString->m_pPointsArray, i);
- g_print("(%f, %f)", pPoint->m_fLatitude, pPoint->m_fLongitude);
+ for(i=0 ; i<pPointString->pPointsArray->len ; i++) {
+ mappoint_t* pPoint = g_ptr_array_index(pPointString->pPointsArray, i);
+ g_print("(%f, %f)", pPoint->fLatitude, pPoint->fLongitude);
}
}
Index: pointstring.h
===================================================================
RCS file: /cvs/cairo/roadster/src/pointstring.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pointstring.h 28 Feb 2005 03:25:23 -0000 1.2
+++ pointstring.h 25 Sep 2005 19:02:37 -0000 1.3
@@ -26,8 +26,8 @@
// holds points that form a road or polygon (park, etc.)
typedef struct {
- gchar* m_pszName;
- GPtrArray* m_pPointsArray;
+ gchar* pszName;
+ GPtrArray* pPointsArray;
} pointstring_t;
void pointstring_init(void);
Index: road.c
===================================================================
RCS file: /cvs/cairo/roadster/src/road.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- road.c 14 Sep 2005 20:06:54 -0000 1.6
+++ road.c 25 Sep 2005 19:02:37 -0000 1.7
@@ -43,7 +43,7 @@
road_t* pNew = g_free_list_alloc(g_pRoadFreeList);
memset(pNew, 0, sizeof(road_t));
- pNew->m_pPointsArray = g_ptr_array_new();
+ pNew->pPointsArray = g_ptr_array_new();
// return it
*ppReturnRoad = pNew;
@@ -55,21 +55,21 @@
g_return_if_fail(pRoad != NULL);
int i;
- for(i = (pRoad->m_pPointsArray->len - 1) ; i>=0 ; i--) {
- mappoint_t* pPoint = g_ptr_array_remove_index_fast(pRoad->m_pPointsArray, i);
+ for(i = (pRoad->pPointsArray->len - 1) ; i>=0 ; i--) {
+ mappoint_t* pPoint = g_ptr_array_remove_index_fast(pRoad->pPointsArray, i);
point_free(pPoint);
}
- g_assert(pRoad->m_pPointsArray->len == 0);
+ g_assert(pRoad->pPointsArray->len == 0);
- g_ptr_array_free(pRoad->m_pPointsArray, TRUE);
+ g_ptr_array_free(pRoad->pPointsArray, TRUE);
// give back to allocator
g_free_list_free(g_pRoadFreeList, pRoad);
}
struct {
- gchar* m_pszLong;
- gchar* m_pszShort;
+ gchar* pszLong;
+ gchar* pszShort;
} g_RoadNameSuffix[] = {
{"",""},
{"Road", "Rd"},
@@ -116,8 +116,8 @@
};
struct {
- gchar* m_pszName;
- gint m_nID;
+ gchar* pszName;
+ gint nID;
} g_RoadNameSuffixLookup[] = {
{"Rd", ROAD_SUFFIX_ROAD},
{"Road", ROAD_SUFFIX_ROAD},
@@ -238,10 +238,10 @@
{
if(nSuffixID >= ROAD_SUFFIX_FIRST && nSuffixID <= ROAD_SUFFIX_LAST) {
if(eSuffixLength == ROAD_SUFFIX_LENGTH_SHORT) {
- return g_RoadNameSuffix[nSuffixID].m_pszShort;
+ return g_RoadNameSuffix[nSuffixID].pszShort;
}
else {
- return g_RoadNameSuffix[nSuffixID].m_pszLong;
+ return g_RoadNameSuffix[nSuffixID].pszLong;
}
}
if(nSuffixID != ROAD_SUFFIX_NONE) return "???";
@@ -252,8 +252,8 @@
{
gint i;
for(i=0 ; i<G_N_ELEMENTS(g_RoadNameSuffixLookup) ; i++) {
- if(g_ascii_strcasecmp(pszSuffix, g_RoadNameSuffixLookup[i].m_pszName) == 0) {
- *pReturnSuffixID = g_RoadNameSuffixLookup[i].m_nID;
+ if(g_ascii_strcasecmp(pszSuffix, g_RoadNameSuffixLookup[i].pszName) == 0) {
+ *pReturnSuffixID = g_RoadNameSuffixLookup[i].nID;
return TRUE;
}
}
Index: road.h
===================================================================
RCS file: /cvs/cairo/roadster/src/road.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- road.h 28 Mar 2005 18:49:50 -0000 1.2
+++ road.h 25 Sep 2005 19:02:37 -0000 1.3
@@ -25,12 +25,12 @@
#define _ROAD_H_
typedef struct {
- GPtrArray* m_pPointsArray;
- gchar* m_pszName;
- gint m_nAddressLeftStart;
- gint m_nAddressLeftEnd;
- gint m_nAddressRightStart;
- gint m_nAddressRightEnd;
+ GPtrArray* pPointsArray;
+ gchar* pszName;
+ gint nAddressLeftStart;
+ gint nAddressLeftEnd;
+ gint nAddressRightStart;
+ gint nAddressRightEnd;
} road_t;
void road_init(void);
Index: scenemanager.c
===================================================================
RCS file: /cvs/cairo/roadster/src/scenemanager.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- scenemanager.c 14 Sep 2005 20:06:54 -0000 1.14
+++ scenemanager.c 25 Sep 2005 19:02:37 -0000 1.15
@@ -43,16 +43,16 @@
{
// create new scenemanager and return it
scenemanager_t* pNew = g_new0(scenemanager_t, 1);
- pNew->m_pLabelHash = g_hash_table_new(g_str_hash, g_str_equal);
- pNew->m_pTakenRegion = gdk_region_new();
+ pNew->pLabelHash = g_hash_table_new(g_str_hash, g_str_equal);
+ pNew->pTakenRegion = gdk_region_new();
*ppReturn = pNew;
}
// NOTE: must be called before any scenemanager_can_draw_* calls
void scenemanager_set_screen_dimensions(scenemanager_t* pSceneManager, gint nWindowWidth, gint nWindowHeight)
{
- pSceneManager->m_nWindowWidth = nWindowWidth;
- pSceneManager->m_nWindowHeight = nWindowHeight;
+ pSceneManager->nWindowWidth = nWindowWidth;
+ pSceneManager->nWindowHeight = nWindowHeight;
}
gboolean scenemanager_can_draw_label_at(scenemanager_t* pSceneManager, const gchar* pszLabel, GdkPoint* __unused_pScreenLocation, gint nFlags)
@@ -66,7 +66,7 @@
gpointer pKey, pValue;
// Can draw if it doesn't exist in table
- return (FALSE == g_hash_table_lookup_extended(pSceneManager->m_pLabelHash, pszLabel, &pKey, &pValue));
+ return (FALSE == g_hash_table_lookup_extended(pSceneManager->pLabelHash, pszLabel, &pKey, &pValue));
#else
return TRUE;
#endif
@@ -82,8 +82,8 @@
gint i;
for(i=0 ; i<nNumPoints ; i++) {
GdkPoint* pPoint = &pPoints[i];
- if(pPoint->x < 0 || pPoint->x > pSceneManager->m_nWindowWidth) return FALSE;
- if(pPoint->y < 0 || pPoint->y > pSceneManager->m_nWindowHeight) return FALSE;
+ if(pPoint->x < 0 || pPoint->x > pSceneManager->nWindowWidth) return FALSE;
+ if(pPoint->y < 0 || pPoint->y > pSceneManager->nWindowHeight) return FALSE;
}
// else go on to test below
}
@@ -93,11 +93,11 @@
gboolean bFound = FALSE;
for(i=0 ; i<nNumPoints ; i++) {
GdkPoint* pPoint = &pPoints[i];
- if(pPoint->x > 0 && pPoint->x < pSceneManager->m_nWindowWidth) {
+ if(pPoint->x > 0 && pPoint->x < pSceneManager->nWindowWidth) {
bFound = TRUE;
break;
}
- if(pPoint->y > 0 && pPoint->y < pSceneManager->m_nWindowHeight) {
+ if(pPoint->y > 0 && pPoint->y < pSceneManager->nWindowHeight) {
bFound = TRUE;
break;
}
@@ -111,7 +111,7 @@
//
GdkRegion* pNewRegion = gdk_region_polygon(pPoints, nNumPoints, GDK_WINDING_RULE);
- gdk_region_intersect(pNewRegion, pSceneManager->m_pTakenRegion); // sets pNewRegion to the intersection of itself and the 'taken region'
+ gdk_region_intersect(pNewRegion, pSceneManager->pTakenRegion); // sets pNewRegion to the intersection of itself and the 'taken region'
gboolean bOK = gdk_region_empty(pNewRegion); // it's ok to draw here if the intersection is empty
gdk_region_destroy(pNewRegion);
@@ -127,15 +127,15 @@
// basic rect1 contains rect2 test
if((pRect->x) <= 0) return FALSE;
if((pRect->y) <= 0) return FALSE;
- if((pRect->x + pRect->width) > pSceneManager->m_nWindowWidth) return FALSE;
- if((pRect->y + pRect->height) > pSceneManager->m_nWindowHeight) return FALSE;
+ if((pRect->x + pRect->width) > pSceneManager->nWindowWidth) return FALSE;
+ if((pRect->y + pRect->height) > pSceneManager->nWindowHeight) return FALSE;
}
else if(nFlags & SCENEMANAGER_FLAG_PARTLY_ON_SCREEN) {
// basic rect intersect test
if((pRect->x + pRect->width) <= 0) return FALSE;
if((pRect->y + pRect->height) <= 0) return FALSE;
- if((pRect->x) > pSceneManager->m_nWindowWidth) return FALSE;
- if((pRect->y) > pSceneManager->m_nWindowHeight) return FALSE;
+ if((pRect->x) > pSceneManager->nWindowWidth) return FALSE;
+ if((pRect->y) > pSceneManager->nWindowHeight) return FALSE;
}
//
@@ -143,7 +143,7 @@
//
GdkRegion* pNewRegion = gdk_region_rectangle(pRect);
- gdk_region_intersect(pNewRegion, pSceneManager->m_pTakenRegion); // sets pNewRegion to the intersection of itself and the 'taken region'
+ gdk_region_intersect(pNewRegion, pSceneManager->pTakenRegion); // sets pNewRegion to the intersection of itself and the 'taken region'
gboolean bOK = gdk_region_empty(pNewRegion); // it's ok to draw here if the intersection is empty
gdk_region_destroy(pNewRegion);
@@ -156,7 +156,7 @@
g_assert(pSceneManager != NULL);
// Just putting the label into the hash is enough
- g_hash_table_insert(pSceneManager->m_pLabelHash, pszLabel, NULL);
+ g_hash_table_insert(pSceneManager->pLabelHash, pszLabel, NULL);
#endif
}
@@ -164,14 +164,14 @@
{
// Create a GdkRegion from the given points and union it with the 'taken region'
GdkRegion* pNewRegion = gdk_region_polygon(pPoints, nNumPoints, GDK_WINDING_RULE);
- gdk_region_union(pSceneManager->m_pTakenRegion, pNewRegion);
+ gdk_region_union(pSceneManager->pTakenRegion, pNewRegion);
gdk_region_destroy(pNewRegion);
}
void scenemanager_claim_rectangle(scenemanager_t* pSceneManager, GdkRectangle* pRect)
{
// Add the area of the rectangle to the region
- gdk_region_union_with_rect(pSceneManager->m_pTakenRegion, pRect);
+ gdk_region_union_with_rect(pSceneManager->pTakenRegion, pRect);
}
void scenemanager_clear(scenemanager_t* pSceneManager)
@@ -179,10 +179,10 @@
g_assert(pSceneManager != NULL);
// destroy and recreate hash table (XXX: better way to clear it?)
- g_hash_table_destroy(pSceneManager->m_pLabelHash);
- pSceneManager->m_pLabelHash = g_hash_table_new(g_str_hash, g_str_equal);
+ g_hash_table_destroy(pSceneManager->pLabelHash);
+ pSceneManager->pLabelHash = g_hash_table_new(g_str_hash, g_str_equal);
// Empty the region (XXX: better way?)
- gdk_region_destroy(pSceneManager->m_pTakenRegion);
- pSceneManager->m_pTakenRegion = gdk_region_new();
+ gdk_region_destroy(pSceneManager->pTakenRegion);
+ pSceneManager->pTakenRegion = gdk_region_new();
}
Index: scenemanager.h
===================================================================
RCS file: /cvs/cairo/roadster/src/scenemanager.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scenemanager.h 31 Aug 2005 08:37:53 -0000 1.6
+++ scenemanager.h 25 Sep 2005 19:02:37 -0000 1.7
@@ -30,12 +30,12 @@
#define SCENEMANAGER_FLAG_PARTLY_ON_SCREEN (2)
typedef struct scenemanager {
- GdkRegion* m_pTakenRegion;
+ GdkRegion* pTakenRegion;
- gint m_nWindowWidth;
- gint m_nWindowHeight;
+ gint nWindowWidth;
+ gint nWindowHeight;
- GHashTable* m_pLabelHash;
+ GHashTable* pLabelHash;
} scenemanager_t;
void scenemanager_init(void);
Index: search.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- search.c 24 Sep 2005 05:25:25 -0000 1.7
+++ search.c 25 Sep 2005 19:02:37 -0000 1.8
@@ -35,7 +35,7 @@
#define SEARCH_RESULT_TYPE_GLYPH_HEIGHT 32
struct {
- glyph_t* m_apSearchResultTypeGlyphs[ NUM_SEARCH_RESULT_TYPES ]; // don't store pixbufs, store some custom glyph type
+ glyph_t* apSearchResultTypeGlyphs[ NUM_SEARCH_RESULT_TYPES ]; // don't store pixbufs, store some custom glyph type
} g_Search = {0};
// functions
@@ -44,20 +44,20 @@
{
g_assert(NUM_SEARCH_RESULT_TYPES == 5); // don't forget to add more here...
- g_Search.m_apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_ROAD] = glyph_load_at_size("search-result-type-road", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
- g_Search.m_apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_CITY] = glyph_load_at_size("search-result-type-city", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
- g_Search.m_apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_STATE] = glyph_load_at_size("search-result-type-state", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
- g_Search.m_apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_COUNTRY] = glyph_load_at_size("search-result-type-country", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
- g_Search.m_apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_LOCATION] = glyph_load_at_size("search-result-type-location", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
+ g_Search.apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_ROAD] = glyph_load_at_size("search-result-type-road", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
+ g_Search.apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_CITY] = glyph_load_at_size("search-result-type-city", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
+ g_Search.apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_STATE] = glyph_load_at_size("search-result-type-state", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
+ g_Search.apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_COUNTRY] = glyph_load_at_size("search-result-type-country", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
+ g_Search.apSearchResultTypeGlyphs[SEARCH_RESULT_TYPE_LOCATION] = glyph_load_at_size("search-result-type-location", SEARCH_RESULT_TYPE_GLYPH_WIDTH, SEARCH_RESULT_TYPE_GLYPH_HEIGHT);
}
glyph_t* search_glyph_for_search_result_type(ESearchResultType eType)
{
g_assert(eType >= 0);
g_assert(eType < NUM_SEARCH_RESULT_TYPES);
- g_assert(g_Search.m_apSearchResultTypeGlyphs[eType] != NULL);
+ g_assert(g_Search.apSearchResultTypeGlyphs[eType] != NULL);
- return g_Search.m_apSearchResultTypeGlyphs[eType];
+ return g_Search.apSearchResultTypeGlyphs[eType];
}
// functions common to all searches
Index: search_location.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search_location.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- search_location.c 24 Sep 2005 05:25:25 -0000 1.12
+++ search_location.c 25 Sep 2005 19:02:37 -0000 1.13
@@ -36,12 +36,12 @@
#define SEARCH_RESULT_COUNT_LIMIT (100)
//typedef struct {
-// mappoint_t m_ptCenter;
-// gdouble m_fRadiusInDegrees;
-// gint m_nLocationSetID;
-// gchar* m_pszCleanedSentence;
-// gchar** m_aWords;
-// gint m_nWordCount;
+// mappoint_t ptCenter;
+// gdouble fRadiusInDegrees;
+// gint nLocationSetID;
+// gchar* pszCleanedSentence;
+// gchar** aWords;
+// gint nWordCount;
//} locationsearch_t;
void search_location_on_words(gchar** aWords, gint nWordCount);
@@ -192,22 +192,22 @@
mappoint_t ptCenter;
map_get_centerpoint(&ptCenter);
- gdouble fDegrees = pLocationSearch->m_fRadiusInDegrees;
+ gdouble fDegrees = pLocationSearch->fRadiusInDegrees;
pszCoordinatesMatch = g_strdup_printf(
" AND MBRIntersects(GeomFromText('Polygon((%f %f,%f %f,%f %f,%f %f,%f %f))'), Coordinates)",
- ptCenter.m_fLatitude + fDegrees, ptCenter.m_fLongitude - fDegrees, // upper left
- ptCenter.m_fLatitude + fDegrees, ptCenter.m_fLongitude + fDegrees, // upper right
- ptCenter.m_fLatitude - fDegrees, ptCenter.m_fLongitude + fDegrees, // bottom right
- ptCenter.m_fLatitude - fDegrees, ptCenter.m_fLongitude - fDegrees, // bottom left
- ptCenter.m_fLatitude + fDegrees, ptCenter.m_fLongitude - fDegrees); // upper left again
+ ptCenter.fLatitude + fDegrees, ptCenter.fLongitude - fDegrees, // upper left
+ ptCenter.fLatitude + fDegrees, ptCenter.fLongitude + fDegrees, // upper right
+ ptCenter.fLatitude - fDegrees, ptCenter.fLongitude + fDegrees, // bottom right
+ ptCenter.fLatitude - fDegrees, ptCenter.fLongitude - fDegrees, // bottom left
+ ptCenter.fLatitude + fDegrees, ptCenter.fLongitude - fDegrees); // upper left again
} else {
pszCoordinatesMatch = g_strdup("");
}
// location set matching
gchar* pszLocationSetMatch = NULL;
- if(pLocationSearch->m_nLocationSetID != 0) {
- pszLocationSetMatch = g_strdup_printf(" AND LocationSetID=%d", pLocationSearch->m_nLocationSetID);
+ if(pLocationSearch->nLocationSetID != 0) {
+ pszLocationSetMatch = g_strdup_printf(" AND LocationSetID=%d", pLocationSearch->nLocationSetID);
}
else {
pszLocationSetMatch = g_strdup("");
@@ -216,8 +216,8 @@
// attribute value matching
gchar* pszAttributeNameJoin = NULL;
gchar* pszAttributeNameMatch = NULL;
- if(pLocationSearch->m_pszCleanedSentence[0] != '\0') {
- pszAttributeNameJoin = g_strdup_printf("LEFT JOIN LocationAttributeValue ON (LocationAttributeValue.LocationID=Location.ID AND MATCH(LocationAttributeValue.Value) AGAINST ('%s' IN BOOLEAN MODE))", pLocationSearch->m_pszCleanedSentence);
+ if(pLocationSearch->pszCleanedSentence[0] != '\0') {
+ pszAttributeNameJoin = g_strdup_printf("LEFT JOIN LocationAttributeValue ON (LocationAttributeValue.LocationID=Location.ID AND MATCH(LocationAttributeValue.Value) AGAINST ('%s' IN BOOLEAN MODE))", pLocationSearch->pszCleanedSentence);
pszAttributeNameMatch = g_strdup_printf("AND LocationAttributeValue.ID IS NOT NULL");
}
else {
Index: search_road.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search_road.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- search_road.c 24 Sep 2005 05:25:25 -0000 1.23
+++ search_road.c 25 Sep 2005 19:02:37 -0000 1.24
@@ -40,12 +40,12 @@
#define FORMAT_ROAD_RESULT_WITH_NUMBER ("%d %s %s\n%s")
typedef struct {
- gint m_nNumber; // house number eg. 51
- gchar* m_pszRoadName; // road name eg. "Washington"
- gint m_nCityID; //
- gint m_nStateID;
- gchar* m_pszZIPCode;
- gint m_nSuffixID; // a number representing eg. Ave
+ gint nNumber; // house number eg. 51
+ gchar* pszRoadName; // road name eg. "Washington"
+ gint nCityID; //
+ gint nStateID;
+ gchar* pszZIPCode;
+ gint nSuffixID; // a number representing eg. Ave
} roadsearch_t;
#define ROADSEARCH_NUMBER_NONE (-1)
@@ -104,9 +104,9 @@
gint nRemainingWordCount = nWordCount;
// Claim house number if present
- roadsearch.m_nNumber = ROADSEARCH_NUMBER_NONE;
+ roadsearch.nNumber = ROADSEARCH_NUMBER_NONE;
if(nRemainingWordCount >= 2) {
- if(search_address_number_atoi(aWords[iFirst], &roadsearch.m_nNumber)) {
+ if(search_address_number_atoi(aWords[iFirst], &roadsearch.nNumber)) {
iFirst++; // first word is TAKEN :)
nRemainingWordCount--;
}
@@ -115,7 +115,7 @@
// Claim zip code, if present
if(search_address_match_zipcode(aWords[iLast])) {
//g_print("matched ZIP %s\n", aWords[iLast]);
- roadsearch.m_pszZIPCode = aWords[iLast];
+ roadsearch.pszZIPCode = aWords[iLast];
iLast--; // last word taken
nRemainingWordCount--;
@@ -134,7 +134,7 @@
gchar* pszStateName = util_g_strjoinv_limit(" ", aWords, iLast-1, iLast);
//g_print("trying two-word state name '%s'\n", pszStateName);
- if(db_state_get_id(pszStateName, &roadsearch.m_nStateID)) {
+ if(db_state_get_id(pszStateName, &roadsearch.nStateID)) {
//g_print("matched state name!\n");
iLast -= 2; // last TWO words taken
nRemainingWordCount -= 2;
@@ -144,7 +144,7 @@
// try a one-word state name
if(bGotStateName == FALSE && nRemainingWordCount >= 2) {
//g_print("trying one-word state name '%s'\n", aWords[iLast]);
- if(db_state_get_id(aWords[iLast], &roadsearch.m_nStateID)) {
+ if(db_state_get_id(aWords[iLast], &roadsearch.nStateID)) {
//g_print("matched state name!\n");
iLast--; // last word taken
nRemainingWordCount--;
@@ -157,7 +157,7 @@
if(nRemainingWordCount > nCityNameLength) {
gchar* pszCityName = util_g_strjoinv_limit(" ", aWords, iLast - (nCityNameLength-1), iLast);
- if(db_city_get_id(pszCityName, roadsearch.m_nStateID, &roadsearch.m_nCityID)) {
+ if(db_city_get_id(pszCityName, roadsearch.nStateID, &roadsearch.nCityID)) {
iLast -= nCityNameLength; // several words taken :)
nRemainingWordCount -= nCityNameLength;
@@ -179,21 +179,21 @@
if(road_suffix_atoi(aWords[iLast], &nSuffixID)) {
// matched
- roadsearch.m_nSuffixID = nSuffixID;
+ roadsearch.nSuffixID = nSuffixID;
iLast--;
nRemainingWordCount--;
}
}
if(nRemainingWordCount > 0) {
- roadsearch.m_pszRoadName = util_g_strjoinv_limit(" ", aWords, iFirst, iLast);
+ roadsearch.pszRoadName = util_g_strjoinv_limit(" ", aWords, iFirst, iLast);
search_road_on_roadsearch_struct(&roadsearch);
}
else {
// oops, no street name
//g_print("no street name found in search\n");
}
- g_free(roadsearch.m_pszRoadName);
+ g_free(roadsearch.pszRoadName);
}
void search_road_on_roadsearch_struct(const roadsearch_t* pRoadSearch)
@@ -202,33 +202,33 @@
// Assemble the various optional clauses for the SQL statement
//
gchar* pszAddressClause;
- if(pRoadSearch->m_nNumber != ROADSEARCH_NUMBER_NONE) {
+ if(pRoadSearch->nNumber != ROADSEARCH_NUMBER_NONE) {
pszAddressClause = g_strdup_printf(
" AND ("
"(%d BETWEEN Road.AddressLeftStart AND Road.AddressLeftEnd)"
" OR (%d BETWEEN Road.AddressLeftEnd AND Road.AddressLeftStart)"
" OR (%d BETWEEN Road.AddressRightStart AND Road.AddressRightEnd)"
" OR (%d BETWEEN Road.AddressRightEnd AND Road.AddressRightStart)"
- ")", pRoadSearch->m_nNumber, pRoadSearch->m_nNumber,
- pRoadSearch->m_nNumber, pRoadSearch->m_nNumber);
+ ")", pRoadSearch->nNumber, pRoadSearch->nNumber,
+ pRoadSearch->nNumber, pRoadSearch->nNumber);
}
else {
pszAddressClause = g_strdup("");
}
gchar* pszSuffixClause;
- if(pRoadSearch->m_nSuffixID != ROAD_SUFFIX_NONE) {
+ if(pRoadSearch->nSuffixID != ROAD_SUFFIX_NONE) {
pszSuffixClause = g_strdup_printf(
" AND (RoadName.SuffixID = %d)",
- pRoadSearch->m_nSuffixID);
+ pRoadSearch->nSuffixID);
}
else {
pszSuffixClause = g_strdup("");
}
gchar* pszZIPClause;
- if(pRoadSearch->m_pszZIPCode != NULL) {
- gchar* pszSafeZIP = db_make_escaped_string(pRoadSearch->m_pszZIPCode);
+ if(pRoadSearch->pszZIPCode != NULL) {
+ gchar* pszSafeZIP = db_make_escaped_string(pRoadSearch->pszZIPCode);
pszZIPClause = g_strdup_printf(" AND (Road.ZIPCodeLeft='%s' OR Road.ZIPCodeRight='%s')", pszSafeZIP, pszSafeZIP);
db_free_escaped_string(pszSafeZIP);
}
@@ -237,16 +237,16 @@
}
gchar* pszCityClause;
- if(pRoadSearch->m_nCityID != 0) {
- pszCityClause = g_strdup_printf(" AND (Road.CityLeftID=%d OR Road.CityRightID=%d)", pRoadSearch->m_nCityID, pRoadSearch->m_nCityID);
+ if(pRoadSearch->nCityID != 0) {
+ pszCityClause = g_strdup_printf(" AND (Road.CityLeftID=%d OR Road.CityRightID=%d)", pRoadSearch->nCityID, pRoadSearch->nCityID);
}
else {
pszCityClause = g_strdup("");
}
gchar* pszStateClause;
- if(pRoadSearch->m_nStateID != 0) {
- pszStateClause = g_strdup_printf(" AND (CityLeft.StateID=%d OR CityRight.StateID=%d)", pRoadSearch->m_nStateID, pRoadSearch->m_nStateID);
+ if(pRoadSearch->nStateID != 0) {
+ pszStateClause = g_strdup_printf(" AND (CityLeft.StateID=%d OR CityRight.StateID=%d)", pRoadSearch->nStateID, pRoadSearch->nStateID);
}
else {
pszStateClause = g_strdup("");
@@ -254,15 +254,15 @@
// if doing a road search, only show 1 hit per road?
//~ gchar* pszGroupClause;
- //~ if(pRoadSearch->m_nSuffixID == ROAD_SUFFIX_NONE) {
+ //~ if(pRoadSearch->nSuffixID == ROAD_SUFFIX_NONE) {
//~ pszGroupClause = g_strdup("GROUP BY (RoadName.ID, RoadName.SuffixID)");
//~ }
//~ else {
//~ pszGroupClause = g_strdup("");
//~ }
- gchar* pszSafeRoadName = db_make_escaped_string(pRoadSearch->m_pszRoadName);
- //g_print("pRoadSearch->m_pszRoadName = %s, pszSafeRoadName = %s\n", pRoadSearch->m_pszRoadName, pszSafeRoadName);
+ gchar* pszSafeRoadName = db_make_escaped_string(pRoadSearch->pszRoadName);
+ //g_print("pRoadSearch->pszRoadName = %s, pszSafeRoadName = %s\n", pRoadSearch->pszRoadName, pszSafeRoadName);
// XXX: Should we use soundex()? (http://en.wikipedia.org/wiki/Soundex)
gchar* pszRoadNameCondition = g_strdup_printf("RoadName.Name='%s'", pszSafeRoadName);
@@ -341,9 +341,9 @@
pointstring_t* pPointString = NULL;
pointstring_alloc(&pPointString);
- db_parse_wkb_linestring(aRow[3], pPointString->m_pPointsArray, point_alloc);
+ db_parse_wkb_linestring(aRow[3], pPointString->pPointsArray, point_alloc);
- search_road_filter_result(aRow[1], pRoadSearch->m_nNumber, atoi(aRow[2]), atoi(aRow[4]), atoi(aRow[5]), atoi(aRow[6]), atoi(aRow[7]), aRow[8], aRow[9], aRow[10], aRow[11], aRow[12], aRow[13], pPointString);
+ search_road_filter_result(aRow[1], pRoadSearch->nNumber, atoi(aRow[2]), atoi(aRow[4]), atoi(aRow[5]), atoi(aRow[6]), atoi(aRow[7]), aRow[8], aRow[9], aRow[10], aRow[11], aRow[12], aRow[13], pPointString);
//g_print("%03d: Road.ID='%s' RoadName.Name='%s', Suffix=%s, L:%s-%s, R:%s-%s\n", nCount, aRow[0], aRow[1], aRow[3], aRow[4], aRow[5], aRow[6], aRow[7]);
pointstring_free(pPointString);
}
@@ -359,8 +359,8 @@
static gfloat point_calc_distance(mappoint_t* pA, mappoint_t* pB)
{
- gdouble fRise = pB->m_fLatitude - pA->m_fLatitude;
- gdouble fRun = pB->m_fLongitude - pA->m_fLongitude;
+ gdouble fRise = pB->fLatitude - pA->fLatitude;
+ gdouble fRun = pB->fLongitude - pA->fLongitude;
return sqrt((fRun*fRun) + (fRise*fRise));
}
@@ -375,7 +375,7 @@
static void pointstring_walk_percentage(pointstring_t* pPointString, gdouble fPercent, ERoadSide eRoadSide, mappoint_t* pReturnPoint)
{
gint i;
- if(pPointString->m_pPointsArray->len < 2) {
+ if(pPointString->pPointsArray->len < 2) {
g_assert_not_reached();
}
@@ -383,10 +383,10 @@
// count total distance
//
gfloat fTotalDistance = 0.0;
- mappoint_t* pPointA = g_ptr_array_index(pPointString->m_pPointsArray, 0);
+ mappoint_t* pPointA = g_ptr_array_index(pPointString->pPointsArray, 0);
mappoint_t* pPointB;
- for(i=1 ; i<pPointString->m_pPointsArray->len ; i++) {
- pPointB = g_ptr_array_index(pPointString->m_pPointsArray, 1);
+ for(i=1 ; i<pPointString->pPointsArray->len ; i++) {
+ pPointB = g_ptr_array_index(pPointString->pPointsArray, 1);
fTotalDistance += point_calc_distance(pPointA, pPointB);
@@ -396,24 +396,24 @@
gfloat fTargetDistance = (fTotalDistance * fPercent);
gfloat fRemainingDistance = fTargetDistance;
- pPointA = g_ptr_array_index(pPointString->m_pPointsArray, 0);
- for(i=1 ; i<pPointString->m_pPointsArray->len ; i++) {
- pPointB = g_ptr_array_index(pPointString->m_pPointsArray, 1);
+ pPointA = g_ptr_array_index(pPointString->pPointsArray, 0);
+ for(i=1 ; i<pPointString->pPointsArray->len ; i++) {
+ pPointB = g_ptr_array_index(pPointString->pPointsArray, 1);
gfloat fLineSegmentDistance = point_calc_distance(pPointA, pPointB);
- if(fRemainingDistance <= fLineSegmentDistance || (i == pPointString->m_pPointsArray->len-1)) {
+ if(fRemainingDistance <= fLineSegmentDistance || (i == pPointString->pPointsArray->len-1)) {
// this is the line segment we are looking for.
gfloat fPercentOfLine = (fRemainingDistance / fLineSegmentDistance);
if(fPercentOfLine > 1.0) fPercentOfLine = 1.0;
- gfloat fRise = (pPointB->m_fLatitude - pPointA->m_fLatitude);
- gfloat fRun = (pPointB->m_fLongitude - pPointA->m_fLongitude);
+ gfloat fRise = (pPointB->fLatitude - pPointA->fLatitude);
+ gfloat fRun = (pPointB->fLongitude - pPointA->fLongitude);
// Calculate the a point on the center of the line segment
// the right percent along the road
- pReturnPoint->m_fLongitude = pPointA->m_fLongitude + (fRun * fPercentOfLine);
- pReturnPoint->m_fLatitude = pPointA->m_fLatitude + (fRise * fPercentOfLine);
+ pReturnPoint->fLongitude = pPointA->fLongitude + (fRun * fPercentOfLine);
+ pReturnPoint->fLatitude = pPointA->fLatitude + (fRise * fPercentOfLine);
gdouble fPerpendicularNormalizedX = -fRise / fLineSegmentDistance;
gdouble fPerpendicularNormalizedY = fRun / fLineSegmentDistance;
@@ -423,13 +423,13 @@
}
else if(eRoadSide == ROADSIDE_LEFT) {
// g_print("MOVING LEFT\n");
- pReturnPoint->m_fLongitude += fPerpendicularNormalizedX * HIGHLIGHT_DISTANCE_FROM_ROAD;
- pReturnPoint->m_fLatitude += fPerpendicularNormalizedY * HIGHLIGHT_DISTANCE_FROM_ROAD;
+ pReturnPoint->fLongitude += fPerpendicularNormalizedX * HIGHLIGHT_DISTANCE_FROM_ROAD;
+ pReturnPoint->fLatitude += fPerpendicularNormalizedY * HIGHLIGHT_DISTANCE_FROM_ROAD;
}
else {
// g_print("MOVING RIGHT\n");
- pReturnPoint->m_fLongitude -= fPerpendicularNormalizedX * HIGHLIGHT_DISTANCE_FROM_ROAD;
- pReturnPoint->m_fLatitude -= fPerpendicularNormalizedY * HIGHLIGHT_DISTANCE_FROM_ROAD;
+ pReturnPoint->fLongitude -= fPerpendicularNormalizedX * HIGHLIGHT_DISTANCE_FROM_ROAD;
+ pReturnPoint->fLatitude -= fPerpendicularNormalizedY * HIGHLIGHT_DISTANCE_FROM_ROAD;
}
return;
}
Index: searchwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/searchwindow.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- searchwindow.c 24 Sep 2005 05:25:25 -0000 1.21
+++ searchwindow.c 25 Sep 2005 19:02:37 -0000 1.22
@@ -56,20 +56,20 @@
#define SEARCHWINDOW_INFO_FORMAT ("<span size='small'><i>%s</i></span>")
struct {
- GtkEntry* m_pSearchEntry; // search text box (on the toolbar)
- GtkButton* m_pSearchButton; // search button (on the toolbar)
+ GtkEntry* pSearchEntry; // search text box (on the toolbar)
+ GtkButton* pSearchButton; // search button (on the toolbar)
// results list (on the sidebar)
- GtkTreeView* m_pResultsTreeView;
- GtkTreeViewColumn* m_pResultsTreeViewGlyphColumn;
- GtkListStore* m_pResultsListStore;
+ GtkTreeView* pResultsTreeView;
+ GtkTreeViewColumn* pResultsTreeViewGlyphColumn;
+ GtkListStore* pResultsListStore;
- GHashTable* m_pResultsHashTable;
+ GHashTable* pResultsHashTable;
- GtkMenuItem* m_pNextSearchResultMenuItem;
- GtkMenuItem* m_pPreviousSearchResultMenuItem;
+ GtkMenuItem* pNextSearchResultMenuItem;
+ GtkMenuItem* pPreviousSearchResultMenuItem;
- gint m_nNumResults;
+ gint nNumResults;
} g_SearchWindow = {0};
static void searchwindow_on_resultslist_selection_changed(GtkTreeSelection *treeselection, gpointer user_data);
@@ -77,16 +77,16 @@
void searchwindow_init(GladeXML* pGladeXML)
{
- GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.m_pSearchEntry, GTK_ENTRY, "searchentry");
- GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.m_pSearchButton, GTK_BUTTON, "searchbutton");
- GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.m_pResultsTreeView, GTK_TREE_VIEW, "searchresultstreeview");
- GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.m_pNextSearchResultMenuItem, GTK_MENU_ITEM, "nextresultmenuitem");
- GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.m_pPreviousSearchResultMenuItem, GTK_MENU_ITEM, "previousresultmenuitem");
+ GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.pSearchEntry, GTK_ENTRY, "searchentry");
+ GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.pSearchButton, GTK_BUTTON, "searchbutton");
+ GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.pResultsTreeView, GTK_TREE_VIEW, "searchresultstreeview");
+ GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.pNextSearchResultMenuItem, GTK_MENU_ITEM, "nextresultmenuitem");
+ GLADE_LINK_WIDGET(pGladeXML, g_SearchWindow.pPreviousSearchResultMenuItem, GTK_MENU_ITEM, "previousresultmenuitem");
// create results tree view
- g_SearchWindow.m_pResultsListStore = gtk_list_store_new(8, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_INT, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_DOUBLE);
- gtk_tree_view_set_model(g_SearchWindow.m_pResultsTreeView, GTK_TREE_MODEL(g_SearchWindow.m_pResultsListStore));
-// gtk_tree_view_set_search_equal_func(g_SearchWindow.m_pResultsTreeView, util_treeview_match_all_words_callback, NULL, NULL);
+ g_SearchWindow.pResultsListStore = gtk_list_store_new(8, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_INT, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_DOUBLE);
+ gtk_tree_view_set_model(g_SearchWindow.pResultsTreeView, GTK_TREE_MODEL(g_SearchWindow.pResultsListStore));
+// gtk_tree_view_set_search_equal_func(g_SearchWindow.pResultsTreeView, util_treeview_match_all_words_callback, NULL, NULL);
GtkCellRenderer* pCellRenderer;
GtkTreeViewColumn* pColumn;
@@ -95,120 +95,111 @@
pCellRenderer = gtk_cell_renderer_pixbuf_new();
g_object_set(G_OBJECT(pCellRenderer), "xpad", 2, NULL);
pColumn = gtk_tree_view_column_new_with_attributes("", pCellRenderer, "pixbuf", RESULTLIST_COLUMN_PIXBUF, NULL);
- gtk_tree_view_append_column(g_SearchWindow.m_pResultsTreeView, pColumn);
+ gtk_tree_view_append_column(g_SearchWindow.pResultsTreeView, pColumn);
- g_SearchWindow.m_pResultsTreeViewGlyphColumn = pColumn;
+ g_SearchWindow.pResultsTreeViewGlyphColumn = pColumn;
// NEW COLUMN: "Name" (with a text renderer)
pCellRenderer = gtk_cell_renderer_text_new();
g_object_set(G_OBJECT(pCellRenderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
pColumn = gtk_tree_view_column_new_with_attributes("Road", pCellRenderer, "markup", RESULTLIST_COLUMN_NAME, NULL);
- gtk_tree_view_append_column(g_SearchWindow.m_pResultsTreeView, pColumn);
+ gtk_tree_view_append_column(g_SearchWindow.pResultsTreeView, pColumn);
// Attach handler for selection-changed signal
- GtkTreeSelection *pTreeSelection = gtk_tree_view_get_selection(g_SearchWindow.m_pResultsTreeView);
+ GtkTreeSelection *pTreeSelection = gtk_tree_view_get_selection(g_SearchWindow.pResultsTreeView);
g_signal_connect(G_OBJECT(pTreeSelection), "changed", (GtkSignalFunc)searchwindow_on_resultslist_selection_changed, NULL);
-
- // Add message to the list
- gchar* pszBuffer = g_strdup_printf(SEARCHWINDOW_INFO_FORMAT, "Type search words above.");
- searchwindow_set_message(pszBuffer);
- g_free(pszBuffer);
}
void searchwindow_clear_results(void)
{
// remove all search results from the list
- if(g_SearchWindow.m_pResultsListStore != NULL) {
- gtk_list_store_clear(g_SearchWindow.m_pResultsListStore);
+ if(g_SearchWindow.pResultsListStore != NULL) {
+ gtk_list_store_clear(g_SearchWindow.pResultsListStore);
}
- g_SearchWindow.m_nNumResults = 0;
+ g_SearchWindow.nNumResults = 0;
// Scroll window all the way left. (Vertical scroll is reset by emptying the list.)
- gtk_adjustment_set_value(gtk_tree_view_get_hadjustment(g_SearchWindow.m_pResultsTreeView), 0.0);
+ gtk_adjustment_set_value(gtk_tree_view_get_hadjustment(g_SearchWindow.pResultsTreeView), 0.0);
}
void searchwindow_set_message(gchar* pszMessage)
{
// Add a basic text message to the list, instead of a search result (eg. "no results")
GtkTreeIter iter;
- gtk_list_store_append(g_SearchWindow.m_pResultsListStore, &iter);
- gtk_list_store_set(g_SearchWindow.m_pResultsListStore, &iter,
+ gtk_list_store_append(g_SearchWindow.pResultsListStore, &iter);
+ gtk_list_store_set(g_SearchWindow.pResultsListStore, &iter,
RESULTLIST_COLUMN_NAME, pszMessage,
RESULTLIST_COLUMN_CLICKABLE, FALSE,
-1);
- g_object_set(G_OBJECT(g_SearchWindow.m_pResultsTreeViewGlyphColumn), "visible", FALSE, NULL);
+ g_object_set(G_OBJECT(g_SearchWindow.pResultsTreeViewGlyphColumn), "visible", FALSE, NULL);
}
// Begin a search
void searchwindow_on_findbutton_clicked(GtkWidget *pWidget, gpointer* p)
{
+ g_print("Searching...\n");
+
// NOTE: By setting the SEARCH button inactive, we prevent this code from becoming reentrant when
// we call GTK_PROCESS_MAINLOOP below.
- gtk_widget_set_sensitive(GTK_WIDGET(g_SearchWindow.m_pSearchButton), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(g_SearchWindow.pSearchButton), FALSE);
// XXX: make list unsorted (sorting once at the end is much faster than for each insert)
- //gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(g_SearchWindow.m_pResultsListStore), MAGIC_GTK_NO_SORT_COLUMN, GTK_SORT_ASCENDING);
+ //gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(g_SearchWindow.pResultsListStore), MAGIC_GTK_NO_SORT_COLUMN, GTK_SORT_ASCENDING);
searchwindow_clear_results();
- g_SearchWindow.m_pResultsHashTable = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+ g_SearchWindow.pResultsHashTable = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+
+ const gchar* pszSearch = gtk_entry_get_text(g_SearchWindow.pSearchEntry); // NOTE: do NOT free this pointer
- const gchar* pszSearch = gtk_entry_get_text(g_SearchWindow.m_pSearchEntry);
-
// ensure the search results are visible
mainwindow_sidebar_set_tab(SIDEBAR_TAB_SEARCH_RESULTS);
mainwindow_set_sidebox_visible(TRUE);
- if(pszSearch[0] == '\0') {
- gchar* pszBuffer = g_strdup_printf(SEARCHWINDOW_INFO_FORMAT, "Type search words above.");
- searchwindow_set_message(pszBuffer);
- g_free(pszBuffer);
- }
- else {
- gchar* pszBuffer = g_strdup_printf(SEARCHWINDOW_INFO_FORMAT, "Searching...");
- searchwindow_set_message(pszBuffer);
- g_free(pszBuffer);
+ gchar* pszBuffer = g_strdup_printf(SEARCHWINDOW_INFO_FORMAT, "Searching...");
+ searchwindow_set_message(pszBuffer);
+ g_free(pszBuffer);
- void* pBusy = mainwindow_set_busy();
+ void* pBusy = mainwindow_set_busy();
- // XXX: Set search entry to use its parent's busy cursor (why do we need to do this?)
- gdk_window_set_cursor(g_SearchWindow.m_pSearchEntry->text_area, NULL);
+ // XXX: Set search entry to use its parent's busy cursor (why do we need to do this?)
+ gdk_window_set_cursor(g_SearchWindow.pSearchEntry->text_area, NULL);
- // Let GTK update the treeview to show the message
- GTK_PROCESS_MAINLOOP; // see note above
+ // Let GTK update the treeview to show the message
+ GTK_PROCESS_MAINLOOP; // see note above
- // Start the search!
- search_all(pszSearch);
+ // Start the search!
+ search_all(pszSearch);
#ifdef ENABLE_SLEEP_DURING_SEARCH_HACK
- sleep(5); // good for seeing how the UI behaves during long searches
+ sleep(5); // good for seeing how the UI behaves during long searches
#endif
- mainwindow_set_not_busy(&pBusy);
+ mainwindow_set_not_busy(&pBusy);
- // HACK: Set a cursor for the private 'text_area' member of the search GtkEntry (otherwise it won't show busy cursor)
- GdkCursor* pCursor = gdk_cursor_new(GDK_XTERM);
- gdk_window_set_cursor(g_SearchWindow.m_pSearchEntry->text_area, pCursor);
+ // HACK: Set a cursor for the private 'text_area' member of the search GtkEntry (otherwise it won't show busy cursor)
+ GdkCursor* pCursor = gdk_cursor_new(GDK_XTERM);
+ gdk_window_set_cursor(g_SearchWindow.pSearchEntry->text_area, pCursor);
- if(g_SearchWindow.m_nNumResults == 0) {
- searchwindow_clear_results();
+ if(g_SearchWindow.nNumResults == 0) {
+ searchwindow_clear_results();
- // insert a "no results" message
- gchar* pszBuffer = g_strdup_printf(SEARCHWINDOW_INFO_FORMAT, "No search results.");
- searchwindow_set_message(pszBuffer);
- g_free(pszBuffer);
- }
- else {
- // Show icon column
- g_object_set(G_OBJECT(g_SearchWindow.m_pResultsTreeViewGlyphColumn), "visible", TRUE, NULL);
+ // insert a "no results" message
+ gchar* pszBuffer = g_strdup_printf(SEARCHWINDOW_INFO_FORMAT, "No search results.");
+ searchwindow_set_message(pszBuffer);
+ g_free(pszBuffer);
+ }
+ else {
+ // Show icon column
+ g_object_set(G_OBJECT(g_SearchWindow.pResultsTreeViewGlyphColumn), "visible", TRUE, NULL);
- // Sort the list
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(g_SearchWindow.m_pResultsListStore), RESULTLIST_COLUMN_SORT, GTK_SORT_ASCENDING);
- }
+ // Sort the list
+ gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(g_SearchWindow.pResultsListStore), RESULTLIST_COLUMN_SORT, GTK_SORT_ASCENDING);
}
- g_hash_table_destroy(g_SearchWindow.m_pResultsHashTable);
- gtk_widget_set_sensitive(GTK_WIDGET(g_SearchWindow.m_pSearchButton), TRUE);
+ g_hash_table_destroy(g_SearchWindow.pResultsHashTable);
+
+ //gtk_widget_set_sensitive(GTK_WIDGET(g_SearchWindow.pSearchButton), TRUE);
}
// add a result row to the list
@@ -216,16 +207,21 @@
{
GtkTreeIter iter;
- if(g_SearchWindow.m_nNumResults == 0) {
+ if(g_SearchWindow.nNumResults == 0) {
// Clear any messages
searchwindow_clear_results();
}
- if(g_hash_table_lookup(g_SearchWindow.m_pResultsHashTable, pszText)) {
+ if(!g_utf8_validate(pszText, -1, NULL)) {
+ g_warning("Search result not UTF-8: '%s'\n", pszText);
+ return;
+ }
+
+ if(g_hash_table_lookup(g_SearchWindow.pResultsHashTable, pszText)) {
// duplicate found
return;
}
- g_hash_table_insert(g_SearchWindow.m_pResultsHashTable, g_strdup(pszText), (gpointer)TRUE);
+ g_hash_table_insert(g_SearchWindow.pResultsHashTable, g_strdup(pszText), (gpointer)TRUE);
mappoint_t ptCenter;
mainwindow_get_centerpoint(&ptCenter);
@@ -237,26 +233,18 @@
// g_print("distance=%f, string='%s', sort=%f\n", fDistance, pszTmp, fSort);
g_free(pszTmp);
- gchar* pszBuffer = NULL;
- if(g_utf8_validate(pszText, -1, NULL)) {
- //pszBuffer = g_markup_printf_escaped(SEARCHWINDOW_RESULT_FORMAT, pszText);
- pszBuffer = g_strdup_printf(SEARCHWINDOW_RESULT_FORMAT, pszText);
- }
- else {
- g_warning("Search result not UTF-8: '%s'\n", pszText);
- pszBuffer = g_strdup_printf(SEARCHWINDOW_RESULT_FORMAT, "<i>Invalid Name</i>");
- }
+ gchar* pszBuffer = g_strdup_printf(SEARCHWINDOW_RESULT_FORMAT, pszText);
glyph_t* pGlyph = search_glyph_for_search_result_type(eResultType);
g_assert(pGlyph != NULL);
GdkPixbuf* pRowPixbuf = glyph_get_pixbuf(pGlyph);
g_assert(pRowPixbuf != NULL);
- gtk_list_store_append(g_SearchWindow.m_pResultsListStore, &iter);
- gtk_list_store_set(g_SearchWindow.m_pResultsListStore, &iter,
+ gtk_list_store_append(g_SearchWindow.pResultsListStore, &iter);
+ gtk_list_store_set(g_SearchWindow.pResultsListStore, &iter,
RESULTLIST_COLUMN_NAME, pszBuffer,
- RESULTLIST_COLUMN_LATITUDE, pPoint->m_fLatitude,
- RESULTLIST_COLUMN_LONGITUDE, pPoint->m_fLongitude,
+ RESULTLIST_COLUMN_LATITUDE, pPoint->fLatitude,
+ RESULTLIST_COLUMN_LONGITUDE, pPoint->fLongitude,
RESULTLIST_COLUMN_DISTANCE, fDistance,
RESULTLIST_COLUMN_ZOOMLEVEL, nZoomLevel,
RESULTLIST_COLUMN_CLICKABLE, TRUE,
@@ -266,22 +254,22 @@
g_free(pszBuffer);
- g_SearchWindow.m_nNumResults++;
+ g_SearchWindow.nNumResults++;
}
static void searchwindow_go_to_selected_result(void)
{
- GtkTreeSelection* pSelection = gtk_tree_view_get_selection(g_SearchWindow.m_pResultsTreeView);
+ GtkTreeSelection* pSelection = gtk_tree_view_get_selection(g_SearchWindow.pResultsTreeView);
GtkTreeIter iter;
- GtkTreeModel* pModel = GTK_TREE_MODEL(g_SearchWindow.m_pResultsListStore);
+ GtkTreeModel* pModel = GTK_TREE_MODEL(g_SearchWindow.pResultsListStore);
if(gtk_tree_selection_get_selected(pSelection, &pModel, &iter)) {
mappoint_t pt;
gint nZoomLevel;
gboolean bClickable;
- gtk_tree_model_get(GTK_TREE_MODEL(g_SearchWindow.m_pResultsListStore), &iter,
- RESULTLIST_COLUMN_LATITUDE, &pt.m_fLatitude,
- RESULTLIST_COLUMN_LONGITUDE, &pt.m_fLongitude,
+ gtk_tree_model_get(GTK_TREE_MODEL(g_SearchWindow.pResultsListStore), &iter,
+ RESULTLIST_COLUMN_LATITUDE, &pt.fLatitude,
+ RESULTLIST_COLUMN_LONGITUDE, &pt.fLongitude,
RESULTLIST_COLUMN_ZOOMLEVEL, &nZoomLevel,
RESULTLIST_COLUMN_CLICKABLE, &bClickable,
-1);
@@ -299,11 +287,6 @@
}
}
-// void searchwindow_on_addressresultstreeview_row_activated(GtkWidget *pWidget, gpointer* p)
-// {
-// searchwindow_go_to_selected_result();
-// }
-
void searchwindow_on_resultslist_row_activated(GtkWidget *pWidget, gpointer* p)
{
// XXX: Double-click on a search result. Do we want to support this?
@@ -318,10 +301,28 @@
void searchwindow_on_nextresultbutton_clicked(GtkWidget *pWidget, gpointer* p)
{
- util_gtk_tree_view_select_next(g_SearchWindow.m_pResultsTreeView);
+ util_gtk_tree_view_select_next(g_SearchWindow.pResultsTreeView);
}
void searchwindow_on_previousresultbutton_clicked(GtkWidget *pWidget, gpointer* p)
{
- util_gtk_tree_view_select_previous(g_SearchWindow.m_pResultsTreeView);
+ util_gtk_tree_view_select_previous(g_SearchWindow.pResultsTreeView);
}
+
+void searchwindow_on_searchentry_changed(GtkWidget *pWidget, gpointer* p)
+{
+ // Clear results when search entry changes
+ searchwindow_clear_results();
+
+ // Set a message
+ const gchar* pszSearch = gtk_entry_get_text(g_SearchWindow.pSearchEntry); // NOTE: do NOT free this pointer
+ if(pszSearch[0] != '\0') {
+ gchar* pszBuffer = g_strdup_printf(SEARCHWINDOW_INFO_FORMAT, "Hit <b>Enter</b> to search.");
+ searchwindow_set_message(pszBuffer);
+ g_free(pszBuffer);
+ }
+
+ // just make sure
+ gtk_widget_set_sensitive(GTK_WIDGET(g_SearchWindow.pSearchButton), TRUE);
+}
+
Index: tooltip.c
===================================================================
RCS file: /cvs/cairo/roadster/src/tooltip.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tooltip.c 28 Aug 2005 22:23:14 -0000 1.4
+++ tooltip.c 25 Sep 2005 19:02:37 -0000 1.5
@@ -38,52 +38,52 @@
tooltip_t* pNew = g_new0(tooltip_t, 1);
// create tooltip window
- pNew->m_pWindow = GTK_WINDOW(gtk_window_new(GTK_WINDOW_POPUP));
- //gtk_widget_set_name(GTK_WIDGET(pNew->m_pWindow), "gtk-tooltips");
- gtk_widget_add_events(GTK_WIDGET(pNew->m_pWindow), GDK_POINTER_MOTION_MASK | GDK_EXPOSURE_MASK);
- g_signal_connect(G_OBJECT(pNew->m_pWindow), "motion_notify_event", G_CALLBACK(tooltip_on_mouse_motion), NULL);
- gtk_window_set_resizable(pNew->m_pWindow, FALSE); // FALSE means window will resize to hug the label.
+ pNew->pWindow = GTK_WINDOW(gtk_window_new(GTK_WINDOW_POPUP));
+ //gtk_widget_set_name(GTK_WIDGET(pNew->pWindow), "gtk-tooltips");
+ gtk_widget_add_events(GTK_WIDGET(pNew->pWindow), GDK_POINTER_MOTION_MASK | GDK_EXPOSURE_MASK);
+ g_signal_connect(G_OBJECT(pNew->pWindow), "motion_notify_event", G_CALLBACK(tooltip_on_mouse_motion), NULL);
+ gtk_window_set_resizable(pNew->pWindow, FALSE); // FALSE means window will resize to hug the label.
// create frame (draws the nice outline for us) and add to window (we don't need to keep a pointer to this)
GtkFrame* pFrame = GTK_FRAME(gtk_frame_new(NULL));
gtk_frame_set_shadow_type(pFrame, GTK_SHADOW_IN);
- gtk_container_add(GTK_CONTAINER(pNew->m_pWindow), GTK_WIDGET(pFrame));
+ gtk_container_add(GTK_CONTAINER(pNew->pWindow), GTK_WIDGET(pFrame));
// create label and add to frame
- pNew->m_pLabel = GTK_LABEL(gtk_label_new("testing"));
- gtk_container_add(GTK_CONTAINER(pFrame), GTK_WIDGET(pNew->m_pLabel));
+ pNew->pLabel = GTK_LABEL(gtk_label_new("testing"));
+ gtk_container_add(GTK_CONTAINER(pFrame), GTK_WIDGET(pNew->pLabel));
- pNew->m_bEnabled = TRUE; // XXX: currently no API to disable it
+ pNew->bEnabled = TRUE; // XXX: currently no API to disable it
return pNew;
}
void tooltip_set_markup(tooltip_t* pTooltip, const gchar* pszMarkup)
{
- gtk_label_set_markup(pTooltip->m_pLabel, pszMarkup);
+ gtk_label_set_markup(pTooltip->pLabel, pszMarkup);
}
void tooltip_set_bg_color(tooltip_t* pTooltip, GdkColor* pColor)
{
- gtk_widget_modify_bg(GTK_WIDGET(pTooltip->m_pWindow), GTK_STATE_NORMAL, pColor);
+ gtk_widget_modify_bg(GTK_WIDGET(pTooltip->pWindow), GTK_STATE_NORMAL, pColor);
}
void tooltip_set_upper_left_corner(tooltip_t* pTooltip, gint nX, gint nY)
{
- gtk_window_move(pTooltip->m_pWindow, nX, nY);
+ gtk_window_move(pTooltip->pWindow, nX, nY);
}
void tooltip_show(tooltip_t* pTooltip)
{
- if(pTooltip->m_bEnabled) {
- gtk_widget_show_all(GTK_WIDGET(pTooltip->m_pWindow));
+ if(pTooltip->bEnabled) {
+ gtk_widget_show_all(GTK_WIDGET(pTooltip->pWindow));
}
}
void tooltip_hide(tooltip_t* pTooltip)
{
- gtk_widget_hide(GTK_WIDGET(pTooltip->m_pWindow));
+ gtk_widget_hide(GTK_WIDGET(pTooltip->pWindow));
}
static gboolean tooltip_on_mouse_motion(GtkWidget* pWidget, GdkEventMotion *__unused)
Index: tooltip.h
===================================================================
RCS file: /cvs/cairo/roadster/src/tooltip.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tooltip.h 29 Mar 2005 09:16:20 -0000 1.2
+++ tooltip.h 25 Sep 2005 19:02:37 -0000 1.3
@@ -25,10 +25,10 @@
#define _TOOLTIP_H
typedef struct {
- GtkWindow* m_pWindow;
- GtkLabel* m_pLabel;
+ GtkWindow* pWindow;
+ GtkLabel* pLabel;
- gboolean m_bEnabled;
+ gboolean bEnabled;
} tooltip_t;
void tooltip_init();
Index: track.c
===================================================================
RCS file: /cvs/cairo/roadster/src/track.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- track.c 28 Mar 2005 18:49:50 -0000 1.6
+++ track.c 25 Sep 2005 19:02:37 -0000 1.7
@@ -32,18 +32,18 @@
#endif
typedef struct track {
- pointstring_t* m_pPointString;
- gint m_nID;
+ pointstring_t* pPointString;
+ gint nID;
} track_t;
struct {
- GHashTable* m_pTracksHash;
+ GHashTable* pTracksHash;
GMemChunk* g_pTrackChunkAllocator;
} g_Tracks;
void track_init(void)
{
- g_Tracks.m_pTracksHash = g_hash_table_new(g_int_hash, g_int_equal);
+ g_Tracks.pTracksHash = g_hash_table_new(g_int_hash, g_int_equal);
g_Tracks.g_pTrackChunkAllocator = g_mem_chunk_new("ROADSTER tracks",
sizeof(track_t), 1000, G_ALLOC_AND_FREE);
g_return_if_fail(g_Tracks.g_pTrackChunkAllocator != NULL);
@@ -56,11 +56,11 @@
// allocate structure for it
track_t* pNew = g_mem_chunk_alloc0(g_Tracks.g_pTrackChunkAllocator);
- pNew->m_nID = nID;
- pointstring_alloc(&pNew->m_pPointString);
+ pNew->nID = nID;
+ pointstring_alloc(&pNew->pPointString);
// save in hash for fast lookups
- g_hash_table_insert(g_Tracks.m_pTracksHash, &pNew->m_nID, pNew);
+ g_hash_table_insert(g_Tracks.pTracksHash, &pNew->nID, pNew);
return nID;
}
@@ -69,7 +69,7 @@
{
// g_print("adding point to track %d\n", nTrackID);
- track_t* pTrack = g_hash_table_lookup(g_Tracks.m_pTracksHash, &nTrackID);
+ track_t* pTrack = g_hash_table_lookup(g_Tracks.pTracksHash, &nTrackID);
if(pTrack == NULL) {
// lookup in DB?
@@ -77,14 +77,14 @@
return;
}
- pointstring_append_point(pTrack->m_pPointString, pPoint);
+ pointstring_append_point(pTrack->pPointString, pPoint);
}
const pointstring_t* track_get_pointstring(gint nID)
{
- track_t* pTrack = g_hash_table_lookup(g_Tracks.m_pTracksHash, &nID);
+ track_t* pTrack = g_hash_table_lookup(g_Tracks.pTracksHash, &nID);
if(pTrack != NULL) {
- return pTrack->m_pPointString;
+ return pTrack->pPointString;
}
return NULL;
}
Index: util.c
===================================================================
RCS file: /cvs/cairo/roadster/src/util.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- util.c 24 Sep 2005 05:25:25 -0000 1.11
+++ util.c 25 Sep 2005 19:02:37 -0000 1.12
@@ -189,23 +189,23 @@
gchar azBuffer[3] = {0,0,0};
azBuffer[0] = *p++; azBuffer[1] = *p++;
- pReturnColor->m_fRed = (gfloat)strtol(azBuffer, NULL, 16)/255.0;
+ pReturnColor->fRed = (gfloat)strtol(azBuffer, NULL, 16)/255.0;
azBuffer[0] = *p++; azBuffer[1] = *p++;
- pReturnColor->m_fGreen = (gfloat)strtol(azBuffer, NULL, 16)/255.0;
+ pReturnColor->fGreen = (gfloat)strtol(azBuffer, NULL, 16)/255.0;
azBuffer[0] = *p++; azBuffer[1] = *p++;
- pReturnColor->m_fBlue = (gfloat)strtol(azBuffer, NULL, 16)/255.0;
+ pReturnColor->fBlue = (gfloat)strtol(azBuffer, NULL, 16)/255.0;
azBuffer[0] = *p++; azBuffer[1] = *p++;
- pReturnColor->m_fAlpha = (gfloat)strtol(azBuffer, NULL, 16)/255.0;
+ pReturnColor->fAlpha = (gfloat)strtol(azBuffer, NULL, 16)/255.0;
}
void util_random_color(void* p)
{
color_t* pColor = (color_t*)p;
- pColor->m_fRed = (random()%1000)/1000.0;
- pColor->m_fGreen = (random()%1000)/1000.0;
- pColor->m_fBlue = (random()%1000)/1000.0;
- pColor->m_fAlpha = 1.0;
+ pColor->fRed = (random()%1000)/1000.0;
+ pColor->fGreen = (random()%1000)/1000.0;
+ pColor->fBlue = (random()%1000)/1000.0;
+ pColor->fAlpha = 1.0;
}
//
@@ -383,10 +383,10 @@
gboolean bFound = FALSE;
gint i;
for(i=0 ; i<nNumReplacements ; i++) {
- //g_print("comparing %s and %s\n", pszSourceWalker, aReplacements[i].m_pszOld);
- if(strncmp(pszSourceWalker, aReplacements[i].m_pszOld, strlen(aReplacements[i].m_pszOld)) == 0) {
- pStringBuffer = g_string_append(pStringBuffer, aReplacements[i].m_pszNew);
- pszSourceWalker += strlen(aReplacements[i].m_pszOld);
+ //g_print("comparing %s and %s\n", pszSourceWalker, aReplacements[i].pszOld);
+ if(strncmp(pszSourceWalker, aReplacements[i].pszFind, strlen(aReplacements[i].pszFind)) == 0) {
+ pStringBuffer = g_string_append(pStringBuffer, aReplacements[i].pszReplace);
+ pszSourceWalker += strlen(aReplacements[i].pszFind);
bFound = TRUE;
break;
}
Index: util.h
===================================================================
RCS file: /cvs/cairo/roadster/src/util.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- util.h 24 Sep 2005 05:25:25 -0000 1.11
+++ util.h 25 Sep 2005 19:02:37 -0000 1.12
@@ -67,8 +67,8 @@
gchar* util_g_strjoinv_limit(const gchar* separator, gchar** a, gint iFirst, gint iLast);
typedef struct {
- gchar* m_pszOld;
- gchar* m_pszNew;
+ gchar* pszFind;
+ gchar* pszReplace;
} util_str_replace_t;
gchar* util_str_replace_many(const gchar* pszSource, util_str_replace_t* aReplacements, gint nNumReplacements);
Index: welcomewindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/welcomewindow.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- welcomewindow.c 24 Sep 2005 05:25:25 -0000 1.7
+++ welcomewindow.c 25 Sep 2005 19:02:37 -0000 1.8
@@ -36,23 +36,23 @@
#define URL_CENSUS_GOV_TIGER_DATA_WEBSITE ("http://www.census.gov/geo/www/tiger/tiger2004se/tgr2004se.html")
struct {
- GtkWindow* m_pWindow;
+ GtkWindow* pWindow;
} g_WelcomeWindow;
void welcomewindow_init(GladeXML* pGladeXML)
{
- g_WelcomeWindow.m_pWindow = GTK_WINDOW(glade_xml_get_widget(pGladeXML, "welcomewindow")); g_return_if_fail(g_WelcomeWindow.m_pWindow != NULL);
+ g_WelcomeWindow.pWindow = GTK_WINDOW(glade_xml_get_widget(pGladeXML, "welcomewindow")); g_return_if_fail(g_WelcomeWindow.pWindow != NULL);
}
void welcomewindow_show(void)
{
- gtk_widget_show(GTK_WIDGET(g_WelcomeWindow.m_pWindow));
- gtk_window_present(g_WelcomeWindow.m_pWindow);
+ gtk_widget_show(GTK_WIDGET(g_WelcomeWindow.pWindow));
+ gtk_window_present(g_WelcomeWindow.pWindow);
}
static void welcomewindow_hide(void)
{
- gtk_widget_hide(GTK_WIDGET(g_WelcomeWindow.m_pWindow));
+ gtk_widget_hide(GTK_WIDGET(g_WelcomeWindow.pWindow));
}
/* Callbacks */
More information about the cairo-commit
mailing list