From: <hug...@li...> - 2012-05-20 07:43:03
|
branch: gui_overhaul details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/d3a70fb21358 changeset: 5808:d3a70fb21358 user: tmodes date: Sun May 20 09:44:19 2012 +0200 description: Some more bugfixes diffstat: src/hugin1/hugin/GLPreviewFrame.cpp | 2 -- src/hugin1/hugin/MainFrame.cpp | 35 ++++++++++++++++++----------------- 2 files changed, 18 insertions(+), 19 deletions(-) diffs (156 lines): diff -r 8bf549feffa8 -r d3a70fb21358 src/hugin1/hugin/GLPreviewFrame.cpp --- a/src/hugin1/hugin/GLPreviewFrame.cpp Sat May 19 18:00:16 2012 +0200 +++ b/src/hugin1/hugin/GLPreviewFrame.cpp Sun May 20 09:44:19 2012 +0200 @@ -1034,7 +1034,6 @@ m_focalLengthText->SetValue(doubleTowxString(focal_length,m_degDigits)); m_cropFactorText->SetValue(doubleTowxString(img.getExifCropFactor(),m_degDigits)); } - m_imagesText->GetParent()->Layout(); if (pano.getNrOfImages() > 1) { @@ -1192,7 +1191,6 @@ { ShowProjectionWarnings(); }; - Refresh(); redrawPreview(); } diff -r 8bf549feffa8 -r d3a70fb21358 src/hugin1/hugin/MainFrame.cpp --- a/src/hugin1/hugin/MainFrame.cpp Sat May 19 18:00:16 2012 +0200 +++ b/src/hugin1/hugin/MainFrame.cpp Sun May 20 09:44:19 2012 +0200 @@ -647,7 +647,7 @@ bool MainFrame::CloseProject(bool cancelable) { if (pano.isDirty()) { - wxMessageDialog message(wxGetActiveWindow(), + wxMessageDialog message(wxTheApp->GetTopWindow(), _("Save changes to the panorama before closing?"), #ifdef _WINDOWS _("Hugin"), @@ -804,7 +804,7 @@ if (m_filename == wxT("")) { scriptName.Assign(getDefaultProjectName(pano) + wxT(".pto")); } - wxFileDialog dlg(wxGetActiveWindow(), + wxFileDialog dlg(wxTheApp->GetTopWindow(), _("Save project file"), scriptName.GetPath(), scriptName.GetFullName(), _("Project files (*.pto)|*.pto|All files (*)|*"), @@ -838,7 +838,7 @@ } wxFileName scriptNameFN(scriptName); wxString fn = scriptNameFN.GetName() + wxT(".txt"); - wxFileDialog dlg(wxGetActiveWindow(), + wxFileDialog dlg(wxTheApp->GetTopWindow(), _("Save PTmender script file"), wxConfigBase::Get()->Read(wxT("/actualPath"),wxT("")), fn, _("PTmender files (*.txt)|*.txt"), @@ -952,7 +952,7 @@ wxConfigBase* config = wxConfigBase::Get(); wxString defaultdir = config->Read(wxT("/actualPath"),wxT("")); - wxFileDialog dlg(wxGetActiveWindow(), + wxFileDialog dlg(wxTheApp->GetTopWindow(), _("Open project file"), defaultdir, wxT(""), _("Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*)|*"), @@ -1021,7 +1021,7 @@ DEBUG_TRACE(""); PanoOperation::AddImageOperation addImage; UIntSet images; - PanoCommand* cmd=addImage.GetCommand(wxGetActiveWindow(),pano,images); + PanoCommand* cmd=addImage.GetCommand(wxTheApp->GetTopWindow(),pano,images); if(cmd!=NULL) { GlobalCmdHist::getInstance().addCommand(cmd); @@ -1068,7 +1068,7 @@ { PanoOperation::AddImagesSeriesOperation imageSeriesOp; UIntSet images; - PT::PanoCommand* cmd=imageSeriesOp.GetCommand(wxGetActiveWindow(),pano,images); + PT::PanoCommand* cmd=imageSeriesOp.GetCommand(wxTheApp->GetTopWindow(),pano,images); if(cmd!=NULL) { GlobalCmdHist::getInstance().addCommand(cmd); @@ -1129,7 +1129,7 @@ void MainFrame::OnAbout(wxCommandEvent & e) { - AboutDialog dlg(wxGetActiveWindow()); + AboutDialog dlg(wxTheApp->GetTopWindow()); dlg.ShowModal(); } @@ -1253,7 +1253,7 @@ DEBUG_INFO("Reading tips from " << strFile.mb_str(wxConvLocal)); wxTipProvider *tipProvider = new LocalizedFileTipProvider(strFile, nValue); - bShowAtStartup = wxShowTip(wxGetActiveWindow(), tipProvider,(nValue ? true:false)); + bShowAtStartup = wxShowTip(wxTheApp->GetTopWindow(), tipProvider,(nValue ? true:false)); //store startup preferences nValue = (bShowAtStartup ? tipProvider->GetCurrentTip() : 0); @@ -1266,19 +1266,20 @@ void MainFrame::OnShowPrefs(wxCommandEvent & e) { DEBUG_TRACE(""); -// wxDialog dlg(this, -1, _("Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL); - PreferencesDialog * pref_dlg = new PreferencesDialog(wxGetActiveWindow()); - pref_dlg->ShowModal(); + PreferencesDialog pref_dlg(PreferencesDialog(wxTheApp->GetTopWindow())); + pref_dlg.ShowModal(); //update image cache size wxConfigBase* cfg=wxConfigBase::Get(); #if defined __WXMSW__ unsigned long long mem = HUGIN_IMGCACHE_UPPERBOUND; unsigned long mem_low = cfg->Read(wxT("/ImageCache/UpperBound"), HUGIN_IMGCACHE_UPPERBOUND); unsigned long mem_high = cfg->Read(wxT("/ImageCache/UpperBoundHigh"), (long) 0); - if (mem_high > 0) { + if (mem_high > 0) + { mem = ((unsigned long long) mem_high << 32) + mem_low; } - else { + else + { mem = mem_low; } ImageCache::getInstance().SetUpperLimit(mem); @@ -1379,7 +1380,7 @@ wxConfigBase* config = wxConfigBase::Get(); wxString defaultdir = config->Read(wxT("/actualPath"),wxT("")); - wxFileDialog dlg(wxGetActiveWindow(), + wxFileDialog dlg(wxTheApp->GetTopWindow(), _("Open project file"), defaultdir, wxT(""), _("Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*)|*"), @@ -1425,7 +1426,7 @@ // get the global config object wxConfigBase* config = wxConfigBase::Get(); - wxFileDialog dlg(wxGetActiveWindow(), + wxFileDialog dlg(wxTheApp->GetTopWindow(), _("Choose template project"), config->Read(wxT("/templatePath"),wxT("")), wxT(""), _("Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*)|*"), @@ -1487,7 +1488,7 @@ HUGIN_FT_CURV_THRESHOLD); { - ProgressReporterDialog progress(unoptimized.size(),_("Fine-tuning all points"),_("Finetuning"),wxGetActiveWindow()); + ProgressReporterDialog progress(unoptimized.size(),_("Fine-tuning all points"),_("Finetuning"),wxTheApp->GetTopWindow()); ImageCache & imgCache = ImageCache::getInstance(); @@ -1607,7 +1608,7 @@ void MainFrame::OnPythonScript(wxCommandEvent & e) { wxString fname; - wxFileDialog dlg(wxGetActiveWindow(), + wxFileDialog dlg(wxTheApp->GetTopWindow(), _("Select python script"), wxConfigBase::Get()->Read(wxT("/lensPath"),wxT("")), wxT(""), _("Python script (*.py)|*.py|All files (*.*)|*.*"), |