Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Ehud S. <esh...@us...> - 2006-05-02 13:02:25
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32552 Modified Files: Roadmap.vcw Log Message: Update evc project files. Index: Roadmap.vcw =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap.vcw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Roadmap.vcw 29 Apr 2006 14:54:59 -0000 1.4 --- Roadmap.vcw 2 May 2006 13:02:11 -0000 1.5 *************** *** 13,20 **** {{{ Begin Project Dependency ! Project_Dep_Name libosroadmap End Project Dependency Begin Project Dependency ! Project_Dep_Name libroadmap End Project Dependency }}} --- 13,20 ---- {{{ Begin Project Dependency ! Project_Dep_Name libroadmap End Project Dependency Begin Project Dependency ! Project_Dep_Name libosroadmap End Project Dependency }}} |
|
From: Ehud S. <esh...@us...> - 2006-05-02 13:02:25
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg23 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32552/agg23 Modified Files: agg23.vcp Log Message: Update evc project files. Index: agg23.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg23/agg23.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** agg23.vcp 29 Apr 2006 10:53:08 -0000 1.2 --- agg23.vcp 2 May 2006 13:02:12 -0000 1.3 *************** *** 255,258 **** --- 255,259 ---- "..\..\..\agg23\include\agg_font_cache_manager.h"\ "..\..\..\agg23\include\agg_gamma_functions.h"\ + "..\..\..\agg23\include\agg_image_filters.h"\ "..\..\..\agg23\include\agg_line_aa_basics.h"\ "..\..\..\agg23\include\agg_math.h"\ *************** *** 276,279 **** --- 277,285 ---- "..\..\..\agg23\include\agg_scanline_storage_bin.h"\ "..\..\..\agg23\include\agg_scanline_u.h"\ + "..\..\..\agg23\include\agg_span_allocator.h"\ + "..\..\..\agg23\include\agg_span_generator.h"\ + "..\..\..\agg23\include\agg_span_image_filter.h"\ + "..\..\..\agg23\include\agg_span_image_filter_rgb.h"\ + "..\..\..\agg23\include\agg_span_interpolator_linear.h"\ "..\..\..\agg23\include\agg_trans_affine.h"\ "..\..\..\agg23\include\agg_vcgen_contour.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-05-02 13:02:21
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libosroadmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32552/libosroadmap Modified Files: libosroadmap.vcp Log Message: Update evc project files. Index: libosroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libosroadmap/libosroadmap.vcp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** libosroadmap.vcp 23 Apr 2006 13:32:25 -0000 1.3 --- libosroadmap.vcp 2 May 2006 13:02:12 -0000 1.4 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c - # ADD CPP /nologo /W3 /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE ARM) Debug" --- 51,63 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c + # ADD CPP /nologo /W3 /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE ARM) Debug" *************** *** 77,89 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c - # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE x86) Release" --- 77,89 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c + # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE x86) Release" *************** *** 233,236 **** --- 233,277 ---- # Begin Source File + SOURCE=..\..\listports.c + + !IF "$(CFG)" == "libosroadmap - Win32 (WCE ARM) Release" + + !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE ARM) Debug" + + !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE x86) Release" + + DEP_CPP_LISTP=\ + "..\..\listports.h"\ + + + !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE x86) Debug" + + DEP_CPP_LISTP=\ + "..\..\listports.h"\ + + + !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE ARMV4) Debug" + + DEP_CPP_LISTP=\ + "..\..\listports.h"\ + + + !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE ARMV4) Release" + + DEP_CPP_LISTP=\ + "..\..\listports.h"\ + + + !ELSEIF "$(CFG)" == "libosroadmap - Win32 (WCE ARMV4) Profiler" + + DEP_CPP_LISTP=\ + "..\..\listports.h"\ + + + !ENDIF + + # End Source File + # Begin Source File + SOURCE=..\..\..\win32\roadmap_file.c *************** *** 578,581 **** --- 619,623 ---- "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_types.h"\ + "..\..\listports.h"\ "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-05-02 13:01:43
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg23 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31961 Modified Files: roadmap_canvas.cpp Log Message: Remove contour module. Index: roadmap_canvas.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg23/roadmap_canvas.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_canvas.cpp 2 May 2006 12:50:32 -0000 1.2 --- roadmap_canvas.cpp 2 May 2006 13:01:26 -0000 1.3 *************** *** 602,609 **** //stroke(fill); ! agg::conv_contour<agg::conv_transform<font_manager_type::path_adaptor_type> >contour(tr); ! contour.width(2); ! agg::conv_stroke< agg::conv_contour<agg::conv_transform<font_manager_type::path_adaptor_type> > > stroke(contour); //agg::conv_stroke< agg::conv_transform<font_manager_type::path_adaptor_type> > stroke(tr); --- 602,609 ---- //stroke(fill); ! //agg::conv_contour<agg::conv_transform<font_manager_type::path_adaptor_type> >contour(tr); ! //contour.width(2); ! //agg::conv_stroke< agg::conv_contour<agg::conv_transform<font_manager_type::path_adaptor_type> > > stroke(contour); //agg::conv_stroke< agg::conv_transform<font_manager_type::path_adaptor_type> > stroke(tr); |
|
From: Ehud S. <esh...@us...> - 2006-05-02 13:01:09
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31459 Modified Files: roadmap_dialog.c Log Message: Add scroll bar to combo boxes. Index: roadmap_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_dialog.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_dialog.c 17 Mar 2006 09:58:29 -0000 1.4 --- roadmap_dialog.c 2 May 2006 13:00:55 -0000 1.5 *************** *** 655,659 **** _T("COMBOBOX"), // Class name NULL, // Window name ! dwStyle, // Window style 0, // x-coordinate of the upper-left corner 0, // y-coordinate of the upper-left corner --- 655,659 ---- _T("COMBOBOX"), // Class name NULL, // Window name ! dwStyle | WS_VSCROLL, // Window style 0, // x-coordinate of the upper-left corner 0, // y-coordinate of the upper-left corner |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:59:25
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30361 Modified Files: roadmap_canvas_agg.cpp Log Message: Fix image draw. Index: roadmap_canvas_agg.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_canvas_agg.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_canvas_agg.cpp 29 Apr 2006 10:52:09 -0000 1.1 --- roadmap_canvas_agg.cpp 2 May 2006 12:59:21 -0000 1.2 *************** *** 242,248 **** int width = pmap_tmp.width(); int height = pmap_tmp.height(); ! unsigned char *buf = (unsigned char *)malloc (width*height*3); ! memcpy (buf, pmap_tmp.buf(), width*height*3); //agg::rendering_buffer tmp_rbuf (pmap_tmp.buf(), --- 242,249 ---- int width = pmap_tmp.width(); int height = pmap_tmp.height(); + int stride = pmap_tmp.stride(); ! unsigned char *buf = (unsigned char *)malloc (stride * height); ! memcpy (buf, pmap_tmp.buf(), stride * height); //agg::rendering_buffer tmp_rbuf (pmap_tmp.buf(), *************** *** 263,267 **** image->rbuf.attach (buf, width, height, ! -pmap_tmp.stride()); return image; } --- 264,268 ---- image->rbuf.attach (buf, width, height, ! -stride); return image; } |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:57:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28999 Modified Files: roadmap_file.c Log Message: Add file mapping sync. Index: roadmap_file.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_file.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_file.c 28 Nov 2005 19:36:35 -0000 1.2 --- roadmap_file.c 2 May 2006 12:57:36 -0000 1.3 *************** *** 312,316 **** open_mode, FILE_SHARE_READ, NULL, OPEN_EXISTING, ! FILE_ATTRIBUTE_NORMAL, NULL); free(name_unicode); sequence = ""; /* Whatever, but NULL. */ --- 312,316 ---- open_mode, FILE_SHARE_READ, NULL, OPEN_EXISTING, ! FILE_ATTRIBUTE_NORMAL|FILE_FLAG_WRITE_THROUGH, NULL); free(name_unicode); sequence = ""; /* Whatever, but NULL. */ *************** *** 454,457 **** --- 454,470 ---- } + + int roadmap_file_sync (RoadMapFileContext file) + { + BOOL res; + + if (file->base == NULL) return -1; + + res = FlushViewOfFile(file->base, file->size); + + if (!res) return -1; + else return 0; + } + RoadMapFile roadmap_file_open(const char *name, const char *mode) |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:57:27
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28849 Modified Files: roadmap_win32.c roadmap_win32.h Log Message: Add const. Index: roadmap_win32.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_win32.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_win32.h 31 Dec 2005 09:58:00 -0000 1.3 --- roadmap_win32.h 2 May 2006 12:57:21 -0000 1.4 *************** *** 2,13 **** #define _ROADMAP_WIN32_H_ ! #include <windows.h> ! ! #define MENU_ID_START WM_USER ! #define MAX_MENU_ITEMS 100 ! #define TOOL_ID_START (MENU_ID_START + MAX_MENU_ITEMS + 1) ! #define MAX_TOOL_ITEMS 100 ! #define WM_USER_DUMMY (WM_USER + TOOL_ID_START + MAX_TOOL_ITEMS + 1) ! #define WM_USER_READ (WM_USER + WM_USER_DUMMY + 1) #define snprintf _snprintf --- 2,13 ---- #define _ROADMAP_WIN32_H_ ! #include <windows.h> ! ! #define MENU_ID_START WM_USER ! #define MAX_MENU_ITEMS 100 ! #define TOOL_ID_START (MENU_ID_START + MAX_MENU_ITEMS + 1) ! #define MAX_TOOL_ITEMS 100 ! #define WM_USER_DUMMY (WM_USER + TOOL_ID_START + MAX_TOOL_ITEMS + 1) ! #define WM_USER_READ (WM_USER + WM_USER_DUMMY + 1) #define snprintf _snprintf *************** *** 19,23 **** LPWSTR ConvertToWideChar(LPCSTR string, UINT nCodePage); ! char* ConvertToMultiByte(const LPWSTR s, UINT nCodePage); #endif /* _ROADMAP_WIN32_H_ */ --- 19,23 ---- LPWSTR ConvertToWideChar(LPCSTR string, UINT nCodePage); ! char* ConvertToMultiByte(const LPCWSTR s, UINT nCodePage); #endif /* _ROADMAP_WIN32_H_ */ Index: roadmap_win32.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_win32.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_win32.c 28 Nov 2005 19:36:35 -0000 1.2 --- roadmap_win32.c 2 May 2006 12:57:21 -0000 1.3 *************** *** 44,48 **** ! char* ConvertToMultiByte(const LPWSTR s, UINT nCodePage) { int len; --- 44,48 ---- ! char* ConvertToMultiByte(const LPCWSTR s, UINT nCodePage) { int len; |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:56:37
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28142a Modified Files: roadmap_main.cpp roadmap_serial.c wince_input_mon.c wince_input_mon.h Log Message: Add serial enumeration. Fix input notification. Index: wince_input_mon.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_input_mon.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wince_input_mon.c 22 Mar 2006 08:54:10 -0000 1.6 --- wince_input_mon.c 2 May 2006 12:56:30 -0000 1.7 *************** *** 128,132 **** } ! while(conn->handle != INVALID_HANDLE_VALUE) { if (conn->data_count == 0) { --- 128,132 ---- } ! while(data->is_valid && (conn->handle != INVALID_HANDLE_VALUE)) { if (conn->data_count == 0) { *************** *** 172,182 **** if (!--conn->ref_count) { free(conn); - } else { - - roadmap_log - (ROADMAP_ERROR, "conn ref_count is not zero: %d", - conn->ref_count); - assert (0); } return 0; --- 172,182 ---- if (!--conn->ref_count) { free(conn); } + + if (data->is_valid) { + data->is_valid = 0; + } else { + free (data); + } return 0; *************** *** 192,196 **** FD_ZERO(&set); ! while(io->subsystem != ROADMAP_IO_INVALID) { FD_SET(fd, &set); --- 192,196 ---- FD_ZERO(&set); ! while(data->is_valid && (io->subsystem != ROADMAP_IO_INVALID)) { FD_SET(fd, &set); *************** *** 211,215 **** } ! free(io); return 0; --- 211,219 ---- } ! if (data->is_valid) { ! data->is_valid = 0; ! } else { ! free (data); ! } return 0; *************** *** 226,230 **** RoadMapIO *io = data->io; ! while(io->subsystem != ROADMAP_IO_INVALID) { /* Send a message to main window so it can read. */ --- 230,234 ---- RoadMapIO *io = data->io; ! while(data->is_valid && (io->subsystem != ROADMAP_IO_INVALID)) { /* Send a message to main window so it can read. */ *************** *** 232,236 **** } ! free(io); return 0; --- 236,244 ---- } ! if (data->is_valid) { ! data->is_valid = 0; ! } else { ! free (data); ! } return 0; Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** roadmap_main.cpp 29 Apr 2006 10:52:09 -0000 1.9 --- roadmap_main.cpp 2 May 2006 12:56:30 -0000 1.10 *************** *** 45,49 **** #include "../roadmap_io.h" #include "../roadmap_main.h" ! #include "../roadmap_serial.h" #include "wince_input_mon.h" #include "win32_serial.h" --- 45,51 ---- #include "../roadmap_io.h" #include "../roadmap_main.h" ! #include "../roadmap_serial.h" ! #include "../roadmap_messagebox.h" ! #include "../roadmap_screen.h" #include "wince_input_mon.h" #include "win32_serial.h" *************** *** 71,75 **** // IO stuff #define ROADMAP_MAX_IO 16 ! static roadmap_main_io RoadMapMainIo[ROADMAP_MAX_IO] = {0}; // varibles used across this module --- 73,77 ---- // IO stuff #define ROADMAP_MAX_IO 16 ! static roadmap_main_io *RoadMapMainIo[ROADMAP_MAX_IO] = {0}; // varibles used across this module *************** *** 78,81 **** --- 80,84 ---- static HMENU RoadMapCurrentSubMenu = NULL; static HWND RoadMapMainToolbar = NULL; + static HANDLE VirtualSerialHandle = 0; // Global Variables: *************** *** 97,100 **** --- 100,139 ---- static TCHAR szWindowClass[] = _T("RoadMapClass"); #endif + + static RoadMapConfigDescriptor RoadMapConfigGPSVirtual = + ROADMAP_CONFIG_ITEM("GPS", "Virtual"); + + + static void setup_virtual_serial (void) { + + DWORD index; + DWORD resp; + HKEY key; + + const char *virtual_port = roadmap_config_get (&RoadMapConfigGPSVirtual); + + if (strlen(virtual_port) < 5) return; + if (strncmp(virtual_port, "COM", 3)) return; + + index = atoi (virtual_port + 3); + + if ((index < 0) || (index > 9)) return; + + RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("Drivers\\RoadMap"), + 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &key, &resp); + RegSetValueEx(key, _T("Dll"), 0, REG_SZ, (unsigned char*)_T("ComSplit.dll"), 26); + RegSetValueEx(key, _T("Prefix"), 0, REG_SZ, (unsigned char*)_T("COM"), 8); + RegSetValueEx(key, _T("Index"), 0, REG_DWORD, (unsigned char*)&index, sizeof(DWORD)); + + RegCloseKey(key); + + //res = RegisterDevice(_T("COM"), 4, _T("ComSplit.dll"), 0); + VirtualSerialHandle = ActivateDevice(_T("RoadMap"), NULL); + + if (VirtualSerialHandle == 0) { + roadmap_messagebox ("Virtual comm Error!", "Can't setup virtual serial port."); + } + } + // our main function *************** *** 116,137 **** #endif ! /* ! DWORD disp; ! HKEY key; ! ! LONG res_key = RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("RoadMap"), ! 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &key, &disp); ! RegSetValueEx(key, _T("Dll"), 0, REG_SZ, (unsigned char*)_T("ComSplit.dll"), 26); ! RegSetValueEx(key, _T("Prefix"), 0, REG_SZ, (unsigned char*)_T("COM"), 8); ! disp = 4; ! RegSetValueEx(key, _T("Index"), 0, REG_DWORD, (unsigned char*)&disp, sizeof(DWORD)); ! ! RegCloseKey(key); ! ! //res = RegisterDevice(_T("COM"), 4, _T("ComSplit.dll"), 0); ! HANDLE res = ActivateDevice(_T("RoadMap"), NULL); ! ! res = res; ! */ ShowWindow(RoadMapMainWindow, nCmdShow); UpdateWindow(RoadMapMainWindow); --- 155,160 ---- #endif ! setup_virtual_serial (); ! ShowWindow(RoadMapMainWindow, nCmdShow); UpdateWindow(RoadMapMainWindow); *************** *** 149,153 **** } } ! WSACleanup(); return (int) msg.wParam; --- 172,181 ---- } } ! ! if (VirtualSerialHandle != 0) { ! DeactivateDevice (VirtualSerialHandle); ! } ! ! WSACleanup(); return (int) msg.wParam; *************** *** 232,235 **** --- 260,269 ---- return 0; } + + + static void CALLBACK AvoidSuspend (HWND hwnd, UINT uMsg, UINT idEvent, + DWORD dwTime) { + SystemIdleTimerReset (); + } *************** *** 335,339 **** // Initialize the shell activate info structure memset(&s_sai, 0, sizeof (s_sai)); ! s_sai.cbSize = sizeof (s_sai); break; --- 369,375 ---- // Initialize the shell activate info structure memset(&s_sai, 0, sizeof (s_sai)); ! s_sai.cbSize = sizeof (s_sai); ! ! SetTimer (NULL, 0, 50000, AvoidSuspend); break; *************** *** 409,420 **** SHHandleWMActivate(hWnd, wParam, lParam, &s_sai, FALSE); break; ! case WM_SETTINGCHANGE: SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai); ! break; ! case WM_USER_READ: { roadmap_main_io *context = (roadmap_main_io *) wParam; if (lParam != 1) { --- 445,465 ---- SHHandleWMActivate(hWnd, wParam, lParam, &s_sai, FALSE); break; ! case WM_SETTINGCHANGE: SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai); ! break; ! ! case WM_KILLFOCUS: ! roadmap_screen_freeze (); ! break; ! ! case WM_SETFOCUS: ! roadmap_screen_unfreeze (); ! break; ! case WM_USER_READ: { roadmap_main_io *context = (roadmap_main_io *) wParam; + if (!context->is_valid) break; if (lParam != 1) { *************** *** 668,674 **** for (i = 0; i < ROADMAP_MAX_IO; ++i) { ! if (RoadMapMainIo[i].io == NULL) { ! RoadMapMainIo[i].io = io; ! RoadMapMainIo[i].callback = callback; break; } --- 713,721 ---- for (i = 0; i < ROADMAP_MAX_IO; ++i) { ! if (RoadMapMainIo[i] == NULL) { ! RoadMapMainIo[i] = (roadmap_main_io *) malloc (sizeof(roadmap_main_io)); ! RoadMapMainIo[i]->io = io; ! RoadMapMainIo[i]->callback = callback; ! RoadMapMainIo[i]->is_valid = 1; break; } *************** *** 685,697 **** io->os.serial->ref_count++; monitor_thread = CreateThread(NULL, 0, ! SerialMonThread, (void*)&RoadMapMainIo[i], 0, NULL); break; case ROADMAP_IO_NET: monitor_thread = CreateThread(NULL, 0, ! SocketMonThread, (void*)&RoadMapMainIo[i], 0, NULL); break; case ROADMAP_IO_FILE: monitor_thread = CreateThread(NULL, 0, ! FileMonThread, (void*)&RoadMapMainIo[i], 0, NULL); break; } --- 732,744 ---- io->os.serial->ref_count++; monitor_thread = CreateThread(NULL, 0, ! SerialMonThread, (void*)RoadMapMainIo[i], 0, NULL); break; case ROADMAP_IO_NET: monitor_thread = CreateThread(NULL, 0, ! SocketMonThread, (void*)RoadMapMainIo[i], 0, NULL); break; case ROADMAP_IO_FILE: monitor_thread = CreateThread(NULL, 0, ! FileMonThread, (void*)RoadMapMainIo[i], 0, NULL); break; } *************** *** 714,720 **** for (i = 0; i < ROADMAP_MAX_IO; ++i) { ! if (RoadMapMainIo[i].io == io) { ! RoadMapMainIo[i].io = NULL; break; } --- 761,773 ---- for (i = 0; i < ROADMAP_MAX_IO; ++i) { ! if (RoadMapMainIo[i] && RoadMapMainIo[i]->io == io) { ! ! if (RoadMapMainIo[i]->is_valid) { ! RoadMapMainIo[i]->is_valid = 0; ! } else { ! free (RoadMapMainIo[i]); ! } ! RoadMapMainIo[i] = NULL; break; } Index: wince_input_mon.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_input_mon.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wince_input_mon.h 31 Dec 2005 09:58:00 -0000 1.3 --- wince_input_mon.h 2 May 2006 12:56:30 -0000 1.4 *************** *** 9,12 **** --- 9,13 ---- RoadMapIO *io; RoadMapInput callback; + int is_valid; } roadmap_main_io; Index: roadmap_serial.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_serial.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_serial.c 17 Dec 2005 21:59:48 -0000 1.4 --- roadmap_serial.c 2 May 2006 12:56:30 -0000 1.5 *************** *** 26,30 **** #include "../roadmap.h" #include "../roadmap_serial.h" ! #include "win32_serial.h" RoadMapSerial roadmap_serial_open(const char *name, const char *mode, --- 26,51 ---- #include "../roadmap.h" #include "../roadmap_serial.h" ! #include "win32_serial.h" ! #include "listports.h" ! ! ! static int serial_ports[MAX_SERIAL_ENUMS]; ! ! static BOOL list_port_callback(LPVOID pCallbackValue, ! LISTPORTS_PORTINFO* lpPortInfo) { ! ! int index; ! char *str = ConvertToMultiByte (lpPortInfo->lpPortName, CP_UTF8); ! ! index = atoi (str+3); ! free (str); ! ! if ((index >= 0) && (index < MAX_SERIAL_ENUMS)) { ! serial_ports [index] = 1; ! } ! ! return TRUE; ! } ! RoadMapSerial roadmap_serial_open(const char *name, const char *mode, *************** *** 111,112 **** --- 132,144 ---- } + + const int *roadmap_serial_enumerate (void) + { + if (!serial_ports[0]) { + + ListPorts (list_port_callback, NULL); + } + + return serial_ports; + } + |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:55:51
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27502 Added Files: listports.c listports.h Log Message: Add serial enumeration. --- NEW FILE: listports.h --- /* A small library that lists serial ports available on the system, both on * 9x/ME and NT4.0/2000/XP platforms. * Infrared serial ports are listed as well. * * LEGAL: * * (C) 2001-2005 Joaquín Mª López Muñoz (jo...@ti...). All rights reserved. * (C) 2005 Tony Kmoch, Telematix a.s. [Windows CE version] * * Permission is granted to use, distribute and modify this code provided that: * · this copyright notice remain unchanged, * · you submit all changes to the copyright holder and properly mark the * changes so they can be told from the original code, * · credits are given to the copyright holder in the documentation of any * software using this code with the following line: * "Portions copyright 2001 Joaquín Mª López Muñoz (jo...@ti...)" * * The author welcomes any suggestions on the code or reportings of actual * use of the code. Please send your comments to jo...@ti.... * * The author makes NO WARRANTY or representation, either express or implied, * with respect to this code, its quality, accuracy, merchantability, or * fitness for a particular purpose. This software is provided "AS IS", and * you, its user, assume the entire risk as to its quality and accuracy. * * Changes in version 2.0 * · Added lpTechnology to LISTPORTS_PORTINFO. * · Windows CE supported (Tony Kmoch). * * Last modified: August 23rd, 2005 */ #ifndef LISTPORTS_H #define LISTPORTS_H #define VERSION_LISTPORTS 0x00020000 #ifdef __cplusplus extern "C"{ #endif #include <windows.h> typedef struct { LPCTSTR lpPortName; /* "COM1", etc. */ LPCTSTR lpFriendlyName; /* Suitable to describe the port, as for */ /* instance "Infrared serial port (COM4)" */ LPCTSTR lpTechnology; /* "BIOS","INFRARED","USB", etc. */ }LISTPORTS_PORTINFO; typedef BOOL (CALLBACK* LISTPORTS_CALLBACK)(LPVOID lpCallbackValue, LISTPORTS_PORTINFO* lpPortInfo); /* User provided callback funtion that receives the information on each * serial port available. * The strings provided on the LISTPORTS_INFO are not to be referenced after * the callback returns; instead make copies of them for later use. * If the callback returns FALSE, port enumeration is aborted. */ BOOL ListPorts(LISTPORTS_CALLBACK lpCallback,LPVOID lpCallbackValue); /* Lists serial ports available on the system, passing the information on * each port on succesive calls to lpCallback. * lpCallbackValue, treated opaquely by ListPorts(), is intended to carry * information internal to the callback routine. * Returns TRUE if succesful, otherwise error code can be retrieved via * GetLastError(). */ #ifdef __cplusplus } #endif #elif VERSION_LISTPORTS!=0x00020000 #error You have included two LISTPORTS.H with different version numbers #endif --- NEW FILE: listports.c --- (This appears to be a binary file; contents omitted.) |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:55:12
|
Update of /cvsroot/roadmap/roadmap_editor/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27132a Modified Files: roadmap_file.c Log Message: Add file mapping sync. Index: roadmap_file.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/unix/roadmap_file.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_file.c 28 Nov 2005 19:36:35 -0000 1.2 --- roadmap_file.c 2 May 2006 12:55:05 -0000 1.3 *************** *** 329,332 **** --- 329,342 ---- + int roadmap_file_sync (RoadMapFileContext file) { + + if (file->base != NULL) { + return msync (file->base, file->size, MS_SYNC); + } + + return -1; + } + + void roadmap_file_unmap (RoadMapFileContext *file) { |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:54:22
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26371 Modified Files: editor_db.c Log Message: Add file mapping sync. Index: editor_db.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_db.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** editor_db.c 17 Mar 2006 09:52:08 -0000 1.4 --- editor_db.c 2 May 2006 12:54:12 -0000 1.5 *************** *** 60,63 **** --- 60,64 ---- #define EDITOR_CACHE_SIZE 10 + #define FLUSH_SIZE 300 struct editor_cache_entry { *************** *** 478,481 **** --- 479,499 ---- + void editor_db_sync (int fips) { + + int i; + + for (i = EditorCacheSize-1; i >= 0; --i) { + + if (EditorCache[i].fips == fips) { + char map_name[64]; + + snprintf (map_name, sizeof(map_name), + "edt%05d", EditorCache[i].fips); + roadmap_db_sync (map_name); + } + } + } + + int editor_db_activate (int fips) { *************** *** 553,556 **** --- 571,575 ---- int block_offset = section->num_items % section->items_per_block; char *item_addr; + static int flush_count; if ((section->num_items == 0) || *************** *** 569,572 **** --- 588,596 ---- } + if (++flush_count == FLUSH_SIZE) { + flush_count = 0; + editor_db_sync (ActiveDBHeader->fips); + } + return section->num_items++; } |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:53:52
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25932 Modified Files: editor_screen.c Log Message: Check screen objects before calling other callbacks. Index: editor_screen.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_screen.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** editor_screen.c 29 Apr 2006 10:57:03 -0000 1.9 --- editor_screen.c 2 May 2006 12:53:49 -0000 1.10 *************** *** 221,228 **** int i; - if (roadmap_screen_obj_click (point)) { - return; - } - roadmap_math_to_position (point, &position, 1); --- 221,224 ---- |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:53:02
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg23/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25221 Modified Files: agg_pixfmt_rgb_packed.h Log Message: Fix RGB order. Index: agg_pixfmt_rgb_packed.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg23/include/agg_pixfmt_rgb_packed.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** agg_pixfmt_rgb_packed.h 29 Apr 2006 11:00:01 -0000 1.2 --- agg_pixfmt_rgb_packed.h 2 May 2006 12:52:57 -0000 1.3 *************** *** 1069,1072 **** --- 1069,1073 ---- int8u cover) { + typedef typename SrcPixelFormatRenderer::order_type src_order; const value_type* psrc = (const value_type*)psrc_; pixel_type* pdst = (pixel_type*)m_rbuf->row(ydst) + xdst; *************** *** 1078,1091 **** if(alpha == base_mask && cover == 255) { ! *pdst = m_blender.make_pix(psrc[0], ! psrc[1], ! psrc[2]); } else { m_blender.blend_pix(pdst, ! psrc[0], ! psrc[1], ! psrc[2], cover, cover); --- 1079,1092 ---- if(alpha == base_mask && cover == 255) { ! *pdst = m_blender.make_pix(psrc[src_order::R], ! psrc[src_order::G], ! psrc[src_order::B]); } else { m_blender.blend_pix(pdst, ! psrc[src_order::R], ! psrc[src_order::G], ! psrc[src_order::B], cover, cover); |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:50:36
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg23 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23395 Modified Files: roadmap_canvas.cpp Log Message: Add image selection notification. Index: roadmap_canvas.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg23/roadmap_canvas.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_canvas.cpp 29 Apr 2006 10:59:17 -0000 1.1 --- roadmap_canvas.cpp 2 May 2006 12:50:32 -0000 1.2 *************** *** 94,106 **** ROADMAP_CONFIG_ITEM("Labels", "FontName"); ! struct roadmap_canvas_pen { ! struct roadmap_canvas_pen *next; ! char *name; agg::rgba8 color; ! int thickness; }; static struct roadmap_canvas_pen *RoadMapPenList = NULL; ! static RoadMapPen CurrentPen; static int RoadMapCanvasFontLoaded = 0; --- 94,106 ---- ROADMAP_CONFIG_ITEM("Labels", "FontName"); ! struct roadmap_canvas_pen { ! struct roadmap_canvas_pen *next; ! char *name; agg::rgba8 color; ! int thickness; }; static struct roadmap_canvas_pen *RoadMapPenList = NULL; ! static RoadMapPen CurrentPen; static int RoadMapCanvasFontLoaded = 0; *************** *** 140,159 **** } ! double x = 0; ! double y = 0; ! const wchar_t* p = wstr; ! while(*p) { ! const agg::glyph_cache* glyph = m_fman.glyph(*p); ! if(glyph) { ! x += glyph->advance_x; ! y += glyph->advance_y; ! if (-glyph->bounds.y1 > *descent) *descent=-glyph->bounds.y1 - 1; ! } ! ++p; ! } ! *width = (int)x; } --- 140,159 ---- } ! double x = 0; ! double y = 0; ! const wchar_t* p = wstr; ! while(*p) { ! const agg::glyph_cache* glyph = m_fman.glyph(*p); ! if(glyph) { ! x += glyph->advance_x; ! y += glyph->advance_y; ! if (-glyph->bounds.y1 > *descent) *descent=-glyph->bounds.y1 - 1; ! } ! ++p; ! } ! *width = (int)x; } *************** *** 165,169 **** profile.width(pen->thickness); } ! CurrentPen = pen; reno.color(pen->color); --- 165,169 ---- profile.width(pen->thickness); } ! CurrentPen = pen; reno.color(pen->color); *************** *** 171,175 **** dbg_time_end(DBG_TIME_SELECT_PEN); ! return; } --- 171,175 ---- dbg_time_end(DBG_TIME_SELECT_PEN); ! return; } *************** *** 177,203 **** RoadMapPen roadmap_canvas_create_pen (const char *name) { ! struct roadmap_canvas_pen *pen; ! ! for (pen = RoadMapPenList; pen != NULL; pen = pen->next) { ! if (strcmp(pen->name, name) == 0) break; ! } ! ! if (pen == NULL) { ! ! pen = (struct roadmap_canvas_pen *) ! malloc (sizeof(struct roadmap_canvas_pen)); ! roadmap_check_allocated(pen); ! ! pen->name = strdup (name); ! pen->color = agg::rgba8(0, 0, 0); ! pen->thickness = 1; ! pen->next = RoadMapPenList; ! ! RoadMapPenList = pen; ! } ! ! roadmap_canvas_select_pen (pen); ! ! return pen; } --- 177,203 ---- RoadMapPen roadmap_canvas_create_pen (const char *name) { ! struct roadmap_canvas_pen *pen; ! ! for (pen = RoadMapPenList; pen != NULL; pen = pen->next) { ! if (strcmp(pen->name, name) == 0) break; ! } ! ! if (pen == NULL) { ! ! pen = (struct roadmap_canvas_pen *) ! malloc (sizeof(struct roadmap_canvas_pen)); ! roadmap_check_allocated(pen); ! ! pen->name = strdup (name); ! pen->color = agg::rgba8(0, 0, 0); ! pen->thickness = 1; ! pen->next = RoadMapPenList; ! ! RoadMapPenList = pen; ! } ! ! roadmap_canvas_select_pen (pen); ! ! return pen; } *************** *** 207,212 **** if (!CurrentPen) return; ! CurrentPen->color = roadmap_canvas_agg_parse_color(color); ! roadmap_canvas_select_pen(CurrentPen); } --- 207,212 ---- if (!CurrentPen) return; ! CurrentPen->color = roadmap_canvas_agg_parse_color(color); ! roadmap_canvas_select_pen(CurrentPen); } *************** *** 215,221 **** if (CurrentPen && (CurrentPen->thickness != thickness)) { ! CurrentPen->thickness = thickness; profile.width(thickness); ! } } --- 215,221 ---- if (CurrentPen && (CurrentPen->thickness != thickness)) { ! CurrentPen->thickness = thickness; profile.width(thickness); ! } } *************** *** 225,229 **** if (!CurrentPen) return; CurrentPen->color.a = opacity; ! roadmap_canvas_select_pen(CurrentPen); } --- 225,229 ---- if (!CurrentPen) return; CurrentPen->color.a = opacity; ! roadmap_canvas_select_pen(CurrentPen); } *************** *** 238,286 **** int corner, const char *text) { ! int x; ! int y; ! int text_width; ! int text_ascent; ! int text_descent; ! int text_height; ! ! roadmap_canvas_get_text_extents ! (text, &text_width, &text_ascent, &text_descent); ! ! text_height = text_ascent + text_descent; ! ! switch (corner) { ! ! case ROADMAP_CANVAS_TOPLEFT: ! y = position->y; ! x = position->x; ! break; ! ! case ROADMAP_CANVAS_TOPRIGHT: ! y = position->y; ! x = position->x - text_width; ! break; ! ! case ROADMAP_CANVAS_BOTTOMRIGHT: ! y = position->y - text_height; ! x = position->x - text_width; ! break; ! ! case ROADMAP_CANVAS_BOTTOMLEFT: ! y = position->y - text_height; ! x = position->x; ! break; ! ! case ROADMAP_CANVAS_CENTER: ! y = position->y - (text_height / 2); ! x = position->x - (text_width / 2); ! break; ! ! default: ! return; ! } ! RoadMapGuiPoint start = {x, y+text_height}; ! roadmap_canvas_draw_string_angle (&start, position, 0, text); } --- 238,286 ---- int corner, const char *text) { ! int x; ! int y; ! int text_width; ! int text_ascent; ! int text_descent; ! int text_height; ! ! roadmap_canvas_get_text_extents ! (text, &text_width, &text_ascent, &text_descent); ! ! text_height = text_ascent + text_descent; ! ! switch (corner) { ! ! case ROADMAP_CANVAS_TOPLEFT: ! y = position->y; ! x = position->x; ! break; ! ! case ROADMAP_CANVAS_TOPRIGHT: ! y = position->y; ! x = position->x - text_width; ! break; ! ! case ROADMAP_CANVAS_BOTTOMRIGHT: ! y = position->y - text_height; ! x = position->x - text_width; ! break; ! ! case ROADMAP_CANVAS_BOTTOMLEFT: ! y = position->y - text_height; ! x = position->x; ! break; ! ! case ROADMAP_CANVAS_CENTER: ! y = position->y - (text_height / 2); ! x = position->x - (text_width / 2); ! break; ! ! default: ! return; ! } ! RoadMapGuiPoint start = {x, y+text_height}; ! roadmap_canvas_draw_string_angle (&start, position, 0, text); } *************** *** 602,607 **** //stroke(fill); ! agg::conv_stroke< agg::conv_transform<font_manager_type::path_adaptor_type> > ! stroke(tr); dbg_time_start(DBG_TIME_TEXT_ONE_RAS); --- 602,610 ---- //stroke(fill); ! agg::conv_contour<agg::conv_transform<font_manager_type::path_adaptor_type> >contour(tr); ! contour.width(2); ! ! agg::conv_stroke< agg::conv_contour<agg::conv_transform<font_manager_type::path_adaptor_type> > > stroke(contour); ! //agg::conv_stroke< agg::conv_transform<font_manager_type::path_adaptor_type> > stroke(tr); dbg_time_start(DBG_TIME_TEXT_ONE_RAS); *************** *** 613,621 **** agg::render_scanlines(ras, sl, ren_solid); //ras.add_path(fill); - //ren_solid.color(agg::rgba8(0, 0, 0)); - //agg::render_scanlines(ras, sl, ren_solid); //ras.add_path(stroke); //ren_solid.color(agg::rgba8(255, 255, 255)); //agg::render_scanlines(ras, sl, ren_solid); #ifdef WIN32_PROFILE --- 616,625 ---- agg::render_scanlines(ras, sl, ren_solid); //ras.add_path(fill); //ras.add_path(stroke); //ren_solid.color(agg::rgba8(255, 255, 255)); //agg::render_scanlines(ras, sl, ren_solid); + //ras.add_path(tr); + //ren_solid.color(agg::rgba8(0, 0, 0)); + //agg::render_scanlines(ras, sl, ren_solid); #ifdef WIN32_PROFILE *************** *** 683,695 **** } void roadmap_canvas_draw_image (RoadMapImage image, RoadMapGuiPoint *pos, ! int opacity) { ! if ((opacity <= 0) || (opacity >= 255)) { opacity = 255; } agg_renb.blend_from(image->pixfmt, 0, pos->x, pos->y, opacity); } --- 687,715 ---- } + #include "agg_span_interpolator_linear.h" + #include "agg_span_image_filter_rgb.h" void roadmap_canvas_draw_image (RoadMapImage image, RoadMapGuiPoint *pos, ! int opacity, int mode) { ! if ((mode == IMAGE_SELECTED) || (opacity <= 0) || (opacity >= 255)) { opacity = 255; } agg_renb.blend_from(image->pixfmt, 0, pos->x, pos->y, opacity); + + if (mode == IMAGE_SELECTED) { + + RoadMapGuiPoint points[5] = { + {pos->x, pos->y}, + {pos->x + image->rbuf.width(), pos->y}, + {pos->x + image->rbuf.width(), pos->y + image->rbuf.height()}, + {pos->x, pos->y + image->rbuf.height()}, + {pos->x, pos->y}}; + + int num_points = 5; + + roadmap_canvas_draw_multiple_lines (1, &num_points, points, 0); + } } |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:49:29
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22437 Modified Files: roadmap_serial.h Log Message: Add serial enumeration. Index: roadmap_serial.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_serial.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_serial.h 17 Dec 2005 21:56:37 -0000 1.3 --- roadmap_serial.h 2 May 2006 12:49:25 -0000 1.4 *************** *** 30,37 **** #define INCLUDE__ROADMAP_SERIAL__H #ifdef _WIN32 ! #include <windows.h> #include "win32/win32_serial.h" --- 30,38 ---- #define INCLUDE__ROADMAP_SERIAL__H + #define MAX_SERIAL_ENUMS 10 #ifdef _WIN32 ! #include <windows.h> #include "win32/win32_serial.h" *************** *** 54,57 **** --- 55,59 ---- int roadmap_serial_write (RoadMapSerial serial, const void *data, int length); void roadmap_serial_close (RoadMapSerial serial); + const int *roadmap_serial_enumerate (void); #endif // INCLUDE__ROADMAP_FILE__H |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:48:28
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21591 Modified Files: roadmap_screen.c roadmap_screen.h roadmap_start.c Log Message: Add toggle orientation (dynamic or fixed) action and event. Index: roadmap_screen.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_screen.h 29 Apr 2006 15:00:12 -0000 1.4 --- roadmap_screen.h 2 May 2006 12:48:21 -0000 1.5 *************** *** 32,35 **** --- 32,39 ---- }; + enum { ORIENTATION_DYNAMIC = 0, + ORIENTATION_FIXED + }; + void roadmap_screen_initialize (void); *************** *** 46,49 **** --- 50,54 ---- void roadmap_screen_toggle_view_mode (void); + void roadmap_screen_toggle_orientation_mode (void); void roadmap_screen_increase_horizon (void); void roadmap_screen_decrease_horizon (void); Index: roadmap_screen.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roadmap_screen.c 29 Apr 2006 15:00:12 -0000 1.8 --- roadmap_screen.c 2 May 2006 12:48:20 -0000 1.9 *************** *** 96,99 **** --- 96,100 ---- static int RoadMapScreenViewMode = VIEW_MODE_2D; + static int RoadMapScreenOrientationMode = ORIENTATION_DYNAMIC; static int RoadMapScreen3dHorizon; static int RoadMapScreenRotation; *************** *** 613,617 **** layer_pen = roadmap_layer_get_pen (cfcc, pen_type); ! if ((pen_type != 0) || RoadMapScreenDragging){ /* we do labels only for the first pen */ total_length_ptr = 0; --- 614,618 ---- layer_pen = roadmap_layer_get_pen (cfcc, pen_type); ! if (RoadMapScreen3dHorizon || (pen_type != 0) || RoadMapScreenDragging) { /* we do labels only for the first pen */ total_length_ptr = 0; *************** *** 1097,1100 **** --- 1098,1107 ---- + static int roadmap_screen_get_orientation_mode (void) { + + return RoadMapScreenOrientationMode; + } + + void roadmap_screen_refresh (void) { *************** *** 1110,1114 **** refresh = 1; ! roadmap_math_set_orientation (roadmap_trip_get_orientation()); } else if (roadmap_trip_is_focus_moved()) { --- 1117,1123 ---- refresh = 1; ! if (RoadMapScreenOrientationMode != ORIENTATION_FIXED) { ! roadmap_math_set_orientation (roadmap_trip_get_orientation()); ! } } else if (roadmap_trip_is_focus_moved()) { *************** *** 1117,1123 **** roadmap_math_set_center (&RoadMapScreenCenter); ! refresh |= ! roadmap_math_set_orientation ! (roadmap_trip_get_orientation() + RoadMapScreenRotation); if (RoadMapScreenDeltaX || RoadMapScreenDeltaY) { --- 1126,1137 ---- roadmap_math_set_center (&RoadMapScreenCenter); ! if (RoadMapScreenOrientationMode != ORIENTATION_FIXED) { ! refresh |= ! roadmap_math_set_orientation ! (roadmap_trip_get_orientation() + RoadMapScreenRotation); ! } else { ! refresh |= ! roadmap_math_set_orientation (RoadMapScreenRotation); ! } if (RoadMapScreenDeltaX || RoadMapScreenDeltaY) { *************** *** 1159,1162 **** --- 1173,1178 ---- void roadmap_screen_unfreeze (void) { + if (!RoadMapScreenFrozen) return; + RoadMapScreenFrozen = 0; roadmap_screen_repaint (); *************** *** 1174,1177 **** --- 1190,1194 ---- int rotation = RoadMapScreenRotation + delta; + int calculated_rotation; while (rotation >= 360) { *************** *** 1182,1187 **** } ! if (roadmap_math_set_orientation ! (roadmap_trip_get_orientation() + rotation)) { RoadMapScreenRotation = rotation; roadmap_config_set_integer (&RoadMapConfigDeltaRotate, rotation); --- 1199,1209 ---- } ! if (RoadMapScreenOrientationMode == ORIENTATION_DYNAMIC) { ! calculated_rotation = roadmap_trip_get_orientation() + rotation; ! } else { ! calculated_rotation = rotation; ! } ! ! if (roadmap_math_set_orientation (calculated_rotation)) { RoadMapScreenRotation = rotation; roadmap_config_set_integer (&RoadMapConfigDeltaRotate, rotation); *************** *** 1207,1210 **** --- 1229,1247 ---- + void roadmap_screen_toggle_orientation_mode (void) { + + if (RoadMapScreenOrientationMode == ORIENTATION_DYNAMIC) { + + RoadMapScreenOrientationMode = ORIENTATION_FIXED; + + } else { + RoadMapScreenOrientationMode = ORIENTATION_DYNAMIC; + } + + RoadMapScreenRotation = 0; + roadmap_screen_rotate (0); + } + + void roadmap_screen_increase_horizon (void) { *************** *** 1327,1330 **** --- 1364,1369 ---- roadmap_state_add ("view_mode", &roadmap_screen_get_view_mode); + roadmap_state_add ("orientation_mode", + &roadmap_screen_get_orientation_mode); roadmap_state_monitor (&roadmap_screen_repaint); } Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** roadmap_start.c 29 Apr 2006 15:00:12 -0000 1.16 --- roadmap_start.c 2 May 2006 12:48:21 -0000 1.17 *************** *** 156,160 **** "A Street navigation system\n" "for Linux & UNIX" ! "\n\nEditor Plugin 0.6.0 pre1\n" "Ehud Shabtai\n" "esh...@gm..."); --- 156,160 ---- "A Street navigation system\n" "for Linux & UNIX" ! "\n\nEditor Plugin 0.6.0 pre2\n" "Ehud Shabtai\n" "esh...@gm..."); *************** *** 405,411 **** "Move the map view downward", roadmap_screen_move_down}, ! {"ToggleView", "Toggle view mode", "M", NULL, "Toggle view mode 2D / 3D", roadmap_screen_toggle_view_mode}, {"IncHorizon", "Increase Horizon", "I", NULL, "Increase the 3D horizon", roadmap_screen_increase_horizon}, --- 405,415 ---- "Move the map view downward", roadmap_screen_move_down}, ! {"toggleview", "Toggle view mode", "M", NULL, "Toggle view mode 2D / 3D", roadmap_screen_toggle_view_mode}, + {"toggleorientation", "Toggle orientation mode", "", NULL, + "Toggle orientation mode dynamic / fixed", + roadmap_screen_toggle_orientation_mode}, + {"IncHorizon", "Increase Horizon", "I", NULL, "Increase the 3D horizon", roadmap_screen_increase_horizon}, *************** *** 563,567 **** "right", "down", ! "ToggleView", "IncHorizon", "DecHorizon", --- 567,572 ---- "right", "down", ! "toggleorientation", ! "toggleview", "IncHorizon", "DecHorizon", |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:47:05
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20409 Modified Files: roadmap_screen_obj.c roadmap_screen_obj.h Log Message: Add roadmap_pointer callbacks. Add image selection notification. Index: roadmap_screen_obj.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen_obj.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_screen_obj.c 29 Apr 2006 14:58:43 -0000 1.2 --- roadmap_screen_obj.c 2 May 2006 12:46:58 -0000 1.3 *************** *** 72,78 **** }; - typedef struct RoadMapScreenObjDescriptor *RoadMapScreenObj; - static RoadMapScreenObj RoadMapObjectList = NULL; static char *roadmap_object_string (const char *data, int length) { --- 72,77 ---- }; static RoadMapScreenObj RoadMapObjectList = NULL; + static RoadMapScreenObj RoadMapScreenObjSelected = NULL; static char *roadmap_object_string (const char *data, int length) { *************** *** 452,456 **** roadmap_screen_obj_load (roadmap_file_base(file), roadmap_file_size(file)); ! roadmap_file_unmap (&file); return; } --- 451,455 ---- roadmap_screen_obj_load (roadmap_file_base(file), roadmap_file_size(file)); ! roadmap_file_unmap (&file); return; } *************** *** 462,466 **** roadmap_screen_obj_load (roadmap_file_base(file), roadmap_file_size(file)); ! roadmap_file_unmap (&file); return; } --- 461,465 ---- roadmap_screen_obj_load (roadmap_file_base(file), roadmap_file_size(file)); ! roadmap_file_unmap (&file); return; } *************** *** 474,477 **** --- 473,477 ---- for (cursor = RoadMapObjectList; cursor != NULL; cursor = cursor->next) { int state = 0; + int image_mode = IMAGE_NORAML; if (cursor->state_fn) { *************** *** 480,486 **** } if (cursor->images[state]) { roadmap_canvas_draw_image (cursor->images[state], &cursor->position, ! cursor->opacity); } --- 480,491 ---- } + if (cursor == RoadMapScreenObjSelected) { + image_mode = IMAGE_SELECTED; + } + if (cursor->images[state]) { + roadmap_canvas_draw_image (cursor->images[state], &cursor->position, ! cursor->opacity, image_mode); } *************** *** 498,502 **** ! int roadmap_screen_obj_click (RoadMapGuiPoint *point) { RoadMapScreenObj cursor; --- 503,507 ---- ! RoadMapScreenObj roadmap_screen_obj_by_pos (RoadMapGuiPoint *point) { RoadMapScreenObj cursor; *************** *** 509,517 **** (point->y <= (cursor->position.y + cursor->bbox.maxy))) { ! if (cursor->action) (*(cursor->action->callback)) (); ! return 1; } } return 0; } --- 514,566 ---- (point->y <= (cursor->position.y + cursor->bbox.maxy))) { ! return cursor; } } + return NULL; + } + + + int roadmap_screen_obj_short_click (RoadMapScreenObj object) { + + RoadMapScreenObjSelected = NULL; + + if (object->action) { + (*(object->action->callback)) (); + return 1; + } + + return 0; + } + + + void roadmap_screen_obj_pressed (RoadMapScreenObj object) { + int state = 0; + + RoadMapScreenObjSelected = object; + + if (object->state_fn) { + state = (*object->state_fn) (); + if ((state < 0) || (state >= MAX_STATES)) return; + } + + if (object->images[state]) { + + roadmap_canvas_draw_image (object->images[state], &object->position, + object->opacity, IMAGE_SELECTED); + } + + roadmap_canvas_refresh (); + } + + int roadmap_screen_obj_long_click (RoadMapScreenObj object) { + + RoadMapScreenObjSelected = NULL; + + if (object->action) { + (*(object->action->callback)) (); + return 1; + } + return 0; } Index: roadmap_screen_obj.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen_obj.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_screen_obj.h 29 Apr 2006 11:27:47 -0000 1.1 --- roadmap_screen_obj.h 2 May 2006 12:46:58 -0000 1.2 *************** *** 28,34 **** #include "roadmap_gps.h" void roadmap_screen_obj_initialize (void); void roadmap_screen_obj_draw (void); ! int roadmap_screen_obj_click (RoadMapGuiPoint *point); #endif // INCLUDE__ROADMAP_SCREEN_OBJECT__H --- 28,42 ---- #include "roadmap_gps.h" + struct RoadMapScreenObjDescriptor; + typedef struct RoadMapScreenObjDescriptor *RoadMapScreenObj; + void roadmap_screen_obj_initialize (void); void roadmap_screen_obj_draw (void); ! ! RoadMapScreenObj roadmap_screen_obj_by_pos (RoadMapGuiPoint *point); ! ! int roadmap_screen_obj_short_click (RoadMapScreenObj object); ! int roadmap_screen_obj_long_click (RoadMapScreenObj object); ! void roadmap_screen_obj_pressed (RoadMapScreenObj object); #endif // INCLUDE__ROADMAP_SCREEN_OBJECT__H |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:45:39
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19441 Modified Files: roadmap_pointer.c Log Message: Check screen objects before calling other callbacks. Index: roadmap_pointer.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_pointer.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_pointer.c 12 Dec 2005 20:41:03 -0000 1.3 --- roadmap_pointer.c 2 May 2006 12:45:33 -0000 1.4 *************** *** 33,36 **** --- 33,37 ---- #include "roadmap_gui.h" #include "roadmap_canvas.h" + #include "roadmap_screen_obj.h" #include "roadmap_main.h" *************** *** 41,44 **** --- 42,46 ---- static int is_dragging = 0; static int is_drag_flow_control_on = 0; + static RoadMapScreenObj screen_object; static RoadMapGuiPoint last_pointer_point; *************** *** 68,72 **** roadmap_main_remove_periodic(roadmap_pointer_button_timeout); ! RoadMapPointerLongClick(&last_pointer_point); is_button_down = 0; } --- 70,79 ---- roadmap_main_remove_periodic(roadmap_pointer_button_timeout); ! ! if (screen_object != NULL) { ! roadmap_screen_obj_long_click (screen_object); ! } else { ! RoadMapPointerLongClick(&last_pointer_point); ! } is_button_down = 0; } *************** *** 80,84 **** roadmap_main_remove_periodic(roadmap_pointer_drag_flow_control); ! RoadMapPointerDragMotion(&last_pointer_point); is_drag_flow_control_on = 0; } --- 87,94 ---- roadmap_main_remove_periodic(roadmap_pointer_drag_flow_control); ! ! if (screen_object == NULL) { ! RoadMapPointerDragMotion(&last_pointer_point); ! } is_drag_flow_control_on = 0; } *************** *** 88,91 **** --- 98,107 ---- is_button_down = 1; last_pointer_point = *point; + screen_object = roadmap_screen_obj_by_pos (point); + + if (screen_object) { + roadmap_screen_obj_pressed (screen_object); + } + roadmap_main_set_periodic (LONG_CLICK_TIMEOUT, roadmap_pointer_button_timeout); *************** *** 100,109 **** is_drag_flow_control_on = 0; } ! RoadMapPointerDragEnd(point); is_dragging = 0; is_button_down = 0; } else if (is_button_down) { roadmap_main_remove_periodic(roadmap_pointer_button_timeout); ! RoadMapPointerShortClick(point); is_button_down = 0; } --- 116,135 ---- is_drag_flow_control_on = 0; } ! ! if (screen_object) { ! roadmap_screen_obj_short_click (screen_object); ! } else { ! RoadMapPointerDragEnd(point); ! } is_dragging = 0; is_button_down = 0; } else if (is_button_down) { roadmap_main_remove_periodic(roadmap_pointer_button_timeout); ! ! if (screen_object) { ! roadmap_screen_obj_short_click (screen_object); ! } else { ! RoadMapPointerShortClick(point); ! } is_button_down = 0; } *************** *** 120,124 **** roadmap_main_remove_periodic(roadmap_pointer_button_timeout); ! RoadMapPointerDragStart(&last_pointer_point); last_pointer_point = *point; is_drag_flow_control_on = 1; --- 146,154 ---- roadmap_main_remove_periodic(roadmap_pointer_button_timeout); ! ! if (!screen_object) { ! RoadMapPointerDragStart(&last_pointer_point); ! } ! last_pointer_point = *point; is_drag_flow_control_on = 1; |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:45:10
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18885 Modified Files: roadmap_gps.c Log Message: Add GPS roadmap messages and fix active satellite count (Avi and Steed). Index: roadmap_gps.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gps.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_gps.c 29 Apr 2006 11:12:55 -0000 1.5 --- roadmap_gps.c 2 May 2006 12:45:01 -0000 1.6 *************** *** 43,46 **** --- 43,47 ---- #include "roadmap_nmea.h" #include "roadmap_gpsd2.h" + #include "roadmap_message.h" #include "roadmap_gps.h" *************** *** 57,60 **** --- 58,64 ---- #ifdef _WIN32 + static RoadMapConfigDescriptor RoadMapConfigGPSVirtual = + ROADMAP_CONFIG_ITEM("GPS", "Virtual"); + static RoadMapConfigDescriptor RoadMapConfigGPSBaudRate = ROADMAP_CONFIG_ITEM("GPS", "Baud Rate"); *************** *** 99,102 **** --- 103,107 ---- static int RoadMapGpsActiveSatelliteHash; static int RoadMapGpsSatelliteCount; + static int RoadMapGpsActiveSatelliteCount; static char RoadMapGpsActiveSatellite[ROADMAP_NMEA_MAX_SATELLITE]; *************** *** 138,145 **** new_state = GPS_RECEPTION_NA; ! } else if (RoadMapGpsSatelliteCount == 0) { new_state = GPS_RECEPTION_NONE; ! } else if ((RoadMapGpsSatelliteCount <= 3) || (RoadMapGpsQuality.dilution_horizontal > 2.3)) { --- 143,150 ---- new_state = GPS_RECEPTION_NA; ! } else if (RoadMapGpsActiveSatelliteCount == 0) { new_state = GPS_RECEPTION_NONE; ! } else if ((RoadMapGpsActiveSatelliteCount <= 3) || (RoadMapGpsQuality.dilution_horizontal > 2.3)) { *************** *** 173,176 **** --- 178,183 ---- int i; + roadmap_message_set ('c', "%d", RoadMapGpsActiveSatelliteCount); + for (i = 0; i < ROADMAP_GPS_CLIENTS; ++i) { *************** *** 260,263 **** --- 267,273 ---- static void roadmap_gps_gga (void *context, const RoadMapNmeaFields *fields) { + RoadMapGpsQuality.dilution_horizontal = fields->gga.dilution/100.0; + roadmap_message_set ('h', "%.2f", RoadMapGpsQuality.dilution_horizontal); + if (fields->gga.quality == ROADMAP_NMEA_QUALITY_INVALID) { *************** *** 346,349 **** --- 356,363 ---- RoadMapGpsQuality.dilution_vertical = fields->gsa.dilution_vertical; + roadmap_message_set ('p', "%.2f", RoadMapGpsQuality.dilution_position); + roadmap_message_set ('h', "%.2f", RoadMapGpsQuality.dilution_horizontal); + roadmap_message_set ('v', "%.2f", RoadMapGpsQuality.dilution_vertical); + roadmap_gps_update_reception (); } *************** *** 370,373 **** --- 384,388 ---- if (fields->gsv.index == fields->gsv.total) { + int active_count = 0; RoadMapGpsSatelliteCount = fields->gsv.count; *************** *** 387,390 **** --- 402,406 ---- if (RoadMapGpsActiveSatellite[i] == id) { RoadMapGpsDetected[index].status = 'A'; + active_count++; break; } *************** *** 393,396 **** --- 409,413 ---- } + RoadMapGpsActiveSatelliteCount = active_count; roadmap_gps_call_monitors (); } *************** *** 478,485 **** --- 495,504 ---- int active) { + static int active_count; if (sequence == 0) { /* End of list: propagate the information. */ + RoadMapGpsActiveSatelliteCount = active_count; roadmap_gps_call_monitors (); *************** *** 488,491 **** --- 507,514 ---- int index = sequence - 1; + if (index == 0) { + active_count = 0; + } + RoadMapGpsDetected[index].id = (char)id; RoadMapGpsDetected[index].elevation = (char)elevation; *************** *** 499,502 **** --- 522,526 ---- } RoadMapGpsDetected[index].status = 'A'; + active_count++; } else { *************** *** 518,521 **** --- 542,549 ---- RoadMapGpsQuality.dilution_horizontal = horizontal; RoadMapGpsQuality.dilution_vertical = vertical; + + roadmap_message_set ('p', "%.2f", RoadMapGpsQuality.dilution_position); + roadmap_message_set ('h', "%.2f", RoadMapGpsQuality.dilution_horizontal); + roadmap_message_set ('v', "%.2f", RoadMapGpsQuality.dilution_vertical); } *************** *** 553,556 **** --- 581,590 ---- static int RoadMapGpsInitialized = 0; + #ifdef _WIN32 + const int *serial_ports; + RoadMapConfigItem *source_item = NULL; + RoadMapConfigItem *virtual_item = NULL; + int i; + #endif if (! RoadMapGpsInitialized) { *************** *** 564,569 **** ("preferences", &RoadMapConfigGPSSource, "gpsd://localhost"); #else ! roadmap_config_declare ! ("preferences", &RoadMapConfigGPSSource, "COM1:"); roadmap_config_declare ("preferences", &RoadMapConfigGPSBaudRate, "4800"); --- 598,629 ---- ("preferences", &RoadMapConfigGPSSource, "gpsd://localhost"); #else ! ! virtual_item = roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigGPSVirtual, "", NULL); ! ! serial_ports = roadmap_serial_enumerate (); ! for (i=0; i<MAX_SERIAL_ENUMS; ++i) { ! ! char name[10]; ! sprintf (name, "COM%d:", i); ! ! if (!serial_ports[i]) { ! roadmap_config_add_enumeration_value (virtual_item, name); ! continue; ! } ! ! if (!source_item) { ! source_item = roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigGPSSource, name, NULL); ! } else { ! roadmap_config_add_enumeration_value (source_item, name); ! } ! } ! ! if (!source_item) { ! roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigGPSSource, "COM1:", NULL); ! } ! roadmap_config_declare ("preferences", &RoadMapConfigGPSBaudRate, "4800"); *************** *** 761,765 **** RoadMapGpsConnectedSince = time(NULL); ! RoadMapGpsLatestData = time(NULL); (*RoadMapGpsPeriodicAdd) (roadmap_gps_keep_alive); --- 821,825 ---- RoadMapGpsConnectedSince = time(NULL); ! //RoadMapGpsLatestData = time(NULL); (*RoadMapGpsPeriodicAdd) (roadmap_gps_keep_alive); |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:43:57
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18119 Modified Files: roadmap_file.h Log Message: Add file mapping sync. Index: roadmap_file.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_file.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_file.h 28 Nov 2005 19:36:34 -0000 1.2 --- roadmap_file.h 2 May 2006 12:43:53 -0000 1.3 *************** *** 86,89 **** --- 86,90 ---- int roadmap_file_size (RoadMapFileContext file); + int roadmap_file_sync (RoadMapFileContext file); void roadmap_file_unmap (RoadMapFileContext *file); |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:43:45
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18001 Modified Files: roadmap_display.c Log Message: Change the opacity of the background. Index: roadmap_display.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_display.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_display.c 29 Apr 2006 11:04:25 -0000 1.4 --- roadmap_display.c 2 May 2006 12:43:39 -0000 1.5 *************** *** 187,191 **** roadmap_display_new_pen (&sign->background_descriptor); ! roadmap_canvas_set_opacity (150); sign->foreground = --- 187,191 ---- roadmap_display_new_pen (&sign->background_descriptor); ! roadmap_canvas_set_opacity (230); sign->foreground = |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:43:00
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17387 Modified Files: roadmap_dbread.c roadmap_dbread.h Log Message: Add file mapping sync. Index: roadmap_dbread.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_dbread.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_dbread.c 31 Dec 2005 09:57:09 -0000 1.2 --- roadmap_dbread.c 2 May 2006 12:42:57 -0000 1.3 *************** *** 559,562 **** --- 559,578 ---- + void roadmap_db_sync (char *name) { + + roadmap_db_database *database; + + for (database = RoadmapDatabaseFirst; + database != NULL; + database = database->next) { + + if (strcmp (name, database->name) == 0) { + roadmap_file_sync (database->file); + break; + } + } + } + + void roadmap_db_close (char *name) { Index: roadmap_dbread.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_dbread.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** roadmap_dbread.h 15 Oct 2005 22:19:01 -0000 1.1.1.1 --- roadmap_dbread.h 2 May 2006 12:42:57 -0000 1.2 *************** *** 82,85 **** --- 82,86 ---- roadmap_db *roadmap_db_get_next (roadmap_db *section); + void roadmap_db_sync (char *name); void roadmap_db_close (char *name); void roadmap_db_end (void); |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:42:27
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105 Modified Files: roadmap_config.c roadmap_config.h Log Message: Modify config enumeration to allow adding values. Index: roadmap_config.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_config.c 1 Dec 2005 16:49:35 -0000 1.2 --- roadmap_config.c 2 May 2006 12:42:22 -0000 1.3 *************** *** 221,226 **** ! static void roadmap_config_add_enumeration_value (RoadMapConfigItem *item, ! const char *value) { RoadMapConfigEnum *new_value; --- 221,226 ---- ! void roadmap_config_add_enumeration_value (RoadMapConfigItem *item, ! const char *value) { RoadMapConfigEnum *new_value; *************** *** 257,261 **** ! void roadmap_config_declare_enumeration (const char *config, RoadMapConfigDescriptor *descriptor, const char *enumeration_value, ...) { --- 257,261 ---- ! RoadMapConfigItem *roadmap_config_declare_enumeration (const char *config, RoadMapConfigDescriptor *descriptor, const char *enumeration_value, ...) { *************** *** 290,293 **** --- 290,295 ---- } va_end(ap); + + return item; } Index: roadmap_config.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_config.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** roadmap_config.h 15 Oct 2005 22:18:48 -0000 1.1.1.1 --- roadmap_config.h 2 May 2006 12:42:22 -0000 1.2 *************** *** 57,64 **** RoadMapConfigDescriptor *descriptor, const char *default_value); ! void roadmap_config_declare_enumeration (const char *file, RoadMapConfigDescriptor *descriptor, const char *enumeration_value, ...); void roadmap_config_declare_color (const char *file, --- 57,67 ---- RoadMapConfigDescriptor *descriptor, const char *default_value); ! RoadMapConfigItem *roadmap_config_declare_enumeration (const char *file, RoadMapConfigDescriptor *descriptor, const char *enumeration_value, ...); + void roadmap_config_add_enumeration_value (RoadMapConfigItem *item, + const char *value); + void roadmap_config_declare_color (const char *file, |
|
From: Ehud S. <esh...@us...> - 2006-05-02 12:41:24
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16258 Modified Files: roadmap_canvas.h roadmap_canvas_agg.h Log Message: Fix image draw. Index: roadmap_canvas.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_canvas.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_canvas.h 29 Apr 2006 11:04:50 -0000 1.3 --- roadmap_canvas.h 2 May 2006 12:41:17 -0000 1.4 *************** *** 33,36 **** --- 33,39 ---- #include "roadmap_gui.h" + enum { IMAGE_NORAML, + IMAGE_SELECTED + }; struct roadmap_canvas_pen; *************** *** 147,151 **** void roadmap_canvas_draw_image (RoadMapImage image, RoadMapGuiPoint *pos, ! int opacity); #endif // INCLUDE__ROADMAP_CANVAS__H --- 150,154 ---- void roadmap_canvas_draw_image (RoadMapImage image, RoadMapGuiPoint *pos, ! int opacity, int mode); #endif // INCLUDE__ROADMAP_CANVAS__H Index: roadmap_canvas_agg.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_canvas_agg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_canvas_agg.h 29 Apr 2006 11:27:17 -0000 1.1 --- roadmap_canvas_agg.h 2 May 2006 12:41:17 -0000 1.2 *************** *** 31,35 **** struct roadmap_canvas_image { agg::rendering_buffer rbuf; ! agg::pixfmt_rgb24 pixfmt; roadmap_canvas_image():pixfmt(rbuf) {} --- 31,35 ---- struct roadmap_canvas_image { agg::rendering_buffer rbuf; ! agg::pixfmt_bgr24 pixfmt; roadmap_canvas_image():pixfmt(rbuf) {} |
