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

Round dots in Waveform overlays

Browse Source
This commit is contained in:
Mark Watkins 2011-06-11 21:15:14 +10:00
parent 8eb010bb3f
commit 8200684efe
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307790119 /home/mark/projects/git/sleepyhead/src/version.h 1307790758 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8344,7 +8344,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307790156 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307790757 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h> <wx/graphics.h>

15
src/graphs/graph.cpp
View File

@ -2015,6 +2015,8 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
//wxBrush brush(*color[0],wxFDIAGONAL_HATCH); //wxBrush brush(*color[0],wxFDIAGONAL_HATCH);
//dc.SetBrush(brush); //dc.SetBrush(brush);
glEnable(GL_POINT_SMOOTH);
glEnable( GL_BLEND );
wxColor & col=color[0]; wxColor & col=color[0];
for (int n=0;n<data->VC();n++) { for (int n=0;n<data->VC();n++) {
@ -2061,10 +2063,9 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
//dc.DrawLine(x1,start_py+25,x1,start_py+height-25); //dc.DrawLine(x1,start_py+25,x1,start_py+height-25);
glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha()); glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha());
glLineWidth (4); glPointSize(6);
glBegin(GL_LINES); glBegin(GL_POINTS);
glVertex2f(x1,start_py+27); glVertex2f(x1,start_py+25);
glVertex2f(x1,start_py+23);
glEnd(); glEnd();
//dc.DrawLine(x1,start_py+25,x1,start_py+25); //dc.DrawLine(x1,start_py+25,x1,start_py+25);
@ -2076,9 +2077,9 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
} }
} else if (lo_type==LOT_Dot) { } else if (lo_type==LOT_Dot) {
glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha()); glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha());
glLineWidth (4); glPointSize(4);
glBegin(GL_LINES); glBegin(GL_POINTS);
glVertex2f(x1,start_py+(height/2)-10); //glVertex2f(x1,start_py+(height/2)-10);
glVertex2f(x1,start_py+(height/2)-14); glVertex2f(x1,start_py+(height/2)-14);
glEnd(); glEnd();
//dc.SetPen(sfp3); //dc.SetPen(sfp3);

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 = 4719; static const long BUILD = 4725;
static const long REVISION = 8992; static const long REVISION = 9029;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 3743; static const long BUILDS_COUNT = 3761;
#define RC_FILEVERSION 0,7,4719,8992 #define RC_FILEVERSION 0,7,4725,9029
#define RC_FILEVERSION_STRING "0, 7, 4719, 8992\0" #define RC_FILEVERSION_STRING "0, 7, 4725, 9029\0"
static const char FULLVERSION_STRING[] = "0.7.4719.8992"; static const char FULLVERSION_STRING[] = "0.7.4725.9029";
//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;