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

Moved X/Y axes to their own layer

Browse Source
This commit is contained in:
Mark Watkins 2011-05-31 08:53:48 +10:00
parent 64600702b5
commit 4956784ee4
7 changed files with 343 additions and 583 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SleepyHead.cbp
View File

@ -58,7 +58,7 @@
<Add directory="graphs" /> <Add directory="graphs" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="`wx-config --version=2.8 --libs richtext,aui,xrc,qa,html,adv,core,xml,net,base`" /> <Add option="`wx-config --version=2.8 --libs aui,xrc,qa,html,adv,core,net,base`" />
</Linker> </Linker>
<Unit filename="GUIFrame.cpp" /> <Unit filename="GUIFrame.cpp" />
<Unit filename="GUIFrame.h" /> <Unit filename="GUIFrame.h" />

11
SleepyHead.depend
View File

@ -7871,11 +7871,11 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306761730 /home/mark/projects/git/sleepyhead/graphs/graph.h 1306795897 /home/mark/projects/git/sleepyhead/graphs/graph.h
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1306762407 /home/mark/projects/git/sleepyhead/version.h 1306795962 /home/mark/projects/git/sleepyhead/version.h
1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7892,10 +7892,11 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306761931 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp 1306794879 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
"wx_pch.h" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
<wx/icon.h>
<wx/msgdlg.h> <wx/msgdlg.h>
<wx/dirdlg.h> <wx/dirdlg.h>
<wx/progdlg.h> <wx/progdlg.h>
@ -7908,7 +7909,7 @@
"SleepyHeadMain.h" "SleepyHeadMain.h"
"sleeplib/profiles.h" "sleeplib/profiles.h"
1306761778 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp 1306795843 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/log.h> <wx/log.h>
@ -8077,3 +8078,5 @@
"wx/hashmap.h" "wx/hashmap.h"
"wx/bitmap.h" "wx/bitmap.h"
1306766429 /home/mark/Downloads/burn48.xpm

35
SleepyHead.layout
View File

@ -4,20 +4,23 @@
<File name="GUIFrame.cpp" open="0" top="0" tabpos="7"> <File name="GUIFrame.cpp" open="0" top="0" tabpos="7">
<Cursor position="1774" topLine="0" /> <Cursor position="1774" topLine="0" />
</File> </File>
<File name="GUIFrame.h" open="0" top="0" tabpos="0">
<Cursor position="3804" topLine="70" />
</File>
<File name="SleepyHeadApp.cpp" open="0" top="0" tabpos="9"> <File name="SleepyHeadApp.cpp" open="0" top="0" tabpos="9">
<Cursor position="1346" topLine="14" /> <Cursor position="1346" topLine="14" />
</File> </File>
<File name="SleepyHeadMain.cpp" open="1" top="0" tabpos="3"> <File name="SleepyHeadMain.cpp" open="1" top="1" tabpos="3">
<Cursor position="16541" topLine="457" /> <Cursor position="1311" topLine="21" />
</File> </File>
<File name="SleepyHeadMain.h" open="1" top="0" tabpos="4"> <File name="SleepyHeadMain.h" open="1" top="0" tabpos="4">
<Cursor position="2066" topLine="34" /> <Cursor position="1160" topLine="15" />
</File> </File>
<File name="graphs/graph.cpp" open="1" top="0" tabpos="6"> <File name="graphs/graph.cpp" open="1" top="0" tabpos="6">
<Cursor position="41086" topLine="1510" /> <Cursor position="623" topLine="0" />
</File> </File>
<File name="graphs/graph.h" open="1" top="0" tabpos="5"> <File name="graphs/graph.h" open="1" top="0" tabpos="5">
<Cursor position="10773" topLine="300" /> <Cursor position="10890" topLine="315" />
</File> </File>
<File name="libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11"> <File name="libs/sleeplib/binary_file.cpp" open="0" top="0" tabpos="11">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
@ -26,10 +29,10 @@
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="libs/sleeplib/machine.cpp" open="1" top="0" tabpos="1"> <File name="libs/sleeplib/machine.cpp" open="1" top="0" tabpos="1">
<Cursor position="20308" topLine="691" /> <Cursor position="8242" topLine="226" />
</File> </File>
<File name="libs/sleeplib/machine.h" open="1" top="0" tabpos="2"> <File name="libs/sleeplib/machine.h" open="1" top="0" tabpos="2">
<Cursor position="2173" topLine="55" /> <Cursor position="2747" topLine="84" />
</File> </File>
<File name="libs/sleeplib/machine_loader.cpp" open="0" top="0" tabpos="8"> <File name="libs/sleeplib/machine_loader.cpp" open="0" top="0" tabpos="8">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
@ -37,22 +40,22 @@
<File name="libs/sleeplib/machine_loader.h" open="0" top="0" tabpos="15"> <File name="libs/sleeplib/machine_loader.h" open="0" top="0" tabpos="15">
<Cursor position="0" topLine="0" /> <Cursor position="0" topLine="0" />
</File> </File>
<File name="libs/sleeplib/preferences.cpp" open="1" top="0" tabpos="9"> <File name="libs/sleeplib/preferences.cpp" open="0" top="0" tabpos="9">
<Cursor position="5120" topLine="160" /> <Cursor position="5120" topLine="14" />
</File> </File>
<File name="libs/sleeplib/preferences.h" open="0" top="0" tabpos="16"> <File name="libs/sleeplib/preferences.h" open="0" top="0" tabpos="16">
<Cursor position="31" topLine="0" /> <Cursor position="31" topLine="0" />
</File> </File>
<File name="libs/sleeplib/profiles.cpp" open="1" top="0" tabpos="10"> <File name="libs/sleeplib/profiles.cpp" open="1" top="0" tabpos="7">
<Cursor position="1342" topLine="38" /> <Cursor position="4026" topLine="142" />
</File> </File>
<File name="libs/sleeplib/profiles.h" open="0" top="0" tabpos="17"> <File name="libs/sleeplib/profiles.h" open="1" top="0" tabpos="8">
<Cursor position="28" topLine="0" /> <Cursor position="628" topLine="5" />
</File> </File>
<File name="libs/sleeplib/prs1_loader.cpp" open="1" top="1" tabpos="7"> <File name="libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="9">
<Cursor position="22943" topLine="679" /> <Cursor position="1473" topLine="97" />
</File> </File>
<File name="libs/sleeplib/prs1_loader.h" open="1" top="0" tabpos="8"> <File name="libs/sleeplib/prs1_loader.h" open="0" top="0" tabpos="8">
<Cursor position="1115" topLine="0" /> <Cursor position="1115" topLine="0" />
</File> </File>
<File name="libs/tinyxml/tinystr.cpp" open="0" top="0" tabpos="13"> <File name="libs/tinyxml/tinystr.cpp" open="0" top="0" tabpos="13">

17
SleepyHeadMain.cpp
View File

@ -17,6 +17,7 @@
#include "version.h" #include "version.h"
#include <wx/app.h> #include <wx/app.h>
#include <wx/icon.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/dirdlg.h> #include <wx/dirdlg.h>
#include <wx/progdlg.h> #include <wx/progdlg.h>
@ -28,11 +29,8 @@
#include <wx/fs_mem.h> #include <wx/fs_mem.h>
#include "SleepyHeadMain.h" #include "SleepyHeadMain.h"
#include "sleeplib/profiles.h" #include "sleeplib/profiles.h"
//#include "graphs/sleepflagsgraph.h"
//#include "graphs/cpap_wavegraph.h"
#if defined(__WXMSW__) #if defined(__WXMSW__)
extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL; extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL;
@ -324,6 +322,7 @@ Summary::Summary(wxWindow *win,Profile *_profile)
AHI=new gGraphWindow(ScrolledWindow,-1,wxT("AHI"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER); AHI=new gGraphWindow(ScrolledWindow,-1,wxT("AHI"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
AHI->SetMargins(10,15,60,80); AHI->SetMargins(10,15,60,80);
AHI->AddLayer(new gBarChart(ahidata,wxRED)); AHI->AddLayer(new gBarChart(ahidata,wxRED));
// AHI->AddLayer(new gXAxis(NULL,wxBLACK));
//AHI->AddLayer(new gLineChart(ahidata,wxRED)); //AHI->AddLayer(new gLineChart(ahidata,wxRED));
fgSizer->Add(AHI,1,wxEXPAND); fgSizer->Add(AHI,1,wxEXPAND);
@ -333,18 +332,23 @@ Summary::Summary(wxWindow *win,Profile *_profile)
PRESSURE->AddLayer(new gLineChart(pressure,wxBLUE,6192)); PRESSURE->AddLayer(new gLineChart(pressure,wxBLUE,6192));
PRESSURE->AddLayer(new gLineChart(pressure_eap,wxRED,6192,false,true)); PRESSURE->AddLayer(new gLineChart(pressure_eap,wxRED,6192,false,true));
PRESSURE->AddLayer(new gLineChart(pressure_iap,wxGREEN,6192,false,true)); PRESSURE->AddLayer(new gLineChart(pressure_iap,wxGREEN,6192,false,true));
PRESSURE->AddLayer(new gXAxis(NULL,wxBLACK));
fgSizer->Add(PRESSURE,1,wxEXPAND); fgSizer->Add(PRESSURE,1,wxEXPAND);
LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leak"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER); LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leak"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
LEAK->SetMargins(10,15,60,80); LEAK->SetMargins(10,15,60,80);
//LEAK->AddLayer(new gBarChart(leak,wxYELLOW)); //LEAK->AddLayer(new gBarChart(leak,wxYELLOW));
LEAK->AddLayer(new gLineChart(leak,wxYELLOW,6192)); LEAK->AddLayer(new gLineChart(leak,wxYELLOW,6192));
LEAK->AddLayer(new gXAxis(NULL,wxBLACK));
fgSizer->Add(LEAK,1,wxEXPAND); fgSizer->Add(LEAK,1,wxEXPAND);
USAGE=new gGraphWindow(ScrolledWindow,-1,wxT("Usage (Hours)"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER); USAGE=new gGraphWindow(ScrolledWindow,-1,wxT("Usage (Hours)"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
USAGE->SetMargins(10,15,60,80); USAGE->SetMargins(10,15,60,80);
USAGE->AddLayer(new gBarChart(usage,wxGREEN)); USAGE->AddLayer(new gBarChart(usage,wxGREEN));
//USAGE->AddLayer(new gXAxis(NULL,wxBLACK));
//USAGE->AddLayer(new gLineChart(usage,wxGREEN)); //USAGE->AddLayer(new gLineChart(usage,wxGREEN));
fgSizer->Add(USAGE,1,wxEXPAND); fgSizer->Add(USAGE,1,wxEXPAND);
@ -506,6 +510,7 @@ Daily::Daily(wxWindow *win,Profile *p)
AddData(leakdata=new PressureData(CPAP_Leak,0)); AddData(leakdata=new PressureData(CPAP_Leak,0));
LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leaks"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leaks"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false)); LEAK->AddLayer(new gLineChart(leakdata,wxPURPLE,4096,false));
LEAK->AddLayer(new gXAxis(NULL,wxBLACK));
AddData(pressure_iap=new PressureData(CPAP_IAP)); AddData(pressure_iap=new PressureData(CPAP_IAP));
AddData(pressure_eap=new PressureData(CPAP_EAP)); AddData(pressure_eap=new PressureData(CPAP_EAP));
@ -514,6 +519,7 @@ Daily::Daily(wxWindow *win,Profile *p)
PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false)); PRD->AddLayer(new gLineChart(prd,wxDARK_GREEN,4096,false));
PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true)); PRD->AddLayer(new gLineChart(pressure_iap,wxBLUE,4096,false,true));
PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false,true)); PRD->AddLayer(new gLineChart(pressure_eap,wxRED,4096,false,true));
PRD->AddLayer(new gXAxis(NULL,wxBLACK));
AddData(frw=new FlowData()); AddData(frw=new FlowData());
FRW=new gGraphWindow(ScrolledWindow,-1,wxT("Flow Rate"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); FRW=new gGraphWindow(ScrolledWindow,-1,wxT("Flow Rate"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
@ -539,9 +545,10 @@ Daily::Daily(wxWindow *win,Profile *p)
FRW->AddLayer(new gLineOverlayBar(flags[3],wxBLUE,wxT("H"))); FRW->AddLayer(new gLineOverlayBar(flags[3],wxBLUE,wxT("H")));
FRW->AddLayer(new gLineOverlayBar(flags[2],wxAQUA,wxT("OA"))); FRW->AddLayer(new gLineOverlayBar(flags[2],wxAQUA,wxT("OA")));
FRW->AddLayer(new gLineOverlayBar(flags[1],wxPURPLE,wxT("CA"))); FRW->AddLayer(new gLineOverlayBar(flags[1],wxPURPLE,wxT("CA")));
FRW->AddLayer(new gXAxis(NULL,wxBLACK));
SF=new gGraphWindow(ScrolledWindow,-1,wxT("Sleep Flags"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); SF=new gGraphWindow(ScrolledWindow,-1,wxT("Sleep Flags"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
SF->SetMargins(10,15,20,80); // SF->SetMargins(10,15,20,80);
SF->LinkZoom(FRW); SF->LinkZoom(FRW);
#if defined(__UNIX__) #if defined(__UNIX__)
@ -560,6 +567,8 @@ Daily::Daily(wxWindow *win,Profile *p)
SF->AddLayer(new gFlagsLine(flags[2],wxAQUA,wxT("OA"),2,sfc)); SF->AddLayer(new gFlagsLine(flags[2],wxAQUA,wxT("OA"),2,sfc));
SF->AddLayer(new gFlagsLine(flags[1],wxPURPLE,wxT("CA"),1,sfc)); SF->AddLayer(new gFlagsLine(flags[1],wxPURPLE,wxT("CA"),1,sfc));
SF->AddLayer(new gFlagsLine(flags[0],wxGREEN2,wxT("CSR"),0,sfc)); SF->AddLayer(new gFlagsLine(flags[0],wxGREEN2,wxT("CSR"),0,sfc));
SF->AddLayer(new gXAxis(NULL,wxBLACK));
fgSizer->Add(SF,1,wxEXPAND); fgSizer->Add(SF,1,wxEXPAND);
fgSizer->Add(G_AHI,1,wxEXPAND); fgSizer->Add(G_AHI,1,wxEXPAND);

795
graphs/graph.cpp
View File

@ -346,7 +346,7 @@ gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & titl
SetBackgroundColour( *wxWHITE ); SetBackgroundColour( *wxWHITE );
m_bgColour = *wxWHITE; m_bgColour = *wxWHITE;
m_fgColour = *wxBLACK; m_fgColour = *wxBLACK;
SetMargins(10, 15, 30, 80); SetMargins(10, 15, 32, 80);
m_block_move=false; m_block_move=false;
m_block_zoom=false; m_block_zoom=false;
@ -422,13 +422,17 @@ double gGraphWindow::MinX()
//f=false; //f=false;
bool first=true; bool first=true;
double val; double val,tmp;
for (auto l=layers.begin();l!=layers.end();l++) { for (auto l=layers.begin();l!=layers.end();l++) {
if (first) { if (first) {
val=(*l)->MinX(); val=(*l)->MinX();
if (!((val==(*l)->MaxX()) && (val==0)))
first=false; first=false;
} else { } else {
if ((*l)->MinX() < val) val = (*l)->MinX(); tmp=(*l)->MinX();
if (!((tmp==(*l)->MaxX()) && (tmp==0))) {
if (tmp < val) val = tmp;
}
} }
} }
@ -441,13 +445,18 @@ double gGraphWindow::MaxX()
//f=false; //f=false;
bool first=true; bool first=true;
double val; double val,tmp;
for (auto l=layers.begin();l!=layers.end();l++) { for (auto l=layers.begin();l!=layers.end();l++) {
if (first) { if (first) {
val=(*l)->MaxX(); val=(*l)->MaxX();
if (!((val==(*l)->MinX()) && (val==0)))
first=false; first=false;
} else { } else {
if ((*l)->MaxX() > val) val = (*l)->MaxX(); tmp=(*l)->MaxX();
if (!((tmp==(*l)->MinX()) && (tmp==0))) {
if (tmp > val) val = tmp;
}
} }
} }
return max_x=val; return max_x=val;
@ -504,13 +513,17 @@ double gGraphWindow::RealMinX()
//f=false; //f=false;
bool first=true; bool first=true;
double val; double val,tmp;
for (auto l=layers.begin();l!=layers.end();l++) { for (auto l=layers.begin();l!=layers.end();l++) {
if (first) { if (first) {
val=(*l)->RealMinX(); val=(*l)->RealMinX();
if (!((val==(*l)->RealMaxX()) && (val==0)))
first=false; first=false;
} else { } else {
if ((*l)->RealMinX() < val) val = (*l)->RealMinX(); tmp=(*l)->RealMinX();
if (!((tmp==(*l)->RealMaxX()) && (tmp==0))) { // Ignore this layer if both are 0
if (tmp < val) val = tmp;
}
} }
} }
return rmin_x=val; return rmin_x=val;
@ -522,13 +535,17 @@ double gGraphWindow::RealMaxX()
//f=false; //f=false;
bool first=true; bool first=true;
double val; double val,tmp;
for (auto l=layers.begin();l!=layers.end();l++) { for (auto l=layers.begin();l!=layers.end();l++) {
if (first) { if (first) {
val=(*l)->RealMaxX(); val=(*l)->RealMaxX();
if (!((val==(*l)->RealMinX()) && (val==0)))
first=false; first=false;
} else { } else {
if ((*l)->RealMaxX() > val) val = (*l)->RealMaxX(); tmp=(*l)->RealMaxX();
if (!((tmp==(*l)->RealMinX()) && (tmp==0))) { // Ignore this layer if both are 0
if (tmp > val) val = tmp;
}
} }
} }
return rmax_x=val; return rmax_x=val;
@ -619,6 +636,226 @@ void gGraphWindow::DataChanged(gLayer *layer)
} }
gXAxis::gXAxis(gPointData *d,const wxColor * col)
:gLayer(d)
{
if (col) {
color.clear();
color.push_back(col);
}
}
gXAxis::~gXAxis()
{
}
void gXAxis::Plot(wxDC & dc, gGraphWindow & w)
{
float px,py;
wxCoord x,y;
int scrx = w.GetScrX();
int scry = w.GetScrY();
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin();
int width=scrx-(start_px+w.GetRightMargin());
int height=scry-(start_py+w.GetBottomMargin());
dc.SetPen(*color[0]);
//wxDateTime d;
wxString fd=wxT("00:00:00:0000");
dc.GetTextExtent(fd,&x,&y);
double max_ticks=(x+25.0)/width; // y+50 for rotated text
double jj=1/max_ticks;
double xx=w.max_x-w.min_x;
double minor_tick=max_ticks*xx;
double st2=w.min_x; //double(int(frac*1440.0))/1440.0;
double st,q;
bool show_seconds=false;
bool show_milliseconds=false;
bool show_time=true;
double min_tick;
if (xx<1.5) {
int rounding[16]={12,24,48,72,96,144,288,720,1440,2880,5760,8640,17280,86400,172800,345600}; // time rounding
int ri;
for (ri=0;ri<16;ri++) {
st=round(st2*rounding[ri])/rounding[ri];
min_tick=round(minor_tick*rounding[ri])/rounding[ri];
q=xx/min_tick; // number of ticks that fits in range
if (q<=jj) break; // compared to number of ticks that fit on screen.
}
if (ri>8) show_seconds=true;
if (ri>=14) show_milliseconds=true;
if (min_tick<=0.25/86400.0)
min_tick=0.25/86400;
} else { // Day ticks..
show_time=false;
st=st2;
min_tick=1;
double mtiks=(x+20.0)/width;
double mt=mtiks*xx;
min_tick=mt;
if (min_tick<1) min_tick=1;
if (min_tick>10) min_tick=10;
}
// dc.SetPen(*wxBLACK_PEN);
double st3=st;
while (st3>w.min_x) {
st3-=min_tick/10.0;
}
st3+=min_tick/10.0;
py=start_py+height;
for (double i=st3; i<=w.max_x; i+=min_tick/10.0) {
if (i<w.min_x) continue;
//px=x2p(w,i);
px=w.x2p(i); //w.GetLeftMargin()+((i - w.min_x) * xmult);
dc.DrawLine(px,py,px,py+4);
}
while (st<w.min_x) {
st+=min_tick;
}
int hour,minute,second,millisecond;
wxDateTime d;
for (double i=st; i<=w.max_x; i+=min_tick) { //600.0/86400.0) {
d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors
if (show_time) {
minute=d.GetMinute();
hour=d.GetHour();
second=d.GetSecond();
millisecond=d.GetMillisecond();
if (show_milliseconds) {
fd=wxString::Format(wxT("%02i:%02i:%02i:%04i"),hour,minute,second,millisecond);
} else if (show_seconds) {
fd=wxString::Format(wxT("%02i:%02i:%02i"),hour,minute,second);
} else {
fd=wxString::Format(wxT("%02i:%02i"),hour,minute);
}
} else {
fd=d.Format(wxT("%e %b"));
}
// dc.GetTextExtent(fd,&x,&y);
// px=x2p(w,i);
px=w.x2p(i); //w.GetLeftMargin()+((i - w.min_x) * xmult);
dc.DrawLine(px,py,px,py+6);
dc.GetTextExtent(fd,&x,&y);
if (!show_time) {
dc.DrawRotatedText(fd, px-(y/2)+2, py+x+14, 90);
} else {
dc.DrawText(fd, px-(x/2), py+y);
}
}
}
gYAxis::gYAxis(gPointData *d,const wxColor * col)
:gLayer(d)
{
if (col) {
color.clear();
color.push_back(col);
}
m_show_major_lines=true;
m_show_minor_lines=true;
}
gYAxis::~gYAxis()
{
}
void gYAxis::Plot(wxDC & dc,gGraphWindow &w)
{
static wxColor wxDARK_GREY(0xA0,0xA0,0xA0,0xA0);
static wxPen pen1(*wxLIGHT_GREY, 1, wxDOT);
static wxPen pen2(wxDARK_GREY, 1, wxDOT);
wxCoord x,y,labelW=0;
int scrx = w.GetScrX();
int scry = w.GetScrY();
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin();
int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
dc.SetPen(*wxBLACK_PEN);
wxString fd=wxT("0");
dc.GetTextExtent(fd,&x,&y);
double max_yticksdiv=(y+15.0)/(height); // y+50 for rotated text
double max_yticks=1/max_yticksdiv;
double miny=w.min_y;
double maxy=w.max_y;
double yy=w.max_y-w.min_y;
double ymult=height/yy;
double major_ytick=max_yticksdiv*yy;
double min_ytick,q;
if (w.min_y>=0) {
int yrounding[9]={1,2,5,10,20,30,40,50,100}; // time rounding
int ry;
for (ry=0;ry<9;ry++) {
// st=round(st2*rounding[ry])/rounding[ry];
min_ytick=round(major_ytick*yrounding[ry])/yrounding[ry];
q=yy/min_ytick; // number of ticks that fits in range
if (q<=max_yticks) break; // compared to number of ticks that fit on screen.
}
} else {
min_ytick=60;
}
if (min_ytick<=0.25)
min_ytick=0.25;
int ty,h;
for (float i=w.min_y; i<w.max_y; i+=min_ytick/2) {
ty=(i - w.min_y) * ymult;
h=(start_py+height)-ty;
dc.DrawLine(start_px-4, h, start_px, h);
}
dc.SetPen(pen1);
for (double i=w.min_y; i<w.max_y; i+=min_ytick/2) {
ty=(i - w.min_y) * ymult;
h=(start_py+height)-ty;
if (m_show_minor_lines && (i > w.min_y))
dc.DrawLine(start_px+1,h,start_px+width,h);
}
for (double i=w.min_y; i<=w.max_y; i+=min_ytick) {
ty=(i - w.min_y) * ymult;
fd=Format(i); // Override this as a function.
dc.GetTextExtent(fd,&x,&y);
if (x>labelW) labelW=x;
h=(start_py+height)-ty;
dc.DrawText(fd,start_px-8-x,h - (y / 2));
dc.SetPen(*wxBLACK_PEN);
dc.DrawLine(start_px-6,h,start_px,h);
dc.SetPen(pen2);
if (m_show_major_lines && (i > w.min_y))
dc.DrawLine(start_px+1,h,start_px+width,h);
}
dc.GetTextExtent(w.Title(),&x,&y);
dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90);
}
gCandleStick::gCandleStick(gPointData *d,wxOrientation o) gCandleStick::gCandleStick(gPointData *d,wxOrientation o)
:gLayer(d) :gLayer(d)
{ {
@ -709,211 +946,18 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w)
gBarChart::gBarChart(gPointData *d,const wxColor *col,wxOrientation o) gBarChart::gBarChart(gPointData *d,const wxColor *col,wxOrientation o)
:gLayer(d),m_direction(o) :gLayer(d),m_direction(o)
{ {
m_show_grid=true;
m_show_minor_grid=true;
if (col) { if (col) {
color.clear(); color.clear();
color.push_back(col); color.push_back(col);
} }
Xaxis=new gXAxis(NULL,wxBLACK);
Yaxis=new gYAxis(NULL,wxBLACK);
} }
gBarChart::~gBarChart() gBarChart::~gBarChart()
{ {
delete Yaxis;
delete Xaxis;
} }
void gBarChart::DrawYTicks(wxDC & dc,gGraphWindow &w)
{
static wxColor wxDARK_GREY(0xA0,0xA0,0xA0,0xA0);
static wxPen pen1(*wxLIGHT_GREY, 1, wxDOT);
static wxPen pen2(wxDARK_GREY, 1, wxDOT);
wxCoord x,y,labelW=0;
int scrx = w.GetScrX();
int scry = w.GetScrY();
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin();
int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
dc.SetPen(*wxBLACK_PEN);
wxString fd=wxT("0");
dc.GetTextExtent(fd,&x,&y);
double max_yticksdiv=(y+15.0)/(height); // y+50 for rotated text
double max_yticks=1/max_yticksdiv;
double miny=w.min_y;
double maxy=w.max_y;
double yy=w.max_y-w.min_y;
double ymult=height/yy;
double major_ytick=max_yticksdiv*yy;
double min_ytick,q;
if (w.min_y>=0) {
int yrounding[9]={1,2,5,10,20,30,40,50,100}; // time rounding
int ry;
for (ry=0;ry<9;ry++) {
// st=round(st2*rounding[ry])/rounding[ry];
min_ytick=round(major_ytick*yrounding[ry])/yrounding[ry];
q=yy/min_ytick; // number of ticks that fits in range
if (q<=max_yticks) break; // compared to number of ticks that fit on screen.
}
} else {
min_ytick=60;
}
if (min_ytick<=0.25)
min_ytick=0.25;
int ty,h;
for (float i=w.min_y; i<w.max_y; i+=min_ytick/2) {
ty=(i - w.min_y) * ymult;
h=(start_py+height)-ty;
dc.DrawLine(start_px-4, h, start_px, h);
}
dc.SetPen(pen1);
for (double i=w.min_y; i<w.max_y; i+=min_ytick/2) {
ty=(i - w.min_y) * ymult;
h=(start_py+height)-ty;
if (m_show_minor_grid && (i > w.min_y))
dc.DrawLine(start_px+1,h,start_px+width,h);
}
for (double i=w.min_y; i<=w.max_y; i+=min_ytick) {
ty=(i - w.min_y) * ymult;
fd=FormatY(i); // Override this as a function.
dc.GetTextExtent(fd,&x,&y);
if (x>labelW) labelW=x;
h=(start_py+height)-ty;
dc.DrawText(fd,start_px-8-x,h - (y / 2));
dc.SetPen(*wxBLACK_PEN);
dc.DrawLine(start_px-6,h,start_px,h);
dc.SetPen(pen2);
if (m_show_grid && (i > w.min_y))
dc.DrawLine(start_px+1,h,start_px+width,h);
}
dc.GetTextExtent(w.Title(),&x,&y);
dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90);
}
void gBarChart::DrawXTicks(wxDC & dc,gGraphWindow &w)
{
float px,py;
wxCoord x,y;
int scrx = w.GetScrX();
int scry = w.GetScrY();
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin();
int width=scrx-(start_px+w.GetRightMargin());
int height=scry-(start_py+w.GetBottomMargin());
dc.SetPen(*wxBLACK_PEN);
//wxDateTime d;
wxString fd=wxT("00:00:00:0000");
dc.GetTextExtent(fd,&x,&y);
double max_ticks=(x+25.0)/width; // y+50 for rotated text
double jj=1/max_ticks;
double xx=w.max_x-w.min_x;
double minor_tick=max_ticks*xx;
double st2=w.min_x; //double(int(frac*1440.0))/1440.0;
double st,q;
bool show_seconds=false;
bool show_milliseconds=false;
bool show_time=true;
double min_tick;
if (xx<1.5) {
int rounding[16]={12,24,48,72,96,144,288,720,1440,2880,5760,8640,17280,86400,172800,345600}; // time rounding
int ri;
for (ri=0;ri<16;ri++) {
st=round(st2*rounding[ri])/rounding[ri];
min_tick=round(minor_tick*rounding[ri])/rounding[ri];
q=xx/min_tick; // number of ticks that fits in range
if (q<=jj) break; // compared to number of ticks that fit on screen.
}
if (ri>8) show_seconds=true;
if (ri>=14) show_milliseconds=true;
if (min_tick<=0.25/86400.0)
min_tick=0.25/86400;
} else { // Day ticks..
show_time=false;
st=st2;
min_tick=1;
double mtiks=(x+20.0)/width;
double mt=mtiks*xx;
min_tick=mt;
if (min_tick<1) min_tick=1;
if (min_tick>10) min_tick=10;
}
dc.SetPen(*wxBLACK_PEN);
double st3=st;
while (st3>w.min_x) {
st3-=min_tick/10.0;
}
st3+=min_tick/10.0;
py=start_py+height;
for (double i=st3; i<=w.max_x; i+=min_tick/10.0) {
if (i<w.min_x) continue;
//px=x2p(w,i);
px=w.x2p(i); //w.GetLeftMargin()+((i - w.min_x) * xmult);
dc.DrawLine(px,py,px,py+4);
}
while (st<w.min_x) {
st+=min_tick;
}
int hour,minute,second,millisecond;
wxDateTime d;
for (double i=st; i<=w.max_x; i+=min_tick) { //600.0/86400.0) {
d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors
if (show_time) {
minute=d.GetMinute();
hour=d.GetHour();
second=d.GetSecond();
millisecond=d.GetMillisecond();
if (show_milliseconds) {
fd=wxString::Format(wxT("%02i:%02i:%02i:%04i"),hour,minute,second,millisecond);
} else if (show_seconds) {
fd=wxString::Format(wxT("%02i:%02i:%02i"),hour,minute,second);
} else {
fd=wxString::Format(wxT("%02i:%02i"),hour,minute);
}
} else {
fd=d.Format(wxT("%e %b"));
}
// dc.GetTextExtent(fd,&x,&y);
// px=x2p(w,i);
px=w.x2p(i); //w.GetLeftMargin()+((i - w.min_x) * xmult);
dc.DrawLine(px,py,px,py+6);
dc.GetTextExtent(fd,&x,&y);
if (!show_time) {
dc.DrawRotatedText(fd, px-(y/2)+2, py+x+14, 90);
} else {
dc.DrawText(fd, px-(x/2), py+y);
}
}
}
void gBarChart::Plot(wxDC & dc, gGraphWindow & w) void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
{ {
@ -938,13 +982,10 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
if ((data->point[0][i].x >= w.min_x) && (data->point[0][i].x<w.max_x)) days+=1; if ((data->point[0][i].x >= w.min_x) && (data->point[0][i].x<w.max_x)) days+=1;
} }
if (days==0) return; if (days==0) return;
//if (m_direction==wxVERTICAL) {
//} else { Yaxis->Plot(dc,w);
DrawYTicks(dc,w);
//}
dc.SetPen( *wxBLACK_PEN ); dc.SetPen( *wxBLACK_PEN );
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
float barwidth,pxr; float barwidth,pxr;
float px,py; float px,py;
@ -1003,137 +1044,13 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
} else draw_xticks_instead=true; } else draw_xticks_instead=true;
} }
if (draw_xticks_instead) DrawXTicks(dc,w); if (draw_xticks_instead)
dc.DrawLine(start_px,start_py,start_px,start_py+height); Xaxis->Plot(dc,w);
dc.DrawLine(start_px,start_py+height,start_px+width,start_py+height);
// DrawXTicks(dc,w);
}
/*gBarChart::gBarChart(gGraphData *d,wxOrientation o)
:gLayer(d),m_direction(o)
{
m_yminor_ticks=2;
m_ymajor_ticks=10;
}
gBarChart::~gBarChart()
{
}
void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
{
if (!m_visible) return;
if (!data) return;
if (!data->NP(0)) return;
int scrx = w.GetScrX();
int scry = w.GetScrY();
dc.SetPen( *wxBLACK_PEN );
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin();
int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
double max=0;
for (int i=0;i<data->NP(0);i++) {
if (data->vpoint[0][i].y>max) max=data->vpoint[0][i].y;
}
float barwidth,pxr;
int px,py;
if (m_direction==wxVERTICAL) {
barwidth=(height-data->NP(0)*2)/data->NP(0);
pxr=width/max;
px=start_py;
} else {
barwidth=(width-data->NP(0)*2)/data->NP(0);
pxr=(height)/max;
px=start_px;
}
px+=1;
int t1,t2;
int u1,u2;
int textX, textY;
wxString str;
const wxColor *colors[6]={wxRED, wxBLUE, wxGREEN, wxCYAN , wxBLACK, wxLIGHT_GREY };
for (int i=0;i<data->NP(0);i++) {
dc.SetBrush(*wxTRANSPARENT_BRUSH);
t1=px+1;
px+=barwidth+2;
t2=px-t1-1;
wxRect rect;
wxDirection dir;
if (data->Type()==gDT_Stacked) {
py=start_py+height;
for (size_t j=0;j<data->yaxis[i].size();j++) {
u1=(data->yaxis[i][j]*pxr); // height of section in pixels
u2=height-u1;
//if (m_direction==wxVERTICAL) {
// rect=wxRect(start_px+u1,t1,u2,t2);
// dir=wxSOUTH;
//} else {
rect=wxRect(t1,py-u1,t2,u1);
dir=wxEAST;
dc.GradientFillLinear(rect,*colors[j%6],*wxLIGHT_GREY,dir);
dc.DrawRectangle(rect);
py-=u1;
}
} else if (data->Type()==gDT_Point) {
u2=data->vpoint[0][i].y*pxr;
u1=(start_py+height)-u2;
rect=wxRect(t1,u1,t2,u2);
dir=wxEAST;
dc.GradientFillLinear(rect,*colors[0],*wxLIGHT_GREY,dir);
dc.DrawRectangle(rect);
}
str=FormatX(data->vpoint[0][i].x);
dc.GetTextExtent(str, &textX, &textY);
if (t2>textY) {
int j=t1+((t2/2)-(textY/2));
if (m_direction==wxVERTICAL) {
dc.DrawRotatedText(str,start_px+barwidth+2+textY,j,270);
} else {
dc.DrawRotatedText(str,j,start_py+height+8+textX,90);
}
}
}
dc.DrawLine(start_px,start_py,start_px,start_py+height); dc.DrawLine(start_px,start_py,start_px,start_py+height);
dc.DrawLine(start_px,start_py+height,start_px+width,start_py+height); dc.DrawLine(start_px,start_py+height,start_px+width,start_py+height);
wxCoord x,y;
wxString S;
wxCoord labelW=0;
for (float i=0;i<=max;i+=1) {
int s=4;
if (i/m_yminor_ticks!=0) continue;
if (i/m_ymajor_ticks==0) {
s=6;
S=FormatY(i); // Override this as a function.
dc.GetTextExtent(S,&x,&y);
if (x>labelW) labelW=x;
dc.DrawText(S,start_px-8-x,start_py+height-(i*pxr)-y/2);
}
dc.DrawLine(start_px-s,start_py+height-(i*pxr),start_px,start_py+height-(i*pxr));
}
dc.GetTextExtent(w.Title(),&x,&y);
dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90);
} }
*/
gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool a,bool _hide_axes) gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool a,bool _hide_axes)
:gLayer(d),m_accelerate(a),m_drawlist_size(dlsize),m_hide_axes(_hide_axes) :gLayer(d),m_accelerate(a),m_drawlist_size(dlsize),m_hide_axes(_hide_axes)
@ -1141,206 +1058,15 @@ gLineChart::gLineChart(gPointData *d,const wxColor * col,int dlsize,bool a,bool
m_drawlist=new wxPoint [dlsize]; m_drawlist=new wxPoint [dlsize];
color.clear(); color.clear();
color.push_back(col); color.push_back(col);
m_show_grid=true; Yaxis=new gYAxis(NULL,wxBLACK);
m_show_minor_grid=true; Yaxis->SetShowMajorLines(true);
Yaxis->SetShowMinorLines(true);
} }
gLineChart::~gLineChart() gLineChart::~gLineChart()
{ {
delete Yaxis;
delete [] m_drawlist; delete [] m_drawlist;
} }
void gLineChart::DrawYTicks(wxDC & dc,gGraphWindow &w)
{
static wxColor wxDARK_GREY(0xA0,0xA0,0xA0,0xA0);
static wxPen pen1(*wxLIGHT_GREY, 1, wxDOT);
static wxPen pen2(wxDARK_GREY, 1, wxDOT);
wxCoord x,y,labelW=0;
int scrx = w.GetScrX();
int scry = w.GetScrY();
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin();
int width=scrx-(w.GetLeftMargin()+w.GetRightMargin());
int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
dc.SetPen(*wxBLACK_PEN);
wxString fd=wxT("0");
dc.GetTextExtent(fd,&x,&y);
double max_yticksdiv=(y+15.0)/(height); // y+50 for rotated text
double max_yticks=1/max_yticksdiv;
double yy=w.max_y-w.min_y;
double ymult=height/yy;
double major_ytick=max_yticksdiv*yy;
double min_ytick,q;
if (w.min_y>=0) {
int yrounding[9]={1,2,5,10,20,30,40,60,120}; // time rounding
int ry;
for (ry=0;ry<3;ry++) {
// st=round(st2*rounding[ry])/rounding[ry];
min_ytick=round(major_ytick*yrounding[ry])/yrounding[ry];
q=yy/min_ytick; // number of ticks that fits in range
if (q<=max_yticks) break; // compared to number of ticks that fit on screen.
}
} else {
min_ytick=60;
}
if (min_ytick<=1)
min_ytick=1;
int ty,h;
for (float i=w.min_y; i<w.max_y; i+=min_ytick/2) {
ty=(i - w.min_y) * ymult;
h=(start_py+height)-ty;
dc.DrawLine(start_px-4, h, start_px, h);
}
dc.SetPen(pen1);
for (double i=w.min_y; i<w.max_y; i+=min_ytick/2) {
ty=(i - w.min_y) * ymult;
h=(start_py+height)-ty;
if (m_show_minor_grid && (i > w.min_y))
dc.DrawLine(start_px+1,h,start_px+width,h);
}
for (double i=w.min_y; i<=w.max_y; i+=min_ytick) {
ty=(i - w.min_y) * ymult;
fd=FormatY(i); // Override this as a function.
dc.GetTextExtent(fd,&x,&y);
if (x>labelW) labelW=x;
h=(start_py+height)-ty;
dc.DrawText(fd,start_px-8-x,h - (y / 2));
dc.SetPen(*wxBLACK_PEN);
dc.DrawLine(start_px-6,h,start_px,h);
dc.SetPen(pen2);
if (m_show_grid && (i > w.min_y))
dc.DrawLine(start_px+1,h,start_px+width,h);
}
dc.GetTextExtent(w.Title(),&x,&y);
dc.DrawRotatedText(w.Title(), start_px-8-labelW - y, start_py+((height + x)>>1), 90);
}
void gLineChart::DrawXTicks(wxDC & dc,gGraphWindow &w)
{
float px,py;
wxCoord x,y;
int scrx = w.GetScrX();
int scry = w.GetScrY();
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
int start_px=w.GetLeftMargin();
int start_py=w.GetTopMargin();
int width=scrx-(start_px+w.GetRightMargin());
int height=scry-(start_py+w.GetBottomMargin());
dc.SetPen(*wxBLACK_PEN);
//wxDateTime d;
wxString fd=wxT("00:00:00:0000");
dc.GetTextExtent(fd,&x,&y);
double max_ticks=(x+25.0)/width; // y+50 for rotated text
double jj=1/max_ticks;
double xx=w.max_x-w.min_x;
double minor_tick=max_ticks*xx;
double st2=w.min_x; //double(int(frac*1440.0))/1440.0;
double st,q;
bool show_seconds=false;
bool show_milliseconds=false;
bool show_time=true;
double min_tick;
if (xx<1.5) {
int rounding[16]={12,24,48,72,96,144,288,720,1440,2880,5760,8640,17280,86400,172800,345600}; // time rounding
int ri;
for (ri=0;ri<16;ri++) {
st=round(st2*rounding[ri])/rounding[ri];
min_tick=round(minor_tick*rounding[ri])/rounding[ri];
q=xx/min_tick; // number of ticks that fits in range
if (q<=jj) break; // compared to number of ticks that fit on screen.
}
if (ri>8) show_seconds=true;
if (ri>=14) show_milliseconds=true;
if (min_tick<=0.25/86400.0)
min_tick=0.25/86400;
} else { // Day ticks..
show_time=false;
st=st2;
min_tick=1;
double mtiks=(x+20.0)/width;
double mt=mtiks*xx;
min_tick=mt;
if (min_tick<1) min_tick=1;
if (min_tick>10) min_tick=10;
}
dc.SetPen(*wxBLACK_PEN);
double st3=st;
while (st3>w.min_x) {
st3-=min_tick/10.0;
}
st3+=min_tick/10.0;
py=start_py+height;
for (double i=st3; i<=w.max_x; i+=min_tick/10.0) {
if (i<w.min_x) continue;
//px=x2p(w,i);
px=w.x2p(i); //w.GetLeftMargin()+((i - w.min_x) * xmult);
dc.DrawLine(px,py,px,py+4);
}
while (st<w.min_x) {
st+=min_tick;
}
int hour,minute,second,millisecond;
wxDateTime d;
for (double i=st; i<=w.max_x; i+=min_tick) { //600.0/86400.0) {
d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors
if (show_time) {
minute=d.GetMinute();
hour=d.GetHour();
second=d.GetSecond();
millisecond=d.GetMillisecond();
if (show_milliseconds) {
fd=wxString::Format(wxT("%02i:%02i:%02i:%04i"),hour,minute,second,millisecond);
} else if (show_seconds) {
fd=wxString::Format(wxT("%02i:%02i:%02i"),hour,minute,second);
} else {
fd=wxString::Format(wxT("%02i:%02i"),hour,minute);
}
} else {
fd=d.Format(wxT("%e %b"));
}
// dc.GetTextExtent(fd,&x,&y);
// px=x2p(w,i);
px=w.x2p(i); //w.GetLeftMargin()+((i - w.min_x) * xmult);
dc.DrawLine(px,py,px,py+6);
dc.GetTextExtent(fd,&x,&y);
if (!show_time) {
dc.DrawRotatedText(fd, px-(y/2)+2, py+x+14, 90);
} else {
dc.DrawText(fd, px-(x/2), py+y);
}
}
}
// Time Domain Line Chart // Time Domain Line Chart
void gLineChart::Plot(wxDC & dc, gGraphWindow & w) void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
@ -1398,8 +1124,7 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
dc.DrawLine(start_px+py,start_py+height+8,start_px+py,start_py+height+12); dc.DrawLine(start_px+py,start_py+height+8,start_px+py,start_py+height+12);
if (!m_hide_axes) { if (!m_hide_axes) {
DrawYTicks(dc,w); Yaxis->Plot(dc,w);
DrawXTicks(dc,w);
} }
wxPen pen(*color[0], 1, wxSOLID); wxPen pen(*color[0], 1, wxSOLID);

44
graphs/graph.h
View File

@ -309,6 +309,34 @@ class gCandleStick:public gLayer
}; };
class gXAxis:public gLayer
{
public:
gXAxis(gPointData *d=NULL,const wxColor * col=wxBLACK);
virtual ~gXAxis();
virtual void Plot(wxDC & dc, gGraphWindow & w);
protected:
// virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; };
};
class gYAxis:public gLayer
{
public:
gYAxis(gPointData *d=NULL,const wxColor * col=wxBLACK);
virtual ~gYAxis();
virtual void Plot(wxDC & dc, gGraphWindow & w);
void SetShowMinorLines(bool b) { m_show_minor_lines=b; };
void SetShowMajorLines(bool b) { m_show_major_lines=b; };
bool ShowMinorLines() { return m_show_minor_lines; };
bool ShowMajorLines() { return m_show_major_lines; };
virtual const wxString & Format(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
protected:
bool m_show_major_lines;
bool m_show_minor_lines;
// virtual const wxString & Format(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
};
class gLineChart:public gLayer class gLineChart:public gLayer
{ {
public: public:
@ -316,22 +344,15 @@ class gLineChart:public gLayer
virtual ~gLineChart(); virtual ~gLineChart();
virtual void Plot(wxDC & dc, gGraphWindow & w); virtual void Plot(wxDC & dc, gGraphWindow & w);
virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; };
//virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
virtual void DrawXTicks(wxDC & dc,gGraphWindow &w);
virtual void DrawYTicks(wxDC & dc,gGraphWindow &w);
protected: protected:
bool m_accelerate; bool m_accelerate;
int m_drawlist_size; int m_drawlist_size;
wxPoint *m_drawlist; wxPoint *m_drawlist;
bool m_show_grid;
bool m_show_minor_grid;
bool m_hide_axes; bool m_hide_axes;
wxPoint screen[4096]; // max screen pixel width for accelerated plot usage only. wxPoint screen[4096]; // max screen pixel width for accelerated plot usage only.
gYAxis * Yaxis;
}; };
@ -372,8 +393,7 @@ class gBarChart:public gLayer
virtual void Plot(wxDC & dc, gGraphWindow & w); virtual void Plot(wxDC & dc, gGraphWindow & w);
protected: protected:
virtual void DrawYTicks(wxDC & dc,gGraphWindow &w); //virtual void DrawYTicks(wxDC & dc,gGraphWindow &w);
virtual void DrawXTicks(wxDC & dc,gGraphWindow &w);
wxOrientation m_direction; wxOrientation m_direction;
@ -385,8 +405,8 @@ class gBarChart:public gLayer
//virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; virtual const wxString & FormatY(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
bool m_show_grid; gXAxis *Xaxis;
bool m_show_minor_grid; gYAxis *Yaxis;
}; };

14
version.h
View File

@ -4,7 +4,7 @@
namespace AutoVersion{ namespace AutoVersion{
//Date Version Types //Date Version Types
static const char DATE[] = "30"; static const char DATE[] = "31";
static const char MONTH[] = "05"; static const char MONTH[] = "05";
static const char YEAR[] = "2011"; static const char YEAR[] = "2011";
static const char UBUNTU_VERSION_STYLE[] = "11.05"; static const char UBUNTU_VERSION_STYLE[] = "11.05";
@ -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 = 2260; static const long BUILD = 2313;
static const long REVISION = 7026; static const long REVISION = 7342;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 7109; static const long BUILDS_COUNT = 7196;
#define RC_FILEVERSION 0,7,2260,7026 #define RC_FILEVERSION 0,7,2313,7342
#define RC_FILEVERSION_STRING "0, 7, 2260, 7026\0" #define RC_FILEVERSION_STRING "0, 7, 2313, 7342\0"
static const char FULLVERSION_STRING[] = "0.7.2260.7026"; static const char FULLVERSION_STRING[] = "0.7.2313.7342";
//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 = 62; static const long BUILD_HISTORY = 62;