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

More FooBars fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-06-09 00:04:32 +10:00
parent eaaae3cda8
commit 65402ed566
3 changed files with 22 additions and 22 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>
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 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"
1307540973 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307541170 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>

26
src/graphs/graph.cpp
View File

@ -419,8 +419,8 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
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.
if (!hot1.Contains(x,y)) {
double rx=RealMaxX()-RealMinX(); /*double rx=RealMaxX()-RealMinX();
double qx=double(width)/rx; double qx=double(width)/rx;
double minx=MinX()-RealMinX(); double minx=MinX()-RealMinX();
@ -436,7 +436,17 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
if ((x>x1) && (x<x2)) { if ((x>x1) && (x<x2)) {
// wxLogMessage("Foobar Area Pushed"); // wxLogMessage("Foobar Area Pushed");
} }
} else { } */
if (m_drag_foobar) {
// wxLogMessage("Foobar Released");
double min=MinX();
double max=MaxX();
for (list<gGraphWindow *>::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 release(event.GetX(), m_scrY-m_marginBottom);
wxPoint press(m_mouseLClick.x, m_marginTop); wxPoint press(m_mouseLClick.x, m_marginTop);
m_mouseLDown=false; m_mouseLDown=false;
@ -465,16 +475,6 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
m_mouseRBrect=r; m_mouseRBrect=r;
} }
if (m_drag_foobar) {
// wxLogMessage("Foobar Released");
double min=MinX();
double max=MaxX();
for (list<gGraphWindow *>::iterator g=link_zoom.begin();g!=link_zoom.end();g++) {
(*g)->SetXBounds(min,max);
}
}
m_drag_foobar=false;
event.Skip(); event.Skip();
} }

14
src/version.h
View File

@ -4,7 +4,7 @@
namespace AutoVersion{ namespace AutoVersion{
//Date Version Types //Date Version Types
static const char DATE[] = "08"; static const char DATE[] = "09";
static const char MONTH[] = "06"; static const char MONTH[] = "06";
static const char YEAR[] = "2011"; static const char YEAR[] = "2011";
static const char UBUNTU_VERSION_STYLE[] = "11.06"; static const char UBUNTU_VERSION_STYLE[] = "11.06";
@ -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 = 3796; static const long BUILD = 3797;
static const long REVISION = 3929; static const long REVISION = 3939;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 1734; static const long BUILDS_COUNT = 1739;
#define RC_FILEVERSION 0,7,3796,3929 #define RC_FILEVERSION 0,7,3797,3939
#define RC_FILEVERSION_STRING "0, 7, 3796, 3929\0" #define RC_FILEVERSION_STRING "0, 7, 3797, 3939\0"
static const char FULLVERSION_STRING[] = "0.7.3796.3929"; static const char FULLVERSION_STRING[] = "0.7.3797.3939";
//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;