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

Left/Right click to zoom in/out on foobar

Browse Source
This commit is contained in:
Mark Watkins 2011-06-09 02:20:03 +10:00
parent 9e39694b4b
commit f7bf0346e8
4 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8300,11 +8300,11 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307543245 /home/mark/projects/git/sleepyhead/src/graphs/graph.h 1307549647 /home/mark/projects/git/sleepyhead/src/graphs/graph.h
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307547717 /home/mark/projects/git/sleepyhead/src/version.h 1307549946 /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"
1307545866 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307549075 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>

43
src/graphs/graph.cpp
View File

@ -141,6 +141,7 @@ gGraphWindow::gGraphWindow(wxWindow *parent, wxWindowID id,const wxString & titl
m_block_zoom=false; m_block_zoom=false;
m_drag_foobar=false; m_drag_foobar=false;
m_foobar_pos=0; m_foobar_pos=0;
m_foobar_moved=0;
} }
gGraphWindow::~gGraphWindow() gGraphWindow::~gGraphWindow()
{ {
@ -294,7 +295,8 @@ void gGraphWindow::OnMouseMove(wxMouseEvent &event)
// qx is centerpoint of new zoom area. // qx is centerpoint of new zoom area.
double dx=MaxX()-MinX(); // zoom rect width; double minx=MinX();
double dx=MaxX()-minx; // zoom rect width;
// Could smarten this up by remembering where the mouse was clicked on the foobar // Could smarten this up by remembering where the mouse was clicked on the foobar
@ -309,6 +311,7 @@ void gGraphWindow::OnMouseMove(wxMouseEvent &event)
ex=rmaxx; ex=rmaxx;
qx=ex-dx; qx=ex-dx;
} }
m_foobar_moved+=fabs((qx-minx));
SetXBounds(qx,ex); SetXBounds(qx,ex);
} else } else
@ -413,6 +416,7 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
if ((x>x1) && (x<x2)) { if ((x>x1) && (x<x2)) {
x-=x1; x-=x1;
m_foobar_pos=(1.0/double(xw))*double(x); // where along the foobar the user clicked. m_foobar_pos=(1.0/double(xw))*double(x); // where along the foobar the user clicked.
m_foobar_moved=0;
m_drag_foobar=true; m_drag_foobar=true;
// wxLogMessage("Foobar Area Pushed"); // wxLogMessage("Foobar Area Pushed");
} }
@ -429,6 +433,22 @@ 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.
bool zoom_in=false;
double rx=RealMaxX()-RealMinX();
double qx=double(width)/rx;
double minx=MinX()-RealMinX();
double maxx=MaxX()-RealMinX();;
int x1=(qx*minx);
int x2=(qx*maxx); // length in pixels
int xw=x2-x1;
x1+=GetLeftMargin();
x2+=GetLeftMargin();
if ((x>x1) && (x<x2)) {
if (m_foobar_moved==0) zoom_in=true;
}
if (m_drag_foobar) { if (m_drag_foobar) {
// wxLogMessage("Foobar Released"); // wxLogMessage("Foobar Released");
double min=MinX(); double min=MinX();
@ -438,9 +458,8 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
} }
m_drag_foobar=false; m_drag_foobar=false;
} else { }
if (event.GetY()>m_scrY-GetBottomMargin()+20) if (hot1.Contains(x,y) || zoom_in) {
return;
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);
//wxDateTime a,b; //wxDateTime a,b;
@ -459,14 +478,14 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
//Refresh(); //Refresh();
//} //}
} else { } else {
double zoom_fact=0.5; double zoom_fact=0.5;
if (event.ControlDown()) zoom_fact=0.25; if (event.ControlDown()) zoom_fact=0.25;
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)->ZoomX(zoom_fact,event.GetX()); (*g)->ZoomX(zoom_fact,event.GetX());
} }
if (!m_block_zoom) { if (!m_block_zoom) {
ZoomX(zoom_fact,event.GetX()); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool. ZoomX(zoom_fact,event.GetX()); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool.
} }
} }

2
src/graphs/graph.h
View File

@ -218,7 +218,7 @@ class gGraphWindow:public wxWindow // rename to gGraphWindow
bool m_block_move; bool m_block_move;
bool m_block_zoom; bool m_block_zoom;
bool m_drag_foobar; bool m_drag_foobar;
double m_foobar_pos; double m_foobar_pos,m_foobar_moved;
std::list<gLayer *> layers; std::list<gLayer *> layers;
wxColour m_bgColour; //!< Background Colour wxColour m_bgColour; //!< Background Colour
wxColour m_fgColour; //!< Foreground Colour wxColour m_fgColour; //!< Foreground Colour

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 = 3824; static const long BUILD = 3836;
static const long REVISION = 4084; static const long REVISION = 4149;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 1804; static const long BUILDS_COUNT = 1829;
#define RC_FILEVERSION 0,7,3824,4084 #define RC_FILEVERSION 0,7,3836,4149
#define RC_FILEVERSION_STRING "0, 7, 3824, 4084\0" #define RC_FILEVERSION_STRING "0, 7, 3836, 4149\0"
static const char FULLVERSION_STRING[] = "0.7.3824.4084"; static const char FULLVERSION_STRING[] = "0.7.3836.4149";
//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;