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

Yet more incredibly boring mouse control stuff.

Browse Source
This commit is contained in:
Mark Watkins 2011-06-09 16:36:03 +10:00
parent 4893c7fa40
commit 942001c28f
4 changed files with 64 additions and 43 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>
1307593095 /home/mark/projects/git/sleepyhead/src/version.h 1307601259 /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"
1307586473 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp 1307597749 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"
1307590941 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307600933 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;

85
src/graphs/graph.cpp
View File

@ -449,6 +449,7 @@ void gGraphWindow::OnMouseRightRelease(wxMouseEvent &event)
event.Skip(); event.Skip();
} }
gGraphWindow *LastGraphLDown=NULL;
void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event) void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
{ {
int y=event.GetY(); int y=event.GetY();
@ -459,8 +460,10 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
m_mouseLClick.x = x; m_mouseLClick.x = x;
m_mouseLClick.y = y; m_mouseLClick.y = y;
if (hot1.Contains(x,y)) { if (hot1.Contains(x,y)) {
m_mouseLDown=true; m_mouseLDown=true;
} else if (foobar && (y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20) ) { } else if (foobar && (y>(m_scrY-GetBottomMargin())) && (y<(m_scrY-GetBottomMargin())+20) ) {
double rx=RealMaxX()-RealMinX(); double rx=RealMaxX()-RealMinX();
double qx=double(width)/rx; double qx=double(width)/rx;
@ -481,12 +484,18 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
// wxLogMessage("Foobar Area Pushed"); // wxLogMessage("Foobar Area Pushed");
} }
} }
LastGraphLDown=this;
event.Skip(); event.Skip();
} }
void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
{ {
if (LastGraphLDown && (LastGraphLDown!=this)) { // Same graph that initiated the click??
LastGraphLDown->OnMouseLeftDown(event); // Nope.. Give it the event.
return;
}
int y=event.GetY(); int y=event.GetY();
int x=event.GetX(); int x=event.GetX();
int width=m_scrX-GetRightMargin()-GetLeftMargin(); int width=m_scrX-GetRightMargin()-GetLeftMargin();
@ -494,12 +503,13 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
wxRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area. wxRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area.
bool zoom_in=false; bool zoom_in=false;
bool did_draw=false;
if (foobar) { // Finished Dragging the FooBar?
if (foobar && m_drag_foobar) {
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();
double maxx=MaxX()-RealMinX();; double maxx=MaxX()-RealMinX();
int x1=(qx*minx); // First x pixel int x1=(qx*minx); // First x pixel
int x2=(qx*maxx); // Last x pixel int x2=(qx*maxx); // Last x pixel
@ -511,25 +521,23 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
if (foobar && m_foobar_moved==0) zoom_in=true; if (foobar && m_foobar_moved==0) zoom_in=true;
} }
if (m_drag_foobar) { // wxLogMessage("Foobar Released");
// wxLogMessage("Foobar Released"); //double min=MinX();
double min=MinX(); //double max=MaxX();
double max=MaxX(); //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); // }
} // did_draw=true;
}
} // goto end;
if (!m_drag_foobar || zoom_in) { } else
if (!zoom_in && m_mouseLDown) { // && !m_drag_foobar) {
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);
int x1=m_mouseRBrect.x; int x1=m_mouseRBrect.x;
int x2=x1+m_mouseRBrect.width; int x2=x1+m_mouseRBrect.width;
m_mouseRBrect=wxRect(0, 0, 0, 0);
if (m_mouseLDown && !m_drag_foobar) { //hot1.Contains(x,y) && if (m_mouseLDown && !m_drag_foobar) { //hot1.Contains(x,y) &&
int t1=MIN(x1,x2); int t1=MIN(x1,x2);
int t2=MAX(x1,x2); int t2=MAX(x1,x2);
@ -537,23 +545,35 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
if ((t2-t1)>3) { if ((t2-t1)>3) {
// Range Selected // Range Selected
ZoomXPixels(t1,t2); ZoomXPixels(t1,t2);
did_draw=true;
} }
} }
if (hot1.Contains(x,y) || zoom_in) { //goto end;
double zoom_fact=0.5;
if (event.ControlDown()) zoom_fact=0.25;
for (list<gGraphWindow *>::iterator g=link_zoom.begin();g!=link_zoom.end();g++) {
(*g)->ZoomX(zoom_fact,event.GetX());
}
if (!m_block_zoom) {
ZoomX(zoom_fact,event.GetX()); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool.
}
} else {
Refresh();
}
} }
if (!did_draw && (m_mouseLDown && (hot1.Contains(x,y)) || zoom_in)) {
int xp=event.GetX();
if (zoom_in) xp=0;
double zoom_fact=0.5;
if (event.ControlDown()) zoom_fact=0.25;
for (list<gGraphWindow *>::iterator g=link_zoom.begin();g!=link_zoom.end();g++) {
(*g)->ZoomX(zoom_fact,xp);
}
if (!m_block_zoom) {
ZoomX(zoom_fact,xp); //event.GetX()); // adds origin to zoom in.. Doesn't look that cool.
}
did_draw=true;
//goto end;
}
m_mouseRBrect=wxRect(0, 0, 0, 0);
if (m_mouseLDown && !did_draw) {
Refresh();
}
end:
m_drag_foobar=false; m_drag_foobar=false;
m_mouseLDown=false; m_mouseLDown=false;
event.Skip(); event.Skip();
@ -625,13 +645,14 @@ void gGraphWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
(*l)->Plot(dc,*this); (*l)->Plot(dc,*this);
} }
static wxPen pen(*wxBLACK, 1, wxSOLID); static wxPen pen(*wxDARK_GREY, 1, wxDOT);
static wxBrush brush2(*selection_color,wxFDIAGONAL_HATCH); static wxColor sel(40,40,40,128);
static wxBrush brush2(sel,wxFDIAGONAL_HATCH);
if (m_mouseLDown) { if (m_mouseLDown) {
dc.SetPen(pen); dc.SetPen(pen);
//dc.SetBrush(brush); dc.SetBrush(brush2);
dc.SetBrush(*wxTRANSPARENT_BRUSH); //dc.SetBrush(*wxTRANSPARENT_BRUSH);
if (m_mouseRBrect.width>0) if (m_mouseRBrect.width>0)
dc.DrawRectangle(m_mouseRBrect); dc.DrawRectangle(m_mouseRBrect);
} }

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 = 3995; static const long BUILD = 4036;
static const long REVISION = 4967; static const long REVISION = 5232;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 2183; static const long BUILDS_COUNT = 2284;
#define RC_FILEVERSION 0,7,3995,4967 #define RC_FILEVERSION 0,7,4036,5232
#define RC_FILEVERSION_STRING "0, 7, 3995, 4967\0" #define RC_FILEVERSION_STRING "0, 7, 4036, 5232\0"
static const char FULLVERSION_STRING[] = "0.7.3995.4967"; static const char FULLVERSION_STRING[] = "0.7.4036.5232";
//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;