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

Codeblocks is naughty

Browse Source
This commit is contained in:
Mark Watkins 2011-06-09 01:30:57 +10:00
parent 2b635d111c
commit 0ecd3355a5
5 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Projects/CodeBlocks/SleepyHead.cbp
View File

@ -54,6 +54,23 @@
<Add option="`i686-pc-mingw32-wx-config --version=2.9 --libs richtext,aui,xrc,qa,html,adv,core,xml,net,base`" /> <Add option="`i686-pc-mingw32-wx-config --version=2.9 --libs richtext,aui,xrc,qa,html,adv,core,xml,net,base`" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug-wx29">
<Option output="bin/Debug-wx29/SleepyHead" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug-wx29/" />
<Option type="0" />
<Option compiler="gcc" />
<Option projectCompilerOptionsRelation="1" />
<Option projectLinkerOptionsRelation="1" />
<Compiler>
<Add option="-g" />
<Add option="`wx-config --version=2.9 --cflags`" />
<Add directory="../../src/libs" />
<Add directory="../../src" />
</Compiler>
<Linker>
<Add option="`wx-config --version=2.9 --libs aui,xrc,qa,html,adv,core,net,base`" />
</Linker>
</Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8304,7 +8304,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307543626 /home/mark/projects/git/sleepyhead/src/version.h 1307547046 /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"
1307543431 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307545866 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
Projects/CodeBlocks/SleepyHead.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Debug" /> <ActiveTarget name="Debug-wx29" />
<File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="14"> <File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="14">
<Cursor position="1300" topLine="24" /> <Cursor position="1300" topLine="24" />
</File> </File>
@ -44,6 +44,6 @@
<Cursor position="757" topLine="15" /> <Cursor position="757" topLine="15" />
</File> </File>
<File name="../../src/libs/sleeplib/prs1_loader.cpp" open="1" top="1" tabpos="7"> <File name="../../src/libs/sleeplib/prs1_loader.cpp" open="1" top="1" tabpos="7">
<Cursor position="12527" topLine="329" /> <Cursor position="11668" topLine="329" />
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

38
src/graphs/graph.cpp
View File

@ -232,9 +232,9 @@ void gGraphWindow::MoveX(int i)
double min,max; double min,max;
MoveX(i,min,max); MoveX(i,min,max);
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);
} } */
if (!m_block_zoom) SetXBounds(min,max); if (!m_block_zoom) SetXBounds(min,max);
} }
void gGraphWindow::ZoomX(double mult,int origin_px) void gGraphWindow::ZoomX(double mult,int origin_px)
@ -374,6 +374,12 @@ void gGraphWindow::OnMouseRightRelease(wxMouseEvent &event)
if (!m_block_zoom) { if (!m_block_zoom) {
ZoomX(zoom_fact,0); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool. ZoomX(zoom_fact,0); //event.GetX()); // adds origin to zoom out.. Doesn't look that cool.
} }
} else {
double min=MinX();
double max=MaxX();
for (list<gGraphWindow *>::iterator g=link_zoom.begin();g!=link_zoom.end();g++) {
(*g)->SetXBounds(min,max);
}
} }
m_mouseRDown=false; m_mouseRDown=false;
@ -417,11 +423,11 @@ void gGraphWindow::OnMouseLeftDown(wxMouseEvent &event)
} }
void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event) void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
{ {
/* 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();
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.
if (m_drag_foobar) { if (m_drag_foobar) {
// wxLogMessage("Foobar Released"); // wxLogMessage("Foobar Released");
@ -443,17 +449,23 @@ void gGraphWindow::OnMouseLeftRelease(wxMouseEvent &event)
m_mouseLDown=false; m_mouseLDown=false;
m_mouseRBrect=wxRect(0, 0, 0, 0); m_mouseRBrect=wxRect(0, 0, 0, 0);
if ((t2-t1)>3) { if ((t2-t1)>3) {
ZoomXPixels(t1,t2); //if (hot1.Contains(x,y)) {
ZoomXPixels(t1,t2);
//} else {
//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.
} }
} }
} }

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 = 3815; static const long BUILD = 3821;
static const long REVISION = 4044; static const long REVISION = 4068;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 1780; static const long BUILDS_COUNT = 1796;
#define RC_FILEVERSION 0,7,3815,4044 #define RC_FILEVERSION 0,7,3821,4068
#define RC_FILEVERSION_STRING "0, 7, 3815, 4044\0" #define RC_FILEVERSION_STRING "0, 7, 3821, 4068\0"
static const char FULLVERSION_STRING[] = "0.7.3815.4044"; static const char FULLVERSION_STRING[] = "0.7.3821.4068";
//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;