From c4904c53ecca5faeb35ccc2da4233edc109bcba6 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 9 Jun 2011 02:28:03 +1000 Subject: [PATCH] Fixes to the last thing --- Projects/CodeBlocks/SleepyHead.depend | 4 ++-- src/graphs/graph.cpp | 10 +++++----- src/version.h | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 294f932c..dcd096be 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8304,7 +8304,7 @@ -1307549946 /home/mark/projects/git/sleepyhead/src/version.h +1307550402 /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" -1307549075 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307550289 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index adf0b56c..82173a53 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -311,7 +311,7 @@ void gGraphWindow::OnMouseMove(wxMouseEvent &event) ex=rmaxx; qx=ex-dx; } - m_foobar_moved+=fabs((qx-minx)); + m_foobar_moved+=fabs((qx-minx))+fabs((m_mouseLClick.x-x))+fabs((m_mouseLClick.y-y)); SetXBounds(qx,ex); } else @@ -396,10 +396,10 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event) int width=m_scrX-GetRightMargin()-GetLeftMargin(); int height=m_scrY-GetBottomMargin()-GetTopMargin(); wxRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area. + m_mouseLClick.x = x; + m_mouseLClick.y = y; if (hot1.Contains(x,y)) { - m_mouseLClick.x = x; - m_mouseLClick.y = y; m_mouseLDown=true; } else if ((y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20)) { double rx=RealMaxX()-RealMinX(); @@ -456,10 +456,9 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) for (list::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { (*g)->SetXBounds(min,max); } - m_drag_foobar=false; } - if (hot1.Contains(x,y) || zoom_in) { + if ((!m_drag_foobar && hot1.Contains(x,y)) || zoom_in) { wxPoint release(event.GetX(), m_scrY-m_marginBottom); wxPoint press(m_mouseLClick.x, m_marginTop); //wxDateTime a,b; @@ -491,6 +490,7 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) } + m_drag_foobar=false; event.Skip(); } diff --git a/src/version.h b/src/version.h index 81a3f1e7..08f8cf6c 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 3836; - static const long REVISION = 4149; + static const long BUILD = 3843; + static const long REVISION = 4191; //Miscellaneous Version Types - static const long BUILDS_COUNT = 1829; - #define RC_FILEVERSION 0,7,3836,4149 - #define RC_FILEVERSION_STRING "0, 7, 3836, 4149\0" - static const char FULLVERSION_STRING[] = "0.7.3836.4149"; + static const long BUILDS_COUNT = 1848; + #define RC_FILEVERSION 0,7,3843,4191 + #define RC_FILEVERSION_STRING "0, 7, 3843, 4191\0" + static const char FULLVERSION_STRING[] = "0.7.3843.4191"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;