From 509d1fbd5a97e5de0302bc0a490ba6b91f423ddc Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 10 Jun 2011 01:50:17 +1000 Subject: [PATCH] wx2.8 string fixes --- Projects/CodeBlocks/SleepyHead.depend | 16 ++++++++-------- src/SleepyHeadMain.cpp | 2 +- src/graphs/graph.cpp | 17 ++++++++++++----- .../sleeplib/loader_plugins/cms50_loader.cpp | 2 +- src/libs/sleeplib/loader_plugins/zeo_loader.cpp | 2 +- src/libs/sleeplib/profiles.cpp | 6 +++--- src/libs/sleeplib/prs1_loader.cpp | 2 +- src/libs/sleeplib/prs1_loader.h | 11 ++++++++++- src/version.h | 14 +++++++------- 9 files changed, 44 insertions(+), 28 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 53a075a1..30fc4483 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8304,9 +8304,9 @@ -1307627183 /home/mark/projects/git/sleepyhead/src/version.h +1307634592 /home/mark/projects/git/sleepyhead/src/version.h -1307623481 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h +1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" "machine_loader.h" "profiles.h" @@ -8322,7 +8322,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307627009 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307627613 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -8342,7 +8342,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1307618429 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307632925 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp @@ -8379,7 +8379,7 @@ "preferences.h" -1307626707 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp +1307634563 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp @@ -8392,7 +8392,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1307622945 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp +1307627182 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp @@ -8425,7 +8425,7 @@ 1307620082 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.h "sleeplib/machine_loader.h" -1307620453 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.cpp +1307634499 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/cms50_loader.cpp "cms50_loader.h" @@ -8434,7 +8434,7 @@ 1307620144 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/zeo_loader.h "sleeplib/machine_loader.h" -1307620439 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/zeo_loader.cpp +1307634514 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/loader_plugins/zeo_loader.cpp "zeo_loader.h" "sleeplib/machine.h" diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index 65e617b6..f9ad02b7 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -674,7 +674,7 @@ Daily::Daily(wxWindow *win,Profile *p) PRD->AddLayer(new gXAxis(wxBLACK)); PRD->AddLayer(new gYAxis(wxBLACK)); PRD->AddLayer(new gFooBar()); - PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false,false,false)); + PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false,false,true)); PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true,true)); PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false,true,true)); diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 92b04439..adf811cd 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -649,8 +649,12 @@ void gGraphWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) wxRect r=wxRect(0,0,m_scrX,m_scrY); - dc.GradientFillLinear(r,*gradient_start_color,*gradient_end_color,gradient_direction); - //dc.DrawRectangle(0,0,m_scrX,m_scrY); + bool fruit=pref["fruitsalad"]; + if (fruit) { + dc.GradientFillLinear(r,*gradient_start_color,*gradient_end_color,gradient_direction); + } else { + dc.DrawRectangle(0,0,m_scrX,m_scrY); + } //wxLogMessage(wxT("Paint")); //dc.DrawText(m_title,m_marginLeft,3); @@ -659,13 +663,16 @@ void gGraphWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) } static wxPen pen(*wxDARK_GREY, 1, wxDOT); - static wxColor sel(40,40,40,128); + static wxColor sel(128,128,128,128); static wxBrush brush2(sel,wxFDIAGONAL_HATCH); if (m_mouseLDown) { dc.SetPen(pen); - dc.SetBrush(brush2); - //dc.SetBrush(*wxTRANSPARENT_BRUSH); + if (fruit) { + dc.SetBrush(brush2); + } else { + dc.SetBrush(*wxTRANSPARENT_BRUSH); + } if (m_mouseRBrect.width>0) dc.DrawRectangle(m_mouseRBrect); } diff --git a/src/libs/sleeplib/loader_plugins/cms50_loader.cpp b/src/libs/sleeplib/loader_plugins/cms50_loader.cpp index 07179c88..063d0dc6 100644 --- a/src/libs/sleeplib/loader_plugins/cms50_loader.cpp +++ b/src/libs/sleeplib/loader_plugins/cms50_loader.cpp @@ -268,7 +268,7 @@ Machine *CMS50Loader::CreateMachine(Profile *profile) m->SetClass(cms50_class_name); m->properties[wxT("Brand")]=wxT("Contec"); m->properties[wxT("Model")]=wxT("CMS50X"); - m->properties[wxT("DataVersion")]=wxString::Format("%li",cms50_data_version); + m->properties[wxT("DataVersion")]=wxString::Format(wxT("%i"),cms50_data_version); profile->AddMachine(m); return m; diff --git a/src/libs/sleeplib/loader_plugins/zeo_loader.cpp b/src/libs/sleeplib/loader_plugins/zeo_loader.cpp index a5772217..0ffdeaf6 100644 --- a/src/libs/sleeplib/loader_plugins/zeo_loader.cpp +++ b/src/libs/sleeplib/loader_plugins/zeo_loader.cpp @@ -57,7 +57,7 @@ Machine *ZEOLoader::CreateMachine(Profile *profile) m->SetClass(zeo_class_name); m->properties[wxT("Brand")]=wxT("ZEO"); m->properties[wxT("Model")]=wxT("Personal Sleep Coach"); - m->properties[wxT("DataVersion")]=wxString::Format("%li",zeo_data_version); + m->properties[wxT("DataVersion")]=wxString::Format(wxT("%i"),zeo_data_version); profile->AddMachine(m); diff --git a/src/libs/sleeplib/profiles.cpp b/src/libs/sleeplib/profiles.cpp index 7e236974..dcc8b73a 100644 --- a/src/libs/sleeplib/profiles.cpp +++ b/src/libs/sleeplib/profiles.cpp @@ -61,8 +61,8 @@ void Profile::LoadMachineData() long v=loader->Version(); long cv=0; if (m->properties.find(wxT("DataVersion"))==m->properties.end()) - m->properties[wxT("DataVersion")]=wxString::Format("%i",0); - m->properties["DataVersion"].ToLong(&cv); + m->properties[wxT("DataVersion")]=wxString::Format(wxT("%i"),0); + m->properties[wxT("DataVersion")].ToLong(&cv); if (cvproperties[wxT("Brand")]+wxT(" ")+m->properties[wxT("Model")]+wxT(" ")+m->properties[wxT("Serial")]; @@ -73,7 +73,7 @@ void Profile::LoadMachineData() if (wxMessageBox(msg,wxT("Machine Database Changes"),wxYES_NO,NULL)==wxYES) { if (m->Purge(3478216)) { // Do not copy this line without thinking.. You will be eaten by a Grue if you do - m->properties["DataVersion"]=wxString::Format("%li",v); // Dont need to nag again if they are too lazy. + m->properties[wxT("DataVersion")]=wxString::Format(wxT("%li"),v); // Dont need to nag again if they are too lazy. } } } else m->Load(); diff --git a/src/libs/sleeplib/prs1_loader.cpp b/src/libs/sleeplib/prs1_loader.cpp index efc53fcb..871da925 100644 --- a/src/libs/sleeplib/prs1_loader.cpp +++ b/src/libs/sleeplib/prs1_loader.cpp @@ -360,7 +360,7 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path,Profile *profile) //wxPrintf(sess->start().Format()+wxT(" avgsummary=%.3f avgmine=%.3f\n"),sess->summary[CPAP_PressureAverage].GetDouble(),sess->weighted_avg_event_field(CPAP_Pressure,0)); sess->SetChanged(true); } - m->properties["DataVersion"]=wxString::Format("%i",prs1_data_version); + m->properties[wxT("DataVersion")]=wxString::Format(wxT("%i"),prs1_data_version); m->Save(); // Save any new sessions to disk in our format if (loader_progress) loader_progress->Update(100); return true; diff --git a/src/libs/sleeplib/prs1_loader.h b/src/libs/sleeplib/prs1_loader.h index 0e8e34cd..5f69e04c 100644 --- a/src/libs/sleeplib/prs1_loader.h +++ b/src/libs/sleeplib/prs1_loader.h @@ -15,6 +15,16 @@ License: GPL #include "machine_loader.h" #include "profiles.h" + +//******************************************************************************************** +/// IMPORTANT!!! +//******************************************************************************************** +// Please INCREMENT the following value when making changes to this loaders implementation. +// +const int prs1_data_version=1; +// +//******************************************************************************************** + class PRS1:public CPAP { public: @@ -25,7 +35,6 @@ public: const int max_load_buffer_size=384*1024; -const int prs1_data_version=1; const wxString prs1_class_name=wxT("PRS1"); diff --git a/src/version.h b/src/version.h index b7a114f2..a199bede 100644 --- a/src/version.h +++ b/src/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "09"; + static const char DATE[] = "10"; static const char MONTH[] = "06"; static const char YEAR[] = "2011"; static const char UBUNTU_VERSION_STYLE[] = "11.06"; @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 4224; - static const long REVISION = 6281; + static const long BUILD = 4240; + static const long REVISION = 6350; //Miscellaneous Version Types - static const long BUILDS_COUNT = 2704; - #define RC_FILEVERSION 0,7,4224,6281 - #define RC_FILEVERSION_STRING "0, 7, 4224, 6281\0" - static const char FULLVERSION_STRING[] = "0.7.4224.6281"; + static const long BUILDS_COUNT = 2742; + #define RC_FILEVERSION 0,7,4240,6350 + #define RC_FILEVERSION_STRING "0, 7, 4240, 6350\0" + static const char FULLVERSION_STRING[] = "0.7.4240.6350"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;