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

Log window won't close on app shutdown.. axing for now. Cleaned up some wxLogMessages instead

Browse Source
This commit is contained in:
Mark Watkins 2011-06-08 20:17:42 +10:00
parent c9269b0d51
commit d247a7bf40
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8232,7 +8232,7 @@
<wx/datectrl.h> <wx/datectrl.h>
<wx/dateevt.h> <wx/dateevt.h>
1307525930 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp 1307527338 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadApp.cpp
"wx_pch.h" "wx_pch.h"
<iostream> <iostream>
<wx/log.h> <wx/log.h>
@ -8296,7 +8296,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307525927 /home/mark/projects/git/sleepyhead/src/version.h 1307528197 /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"
@ -8333,7 +8333,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307473982 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307528077 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>
@ -8348,7 +8348,7 @@
<wx/ffile.h> <wx/ffile.h>
<wx/utils.h> <wx/utils.h>
1307458866 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp 1307527853 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/machine.cpp
<tr1/random> <tr1/random>
<wx/colour.h> <wx/colour.h>
<wx/log.h> <wx/log.h>
@ -8369,7 +8369,7 @@
<wx/stdpaths.h> <wx/stdpaths.h>
"preferences.h" "preferences.h"
1307418393 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp 1307527050 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/profiles.cpp
<wx/filefn.h> <wx/filefn.h>
<wx/filename.h> <wx/filename.h>
<wx/utils.h> <wx/utils.h>
@ -8381,7 +8381,7 @@
"machine_loader.h" "machine_loader.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1307522085 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp 1307527004 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp
<wx/dir.h> <wx/dir.h>
<wx/filename.h> <wx/filename.h>
<wx/ffile.h> <wx/ffile.h>

11
src/SleepyHeadApp.cpp
View File

@ -34,8 +34,6 @@
IMPLEMENT_APP(SleepyHeadApp); IMPLEMENT_APP(SleepyHeadApp);
wxLogWindow *logger;
bool SleepyHeadApp::OnInit() bool SleepyHeadApp::OnInit()
{ {
// Initialize the logger // Initialize the logger
@ -43,8 +41,9 @@ bool SleepyHeadApp::OnInit()
// It helps to allocate the logger on the heap.. This show work for all platforms now :) // It helps to allocate the logger on the heap.. This show work for all platforms now :)
logger=new wxLogWindow(NULL,wxT("Debug"),true,true); //new wxLogStderr(NULL); // wxLog *logger=new wxLogStderr(NULL); //new wxLogWindow(NULL,wxT("Debug"),true,false); //new wxLogStderr(NULL); //
wxLog::SetActiveTarget(logger); wxLog::SetActiveTarget(logger);
//wxLog::SetLogLevel(wxLOG_Max);
wxLogDebug( wxVERSION_STRING ); wxLogDebug( wxVERSION_STRING );
wxLogDebug( wxT("Application Initialze...") ); wxLogDebug( wxT("Application Initialze...") );
@ -74,8 +73,8 @@ bool SleepyHeadApp::OnInit()
SleepyHeadFrame* frame = new SleepyHeadFrame(0L); SleepyHeadFrame* frame = new SleepyHeadFrame(0L);
//logger->GetFrame()->Reparent(frame);
frame->Show(); frame->Show();
//logger->Show(false);
return true; return true;
} }
@ -83,8 +82,8 @@ bool SleepyHeadApp::OnInit()
int SleepyHeadApp::OnExit() int SleepyHeadApp::OnExit()
{ {
//delete loader_progress; //delete loader_progress;
wxLogMessage(wxT("Closing Profiles...")); wxLogDebug(wxT("Closing Profiles..."));
Profiles::Done(); Profiles::Done();
// wxLog::SetActiveTarget(NULL);
return true; return true;
} }

4
src/libs/sleeplib/machine.cpp
View File

@ -179,7 +179,6 @@ const map<MachineCode,wxColour> DefaultFlagColours= {
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
Machine::Machine(Profile *p,MachineID id) Machine::Machine(Profile *p,MachineID id)
{ {
wxLogDebug(wxT("Create Machine"));
profile=p; profile=p;
if (!id) { if (!id) {
std::tr1::minstd_rand gen; std::tr1::minstd_rand gen;
@ -193,6 +192,7 @@ Machine::Machine(Profile *p,MachineID id)
m_id=temp; m_id=temp;
} else m_id=id; } else m_id=id;
wxLogDebug(wxString::Format(wxT("Create Machine %lx"),m_id));
m_type=MT_UNKNOWN; m_type=MT_UNKNOWN;
firstsession=true; firstsession=true;
} }
@ -277,7 +277,7 @@ bool Machine::Load()
{ {
wxString path=profile->Get("DataFolder")+wxFileName::GetPathSeparator()+hexid(); wxString path=profile->Get("DataFolder")+wxFileName::GetPathSeparator()+hexid();
wxDir dir; wxDir dir;
wxLogMessage(wxT("Loading ")+path); wxLogDebug(wxT("Loading ")+path);
dir.Open(path); dir.Open(path);
if (!dir.IsOpened()) return false; if (!dir.IsOpened()) return false;

2
src/libs/sleeplib/profiles.cpp
View File

@ -168,7 +168,7 @@ Day * Profile::GetDay(wxDateTime date,MachineType type)
void Profile::Import(wxString path) void Profile::Import(wxString path)
{ {
int c=0; int c=0;
wxLogMessage(wxT("Importing ")+path); wxLogDebug(wxT("Importing ")+path);
list<MachineLoader *>loaders=GetLoaders(); list<MachineLoader *>loaders=GetLoaders();
for (list<MachineLoader *>::iterator i=loaders.begin(); i!=loaders.end(); i++) { for (list<MachineLoader *>::iterator i=loaders.begin(); i!=loaders.end(); i++) {
if (c+=(*i)->Open(path,this)) break; if (c+=(*i)->Open(path,this)) break;

2
src/libs/sleeplib/prs1_loader.cpp
View File

@ -52,7 +52,7 @@ PRS1Loader::~PRS1Loader()
} }
Machine *PRS1Loader::CreateMachine(wxString serial,Profile *profile) Machine *PRS1Loader::CreateMachine(wxString serial,Profile *profile)
{ {
wxLogMessage(wxT("Create Machine ")+serial); wxLogDebug(wxT("Create Machine ")+serial);
if (!profile) { // shouldn't happen.. if (!profile) { // shouldn't happen..
wxLogMessage(wxT("No Profile!")); wxLogMessage(wxT("No Profile!"));
return NULL; return NULL;

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 = 3716; static const long BUILD = 3745;
static const long REVISION = 3516; static const long REVISION = 3681;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 1544; static const long BUILDS_COUNT = 1616;
#define RC_FILEVERSION 0,7,3716,3516 #define RC_FILEVERSION 0,7,3745,3681
#define RC_FILEVERSION_STRING "0, 7, 3716, 3516\0" #define RC_FILEVERSION_STRING "0, 7, 3745, 3681\0"
static const char FULLVERSION_STRING[] = "0.7.3716.3516"; static const char FULLVERSION_STRING[] = "0.7.3745.3681";
//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;