From 65402ed566206d7a3711a1700813a0f4b44b6f6b Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 9 Jun 2011 00:04:32 +1000 Subject: [PATCH] More FooBars fixes --- Projects/CodeBlocks/SleepyHead.depend | 4 ++-- src/graphs/graph.cpp | 26 +++++++++++++------------- src/version.h | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 9617b947..15c8f2ae 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8304,7 +8304,7 @@ -1307541070 /home/mark/projects/git/sleepyhead/src/version.h +1307541836 /home/mark/projects/git/sleepyhead/src/version.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8341,7 +8341,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1307540973 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307541170 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index c06f77ec..cbfbe437 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -419,8 +419,8 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) int height=m_scrY-GetBottomMargin()-GetTopMargin(); wxRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area. - if (!hot1.Contains(x,y)) { - double rx=RealMaxX()-RealMinX(); + + /*double rx=RealMaxX()-RealMinX(); double qx=double(width)/rx; double minx=MinX()-RealMinX(); @@ -436,7 +436,17 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) if ((x>x1) && (x::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { + (*g)->SetXBounds(min,max); + } + m_drag_foobar=false; + + } else if (hot1.Contains(x,y)) { wxPoint release(event.GetX(), m_scrY-m_marginBottom); wxPoint press(m_mouseLClick.x, m_marginTop); m_mouseLDown=false; @@ -465,16 +475,6 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) m_mouseRBrect=r; } - if (m_drag_foobar) { - // wxLogMessage("Foobar Released"); - double min=MinX(); - double max=MaxX(); - for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { - (*g)->SetXBounds(min,max); - } - - } - m_drag_foobar=false; event.Skip(); } diff --git a/src/version.h b/src/version.h index 4760a703..82eded03 100644 --- a/src/version.h +++ b/src/version.h @@ -4,7 +4,7 @@ namespace AutoVersion{ //Date Version Types - static const char DATE[] = "08"; + static const char DATE[] = "09"; 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 = 3796; - static const long REVISION = 3929; + static const long BUILD = 3797; + static const long REVISION = 3939; //Miscellaneous Version Types - static const long BUILDS_COUNT = 1734; - #define RC_FILEVERSION 0,7,3796,3929 - #define RC_FILEVERSION_STRING "0, 7, 3796, 3929\0" - static const char FULLVERSION_STRING[] = "0.7.3796.3929"; + static const long BUILDS_COUNT = 1739; + #define RC_FILEVERSION 0,7,3797,3939 + #define RC_FILEVERSION_STRING "0, 7, 3797, 3939\0" + static const char FULLVERSION_STRING[] = "0.7.3797.3939"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;