Menu
▾
▴
[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Backed out changeset: 04e6287fb38a
|
From: <hug...@li...> - 2011-08-28 10:30:22
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/6cc3ce4c3bbb changeset: 5526:6cc3ce4c3bbb user: tmodes date: Sun Aug 28 08:09:13 2011 +0200 description: Backed out changeset: 04e6287fb38a Breaks compilation on windows Breaks display of error log diffstat: src/hugin1/hugin/PanoPanel.cpp | 9 --------- src/hugin1/hugin/PreferencesDialog.cpp | 14 -------------- src/hugin1/hugin/config_defaults.h | 2 -- src/hugin1/hugin/xrc/batch_frame.xrc | 6 ------ src/hugin1/hugin/xrc/pref_dialog.xrc | 16 ---------------- src/hugin1/ptbatcher/Batch.cpp | 13 ------------- src/hugin1/ptbatcher/Batch.h | 1 - src/hugin1/ptbatcher/BatchFrame.cpp | 26 +------------------------- src/hugin1/ptbatcher/BatchFrame.h | 3 --- src/hugin1/ptbatcher/PTBatcherGUI.cpp | 12 ------------ 10 files changed, 1 insertions(+), 101 deletions(-) diffs (307 lines): diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/hugin/PanoPanel.cpp --- a/src/hugin1/hugin/PanoPanel.cpp Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/PanoPanel.cpp Sun Aug 28 08:09:13 2011 +0200 @@ -1149,15 +1149,6 @@ { switches += wxT("-v "); } - if (wxConfigBase::Get()->Read(wxT("/Processor/quit"), HUGIN_PROCESSOR_QUIT) != 0) - { - switches += wxT("-q "); - } - if (wxConfigBase::Get()->Read(wxT("/Processor/shutdown"), HUGIN_PROCESSOR_SHUTDOWN) != 0) - { - switches += wxT("-s "); - } - if(pano->isDirty()) { wxCommandEvent dummy; diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/hugin/PreferencesDialog.cpp --- a/src/hugin1/hugin/PreferencesDialog.cpp Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/PreferencesDialog.cpp Sun Aug 28 08:09:13 2011 +0200 @@ -577,10 +577,6 @@ MY_BOOL_VAL("pref_processor_overwrite", t); t = cfg->Read(wxT("/Processor/verbose"), HUGIN_PROCESSOR_VERBOSE) == 1; MY_BOOL_VAL("pref_processor_verbose", t); - t = cfg->Read(wxT("/Processor/quit"), HUGIN_PROCESSOR_QUIT) == 1; - MY_BOOL_VAL("pref_processor_quit", t); - t = cfg->Read(wxT("/Processor/shutdown"), HUGIN_PROCESSOR_SHUTDOWN) == 1; - MY_BOOL_VAL("pref_processor_shutdown", t); UpdateProcessorControls(); } @@ -749,8 +745,6 @@ cfg->Write(wxT("/Processor/parallel"), HUGIN_PROCESSOR_PARALLEL); cfg->Write(wxT("/Processor/overwrite"), HUGIN_PROCESSOR_OVERWRITE); cfg->Write(wxT("/Processor/verbose"), HUGIN_PROCESSOR_VERBOSE); - cfg->Write(wxT("/Processor/quit"), HUGIN_PROCESSOR_QUIT); - cfg->Write(wxT("/Processor/shutdown"), HUGIN_PROCESSOR_SHUTDOWN); } if (noteb->GetSelection() == 5) { @@ -881,8 +875,6 @@ cfg->Write(wxT("/Processor/parallel"), MY_G_BOOL_VAL("pref_processor_parallel")); cfg->Write(wxT("/Processor/overwrite"), MY_G_BOOL_VAL("pref_processor_overwrite")); cfg->Write(wxT("/Processor/verbose"), MY_G_BOOL_VAL("pref_processor_verbose")); - cfg->Write(wxT("/Processor/quit"), MY_G_BOOL_VAL("pref_processor_quit")); - cfg->Write(wxT("/Processor/shutdown"), MY_G_BOOL_VAL("pref_processor_shutdown")); ///// /// STITCHING @@ -1071,8 +1063,6 @@ XRCCTRL(*this,"pref_processor_start",wxCheckBox)->Enable(i==0); XRCCTRL(*this,"pref_processor_parallel",wxCheckBox)->Enable(i==0); XRCCTRL(*this,"pref_processor_verbose",wxCheckBox)->Enable(i==0); - XRCCTRL(*this,"pref_processor_quit",wxCheckBox)->Enable(i==0); - XRCCTRL(*this,"pref_processor_shutdown",wxCheckBox)->Enable(i==0); switch(i) { case 0: @@ -1082,8 +1072,6 @@ XRCCTRL(*this,"pref_processor_start",wxCheckBox)->SetValue(config->Read(wxT("/Processor/start"), HUGIN_PROCESSOR_START) == 1); XRCCTRL(*this,"pref_processor_parallel",wxCheckBox)->SetValue(config->Read(wxT("/Processor/parallel"), HUGIN_PROCESSOR_PARALLEL) == 1); XRCCTRL(*this,"pref_processor_verbose",wxCheckBox)->SetValue(config->Read(wxT("/Processor/verbose"), HUGIN_PROCESSOR_VERBOSE) == 1); - XRCCTRL(*this,"pref_processor_quit",wxCheckBox)->SetValue(config->Read(wxT("/Processor/quit"), HUGIN_PROCESSOR_QUIT) == 1); - XRCCTRL(*this,"pref_processor_shutdown",wxCheckBox)->SetValue(config->Read(wxT("/Processor/shutdown"), HUGIN_PROCESSOR_SHUTDOWN) == 1); } break; case 1: @@ -1091,8 +1079,6 @@ XRCCTRL(*this,"pref_processor_start",wxCheckBox)->SetValue(true); XRCCTRL(*this,"pref_processor_parallel",wxCheckBox)->SetValue(false); XRCCTRL(*this,"pref_processor_verbose",wxCheckBox)->SetValue(true); - XRCCTRL(*this,"pref_processor_quit",wxCheckBox)->SetValue(true); - XRCCTRL(*this,"pref_processor_shutdown",wxCheckBox)->SetValue(false); break; }; }; diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/hugin/config_defaults.h --- a/src/hugin1/hugin/config_defaults.h Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/config_defaults.h Sun Aug 28 08:09:13 2011 +0200 @@ -209,7 +209,5 @@ #define HUGIN_PROCESSOR_PARALLEL 0l // boolean #define HUGIN_PROCESSOR_OVERWRITE 0l // boolean #define HUGIN_PROCESSOR_VERBOSE 1l // boolean -#define HUGIN_PROCESSOR_QUIT 1l // boolean -#define HUGIN_PROCESSOR_SHUTDOWN 0l // boolean #endif // _CONFIG_DEFAULTS_H diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/hugin/xrc/batch_frame.xrc --- a/src/hugin1/hugin/xrc/batch_frame.xrc Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/xrc/batch_frame.xrc Sun Aug 28 08:09:13 2011 +0200 @@ -96,12 +96,6 @@ <flag>wxEXPAND</flag> </object> <object class="sizeritem"> - <object class="wxCheckBox" name="cb_quit"> - <label>Quit when done</label> - </object> - <flag>wxEXPAND</flag> - </object> - <object class="sizeritem"> <object class="wxCheckBox" name="cb_verbose"> <label>Verbose output</label> </object> diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/hugin/xrc/pref_dialog.xrc --- a/src/hugin1/hugin/xrc/pref_dialog.xrc Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/xrc/pref_dialog.xrc Sun Aug 28 08:09:13 2011 +0200 @@ -961,22 +961,6 @@ <flag>wxALL</flag> <border>5</border> </object> - <object class="sizeritem"> - <object class="wxCheckBox" name="pref_processor_quit"> - <label>Quit on finish</label> - <tooltip>Quit batch processor at the end of the batch.</tooltip> - </object> - <flag>wxALL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxCheckBox" name="pref_processor_shutdown"> - <label>Shutdown on finish</label> - <tooltip>Shutdown computer at the end of the batch.</tooltip> - </object> - <flag>wxALL</flag> - <border>5</border> - </object> <label>Options</label> <orient>wxVERTICAL</orient> </object> diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/ptbatcher/Batch.cpp --- a/src/hugin1/ptbatcher/Batch.cpp Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/ptbatcher/Batch.cpp Sun Aug 28 08:09:13 2011 +0200 @@ -25,9 +25,7 @@ */ #include "Batch.h" -#include "PTBatcherGUI.h" #include <wx/stdpaths.h> -#include <wx/app.h> BEGIN_EVENT_TABLE(Batch, wxFrame) EVT_END_PROCESS(-1, Batch::OnProcessTerminate) @@ -46,7 +44,6 @@ parallel = false; deleteFiles = false; shutdown = false; - quit = false; overwrite = true; verbose = false; gui = bgui; @@ -599,16 +596,6 @@ } } } - if(quit) //after we are finished we quit the GUI app if checked - { - if(gui) - { - wxGetApp().GetTopWindow()->Close(); - wxExit(); - } - else - cout << "Quit implemented in GUI only." << endl; - } } else { diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/ptbatcher/Batch.h --- a/src/hugin1/ptbatcher/Batch.h Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/ptbatcher/Batch.h Sun Aug 28 08:09:13 2011 +0200 @@ -57,7 +57,6 @@ bool parallel; bool deleteFiles; bool shutdown; - bool quit; bool overwrite; bool verbose; bool gui; diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/ptbatcher/BatchFrame.cpp --- a/src/hugin1/ptbatcher/BatchFrame.cpp Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/ptbatcher/BatchFrame.cpp Sun Aug 28 08:09:13 2011 +0200 @@ -97,7 +97,6 @@ EVT_CHECKBOX(XRCID("cb_delete"), BatchFrame::OnCheckDelete) EVT_CHECKBOX(XRCID("cb_overwrite"), BatchFrame::OnCheckOverwrite) EVT_CHECKBOX(XRCID("cb_shutdown"), BatchFrame::OnCheckShutdown) - EVT_CHECKBOX(XRCID("cb_quit"), BatchFrame::OnCheckQuit) EVT_CHECKBOX(XRCID("cb_verbose"), BatchFrame::OnCheckVerbose) EVT_END_PROCESS(-1, BatchFrame::OnProcessTerminate) EVT_CLOSE(BatchFrame::OnClose) @@ -900,12 +899,7 @@ XRCCTRL(*this,"cb_shutdown",wxCheckBox)->SetValue(false); else XRCCTRL(*this,"cb_shutdown",wxCheckBox)->SetValue(true); - i=config->Read(wxT("/BatchFrame/QuitCheck"), 0l); - if(i==0) - XRCCTRL(*this,"cb_quit",wxCheckBox)->SetValue(false); - else - XRCCTRL(*this,"cb_quit",wxCheckBox)->SetValue(true); - i=config->Read(wxT("/BatchFrame/OverwriteCheck"), 0l); + i=config->Read(wxT("/BatchFrame/OverwriteCheck"), 0l); if(i==0) XRCCTRL(*this,"cb_overwrite",wxCheckBox)->SetValue(false); else @@ -973,20 +967,6 @@ } } -void BatchFrame::OnCheckQuit(wxCommandEvent &event) -{ - if(event.IsChecked()) - { - m_batch->quit = true; - wxConfigBase::Get()->Write(wxT("/BatchFrame/QuitCheck"), 1l); - } - else - { - m_batch->quit = false; - wxConfigBase::Get()->Write(wxT("/BatchFrame/QuitCheck"), 0l); - } -} - void BatchFrame::OnCheckVerbose(wxCommandEvent &event) { if(event.IsChecked()) @@ -1056,10 +1036,6 @@ m_batch->shutdown = true; else m_batch->shutdown = false; - if(GetCheckQuit()) - m_batch->quit = true; - else - m_batch->quit = false; if(GetCheckOverwrite()) m_batch->overwrite = true; else diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/ptbatcher/BatchFrame.h --- a/src/hugin1/ptbatcher/BatchFrame.h Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/ptbatcher/BatchFrame.h Sun Aug 28 08:09:13 2011 +0200 @@ -84,7 +84,6 @@ void OnCheckOverwrite(wxCommandEvent &event); void OnCheckParallel(wxCommandEvent &event); void OnCheckShutdown(wxCommandEvent &event); - void OnCheckQuit(wxCommandEvent &event); void OnCheckVerbose(wxCommandEvent &event); //Called on window close to take care of the child thread @@ -108,8 +107,6 @@ bool GetCheckDelete() { return XRCCTRL(*this,"cb_delete",wxCheckBox)->IsChecked();}; /** return if shutdown checkbox is checked */ bool GetCheckShutdown() { return XRCCTRL(*this,"cb_shutdown",wxCheckBox)->IsChecked();}; - /** return if quit checkbox is checked */ - bool GetCheckQuit() { return XRCCTRL(*this,"cb_quit",wxCheckBox)->IsChecked();}; /** return if overwrite checkbox is checked */ bool GetCheckOverwrite() { return XRCCTRL(*this,"cb_overwrite",wxCheckBox)->IsChecked();}; /** return if verbose checkbox is checked */ diff -r bdacdc13e653 -r 6cc3ce4c3bbb src/hugin1/ptbatcher/PTBatcherGUI.cpp --- a/src/hugin1/ptbatcher/PTBatcherGUI.cpp Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/ptbatcher/PTBatcherGUI.cpp Sun Aug 28 08:09:13 2011 +0200 @@ -126,7 +126,6 @@ { wxCMD_LINE_SWITCH, "d", "delete", "delete *.pto files after stitching" }, { wxCMD_LINE_SWITCH, "o", "overwrite", "overwrite previous files without asking" }, { wxCMD_LINE_SWITCH, "s", "shutdown", "shutdown computer after batch is complete" }, - { wxCMD_LINE_SWITCH, "q", "quit", "quit after batch is complete" }, { wxCMD_LINE_SWITCH, "v", "verbose", "show verbose output when processing projects" }, { wxCMD_LINE_SWITCH, "a", "assistant", "run the assistant on the given projects" }, { wxCMD_LINE_PARAM, NULL, NULL, _("stitch_project.pto [output prefix]|assistant_project.pto"), @@ -140,7 +139,6 @@ { wxCMD_LINE_SWITCH, wxT("d"), wxT("delete"), wxT("delete *.pto files after stitching") }, { wxCMD_LINE_SWITCH, wxT("o"), wxT("overwrite"), wxT("overwrite previous files without asking") }, { wxCMD_LINE_SWITCH, wxT("s"), wxT("shutdown"), wxT("shutdown computer after batch is complete") }, - { wxCMD_LINE_SWITCH, wxT("q"), wxT("quit"), wxT("quit after batch is complete") }, { wxCMD_LINE_SWITCH, wxT("v"), wxT("verbose"), wxT("show verbose output when processing projects") }, { wxCMD_LINE_SWITCH, wxT("a"), wxT("assistant"), wxT("run the assistant on the given projects") }, { wxCMD_LINE_PARAM, NULL, NULL, _("stitch_project.pto [output prefix]|assistant_project.pto"), @@ -304,8 +302,6 @@ config->Write(wxT("/BatchFrame/ParallelCheck"), 1l); if (parser.Found(wxT("s"))) config->Write(wxT("/BatchFrame/ShutdownCheck"), 1l); - if (parser.Found(wxT("q"))) - config->Write(wxT("/BatchFrame/QuitCheck"), 1l); if (parser.Found(wxT("o"))) config->Write(wxT("/BatchFrame/OverwriteCheck"), 1l); if (parser.Found(wxT("v"))) @@ -320,8 +316,6 @@ conn->Request(wxT("SetParallelCheck")); if (parser.Found(wxT("s"))) conn->Request(wxT("SetShutdownCheck")); - if (parser.Found(wxT("q"))) - conn->Request(wxT("SetQuitCheck")); if (parser.Found(wxT("o"))) conn->Request(wxT("SetOverwriteCheck")); if (parser.Found(wxT("v"))) @@ -440,12 +434,6 @@ MyBatchFrame->OnCheckShutdown(event); MyBatchFrame->SetCheckboxes(); }; - if(item==wxT("SetQuitCheck")) - if(!MyBatchFrame->GetCheckQuit()) - { - MyBatchFrame->OnCheckQuit(event); - MyBatchFrame->SetCheckboxes(); - }; if(item==wxT("SetOverwriteCheck")) if(!MyBatchFrame->GetCheckOverwrite()) { |