chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to the last thing

Browse Source
This commit is contained in:
Mark Watkins 2011-06-09 02:28:03 +10:00
parent f7bf0346e8
commit c4904c53ec
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8304,7 +8304,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8341,7 +8341,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.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
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/log.h> <wx/log.h>

10
src/graphs/graph.cpp
View File

@ -311,7 +311,7 @@ void gGraphWindow::OnMouseMove(wxMouseEvent &event)
ex=rmaxx; ex=rmaxx;
qx=ex-dx; 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); SetXBounds(qx,ex);
} else } else
@ -396,10 +396,10 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
int width=m_scrX-GetRightMargin()-GetLeftMargin(); int width=m_scrX-GetRightMargin()-GetLeftMargin();
int height=m_scrY-GetBottomMargin()-GetTopMargin(); int height=m_scrY-GetBottomMargin()-GetTopMargin();
wxRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area. wxRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area.
m_mouseLClick.x = x;
m_mouseLClick.y = y;
if (hot1.Contains(x,y)) { if (hot1.Contains(x,y)) {
m_mouseLClick.x = x;
m_mouseLClick.y = y;
m_mouseLDown=true; m_mouseLDown=true;
} else if ((y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20)) { } else if ((y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20)) {
double rx=RealMaxX()-RealMinX(); double rx=RealMaxX()-RealMinX();
@ -456,10 +456,9 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
for (list<gGraphWindow *>::iterator g=link_zoom.begin();g!=link_zoom.end();g++) { for (list<gGraphWindow *>::iterator g=link_zoom.begin();g!=link_zoom.end();g++) {
(*g)->SetXBounds(min,max); (*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 release(event.GetX(), m_scrY-m_marginBottom);
wxPoint press(m_mouseLClick.x, m_marginTop); wxPoint press(m_mouseLClick.x, m_marginTop);
//wxDateTime a,b; //wxDateTime a,b;
@ -491,6 +490,7 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
} }
m_drag_foobar=false;
event.Skip(); event.Skip();
} }

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 3836; static const long BUILD = 3843;
static const long REVISION = 4149; static const long REVISION = 4191;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 1829; static const long BUILDS_COUNT = 1848;
#define RC_FILEVERSION 0,7,3836,4149 #define RC_FILEVERSION 0,7,3843,4191
#define RC_FILEVERSION_STRING "0, 7, 3836, 4149\0" #define RC_FILEVERSION_STRING "0, 7, 3843, 4191\0"
static const char FULLVERSION_STRING[] = "0.7.3836.4149"; static const char FULLVERSION_STRING[] = "0.7.3843.4191";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;