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

Line Graph Clipping Crash reared its ugly head again

Browse Source
This commit is contained in:
Mark Watkins 2011-06-09 20:57:15 +10:00
parent b861bf1543
commit c416f07771
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8304,7 +8304,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307614937 /home/mark/projects/git/sleepyhead/src/version.h 1307616952 /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"
@ -8321,7 +8321,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307614937 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp 1307615758 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -8341,7 +8341,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307614762 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307615111 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>

4
src/SleepyHeadMain.cpp
View File

@ -695,7 +695,7 @@ Daily::Daily(wxWindow *win,Profile *p)
SF=new gGraphWindow(ScrolledWindow,-1,wxT("Event Flags"),wxPoint(0,0), wxSize(600,180), wxNO_BORDER); SF=new gGraphWindow(ScrolledWindow,-1,wxT("Event Flags"),wxPoint(0,0), wxSize(600,180), wxNO_BORDER);
// SF->SetMargins(10,15,20,80); // SF->SetMargins(10,15,20,80);
/* SF->LinkZoom(FRW); SF->LinkZoom(FRW);
FRW->LinkZoom(SF); FRW->LinkZoom(SF);
#if defined(__UNIX__) #if defined(__UNIX__)
FRW->LinkZoom(PRD); FRW->LinkZoom(PRD);
@ -704,7 +704,7 @@ Daily::Daily(wxWindow *win,Profile *p)
SF->LinkZoom(PRD); // Uncomment to link in more graphs.. Too slow on windows. SF->LinkZoom(PRD); // Uncomment to link in more graphs.. Too slow on windows.
SF->LinkZoom(LEAK); SF->LinkZoom(LEAK);
SF->LinkZoom(SNORE); SF->LinkZoom(SNORE);
#endif */ #endif
const int sfc=9; const int sfc=9;

4
src/graphs/graph.cpp
View File

@ -1561,12 +1561,12 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
py=height - ((point[i].y - miny) * ymult); py=height - ((point[i].y - miny) * ymult);
// Can't avoid this.. SetClippingRegion does not work without crashing.. need to find a workaround:( // Can't avoid this.. SetClippingRegion does not work without crashing.. need to find a workaround:(
/* if (px<0) { if (px<0) {
px=0; px=0;
} }
if (px>width) { if (px>width) {
px=width; px=width;
} */ }
if (accel) { if (accel) {
int z=round(px); int z=round(px);

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 = 4129; static const long BUILD = 4132;
static const long REVISION = 5771; static const long REVISION = 5787;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 2508; static const long BUILDS_COUNT = 2515;
#define RC_FILEVERSION 0,7,4129,5771 #define RC_FILEVERSION 0,7,4132,5787
#define RC_FILEVERSION_STRING "0, 7, 4129, 5771\0" #define RC_FILEVERSION_STRING "0, 7, 4132, 5787\0"
static const char FULLVERSION_STRING[] = "0.7.4129.5771"; static const char FULLVERSION_STRING[] = "0.7.4132.5787";
//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;