From: <gpa...@us...> - 2008-07-18 03:24:49
|
Revision: 3205 http://hugin.svn.sourceforge.net/hugin/?rev=3205&view=rev Author: gpatters1 Date: 2008-07-18 03:24:44 +0000 (Fri, 18 Jul 2008) Log Message: ----------- [2000096] Fix for crash when redo-ing a load project. Modified Paths: -------------- hugin/trunk/src/hugin1/PT/PanoCommand.h hugin/trunk/src/hugin1/hugin/MainFrame.cpp hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp hugin/trunk/src/hugin1/hugin/wxPanoCommand.h Modified: hugin/trunk/src/hugin1/PT/PanoCommand.h =================================================================== --- hugin/trunk/src/hugin1/PT/PanoCommand.h 2008-07-18 03:13:14 UTC (rev 3204) +++ hugin/trunk/src/hugin1/PT/PanoCommand.h 2008-07-18 03:24:44 UTC (rev 3205) @@ -1217,14 +1217,15 @@ class LoadPTProjectCmd : public PanoCommand { public: - LoadPTProjectCmd(Panorama & p, std::istream & i, const std::string & prefix = "") + LoadPTProjectCmd(Panorama & p, const std::string & filename, const std::string & prefix = "") : PanoCommand(p), - in(i), - prefix(prefix) + filename(filename), + prefix(prefix) { } virtual bool processPanorama(Panorama& pano) { + std::ifstream in(filename.c_str()); #ifndef _Hgn1_PANORAMA_H PanoramaMemento newPano; if (newPano.loadPTScript(in,prefix)) { @@ -1240,6 +1241,7 @@ } #endif + in.close(); pano.changeFinished(); return true; @@ -1251,7 +1253,7 @@ } private: - std::istream & in; + const std::string &filename; const std::string &prefix; }; Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2008-07-18 03:13:14 UTC (rev 3204) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2008-07-18 03:24:44 UTC (rev 3205) @@ -623,27 +623,23 @@ { DEBUG_TRACE(""); m_filename = filename; + // remove old images from cache // hmm probably not a good idea, if the project is reloaded.. - //ImageCache::getInstance().flush(); + // ImageCache::getInstance().flush(); - wxFileName fname(filename); - wxString path = fname.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); - SetStatusText( _("Open project: ") + filename); - // get the global config object - wxConfigBase* config = wxConfigBase::Get(); - std::ifstream file((const char *)filename.mb_str(HUGIN_CONV_FILENAME)); - if (file.good()) { + wxFileName fname(filename); + wxString path = fname.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR); + if (fname.IsOk() && fname.FileExists()) { wxBusyCursor wait; GlobalCmdHist::getInstance().addCommand( - new wxLoadPTProjectCmd(pano,file, (const char *)path.mb_str(HUGIN_CONV_FILENAME)) - ); + new wxLoadPTProjectCmd(pano,(const char *)filename.mb_str(HUGIN_CONV_FILENAME), (const char *)path.mb_str(HUGIN_CONV_FILENAME)) + ); DEBUG_DEBUG("project contains " << pano.getNrOfImages() << " after load"); opt_panel->setModeCustom(); SetStatusText(_("Project opened")); - config->Write(wxT("/actualPath"), path); // remember for later this->SetTitle(fname.GetName() + wxT(".") + fname.GetExt() + wxT(" - hugin")); if (! (fname.GetExt() == wxT("pto"))) { // do not remember filename if its not a hugin project @@ -651,6 +647,9 @@ // incompatible one m_filename = wxT(""); } + // get the global config object + wxConfigBase* config = wxConfigBase::Get(); + config->Write(wxT("/actualPath"), path); // remember for later } else { SetStatusText( _("Error opening project: ") + filename); DEBUG_ERROR("Could not open file " << filename); Modified: hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp 2008-07-18 03:13:14 UTC (rev 3204) +++ hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp 2008-07-18 03:24:44 UTC (rev 3205) @@ -307,6 +307,7 @@ PanoramaMemento newPano; int ptoVersion = 0; + std::ifstream in(filename.c_str()); if (newPano.loadPTScript(in, ptoVersion, prefix)) { pano.setMemento(newPano); PanoramaOptions opts = pano.getOptions(); @@ -407,6 +408,7 @@ } else { DEBUG_ERROR("could not load panotools script"); } + in.close(); pano.changeFinished(); } Modified: hugin/trunk/src/hugin1/hugin/wxPanoCommand.h =================================================================== --- hugin/trunk/src/hugin1/hugin/wxPanoCommand.h 2008-07-18 03:13:14 UTC (rev 3204) +++ hugin/trunk/src/hugin1/hugin/wxPanoCommand.h 2008-07-18 03:24:44 UTC (rev 3205) @@ -72,9 +72,9 @@ class wxLoadPTProjectCmd : public PanoCommand { public: - wxLoadPTProjectCmd(Panorama & p, std::istream & i, const std::string & prefix = "") + wxLoadPTProjectCmd(Panorama & p, const std::string filename, const std::string prefix = "") : PanoCommand(p), - in(i), + filename(filename), prefix(prefix) { }; @@ -85,8 +85,8 @@ return "load project"; } private: - std::istream & in; - const std::string &prefix; + const std::string filename; + const std::string prefix; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gpa...@us...> - 2008-08-07 20:20:35
|
Revision: 3280 http://hugin.svn.sourceforge.net/hugin/?rev=3280&view=rev Author: gpatters1 Date: 2008-08-07 20:20:31 +0000 (Thu, 07 Aug 2008) Log Message: ----------- [2027795] Keep popups from assistant and images panel above the main window. Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.h hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2008-08-07 18:34:18 UTC (rev 3279) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2008-08-07 20:20:31 UTC (rev 3280) @@ -466,7 +466,7 @@ command = utils::wxQuoteFilename(command); wxString cmdline = command + wxT(" ") + args; - MyExecDialog dlg(NULL, title, + MyExecDialog dlg(parent, title, wxDefaultPosition, wxSize(640, 400)); return dlg.ExecWithRedirect(cmdline); Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2008-08-07 18:34:18 UTC (rev 3279) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2008-08-07 20:20:31 UTC (rev 3280) @@ -373,7 +373,7 @@ // all images.. UIntSet imgs; if (m_pano->getNrOfImages() < 2) { - wxMessageBox(_("At least two images are required.\nPlease add more images."),_("Error")); + wxMessageBox(_("At least two images are required.\nPlease add more images."),_("Error"), wxOK, this); return; } @@ -393,11 +393,11 @@ bool createCtrlP = m_pano->getNrOfCtrlPoints() == 0; - ProgressReporterDialog progress(5, _("Aligning images"), _("Finding corresponding points")); + ProgressReporterDialog progress(5, _("Aligning images"), _("Finding corresponding points"),this); wxString alignMsg; if (createCtrlP) { AutoCtrlPointCreator matcher; - CPVector cps = matcher.automatch(*m_pano, imgs, nFeatures); + CPVector cps = matcher.automatch(*m_pano, imgs, nFeatures,this); GlobalCmdHist::getInstance().addCommand( new PT::AddCtrlPointsCmd(*m_pano, cps) ); @@ -419,7 +419,7 @@ // display message box with wxMessageBox(wxString::Format(_("Warning %d unconnected image groups found:"), n) + Components2Str(comps) + wxT("\n") - + _("Please create control points between unconnected images using the Control Points tab.\n\nAfter adding the points, press the \"Align\" button again")); + + _("Please create control points between unconnected images using the Control Points tab.\n\nAfter adding the points, press the \"Align\" button again"),_("Error"), wxOK , this); return; } @@ -550,7 +550,8 @@ ImageCache::EntryPtr e = ImageCache::getInstance().getSmallImage(optPano.getImage(i).getFilename()); vigra::FRGBImage * img = new FRGBImage; if (!e) { - wxMessageBox(_("Error: could not load all images"), _("Error")); + wxMessageBox(_("Error: could not load all images"), + _("Error"),wxOK,this); return; } if (e->origType == "UINT8") { Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp 2008-08-07 18:34:18 UTC (rev 3279) +++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp 2008-08-07 20:20:31 UTC (rev 3280) @@ -100,7 +100,8 @@ CPVector AutoCtrlPointCreator::automatch(Panorama & pano, const UIntSet & imgs, - int nFeatures) + int nFeatures, + wxWindow *parent) { CPVector cps; int t = wxConfigBase::Get()->Read(wxT("/AutoPano/Type"),HUGIN_AP_TYPE); @@ -110,7 +111,7 @@ tmp[0] = _("Autopano (version 1.03 or greater), from http://autopano.kolor.com"); tmp[1] = _("Autopano-Sift, from http://user.cs.tu-berlin.de/~nowozin/autopano-sift/"); // determine autopano type - wxSingleChoiceDialog d(NULL, _("Choose which autopano program should be used\n"), _("Select autopano type"), + wxSingleChoiceDialog d(parent, _("Choose which autopano program should be used\n"), _("Select autopano type"), 2, tmp, NULL); if (d.ShowModal() == wxID_OK) { @@ -125,7 +126,7 @@ { if(wxMessageBox(_("Autopano from http://autopano.kolor.com is not available for OSX"), _("Would you like to use Autopano-Sift instead?"), - wxOK|wxCANCEL|wxICON_EXCLAMATION) + wxOK|wxCANCEL|wxICON_EXCLAMATION, parent) == wxOK) t=1; else return cps; } @@ -135,14 +136,14 @@ { // autopano@kolor AutoPanoKolor matcher; - cps = matcher.automatch(pano, imgs, nFeatures); + cps = matcher.automatch(pano, imgs, nFeatures, parent); break; } case 1: { // autopano-sift AutoPanoSift matcher; - cps = matcher.automatch(pano, imgs, nFeatures); + cps = matcher.automatch(pano, imgs, nFeatures, parent); break; } default: @@ -153,7 +154,7 @@ } CPVector AutoPanoSift::automatch(Panorama & pano, const UIntSet & imgs, - int nFeatures) + int nFeatures, wxWindow *parent) { CPVector cps; if (imgs.size() == 0) { @@ -175,7 +176,7 @@ if(autopanoExe == wxT("")) { - wxMessageBox(wxT(""), _("Specified Autopano-SIFT not installed in bundle.")); + wxMessageBox(wxT(""), _("Specified Autopano-SIFT not installed in bundle."), wxOK | wxICON_ERROR, parent); return cps; } } else if (autopanoExe == wxT("panomatic")) { @@ -184,7 +185,7 @@ if(autopanoExe == wxT("")) { - wxMessageBox(wxT(""), _("Specified panomatic not installed in bundle.")); + wxMessageBox(wxT(""), _("Specified panomatic not installed in bundle."), wxOK | wxICON_ERROR, parent); return cps; } } else if (autopanoExe == wxT("matchpoint-complete-mac.sh")) { @@ -193,13 +194,13 @@ if(autopanoExe == wxT("")) { - wxMessageBox(wxT(""), _("Specified matchpoint-complete-mac.sh not installed in bundle.")); + wxMessageBox(wxT(""), _("Specified matchpoint-complete-mac.sh not installed in bundle."),wxOK | wxICON_ERROR, parent); return cps; } } else if(!wxFileExists(autopanoExe)) { /*wxLogError(_("Autopano-SIFT not found. Please specify a valid path in the preferences")); return cps; */ - wxFileDialog dlg(0,_("Select autopano frontend (script)"), + wxFileDialog dlg(parent,_("Select autopano frontend (script)"), wxT(""), wxT(""), _("Exe or Script (*.*)|*.*"), wxOPEN, wxDefaultPosition); @@ -267,7 +268,7 @@ if (! (use_namefile || use_params || use_inputscript)) { wxMessageBox(_("Please use %namefile, %i or %s to specify the input files for autopano-sift"), - _("Error in Autopano command"), wxOK | wxICON_ERROR); + _("Error in Autopano command"), wxOK | wxICON_ERROR,parent); return cps; } @@ -327,7 +328,7 @@ if (autopanoArgs.size() > 32000) { wxMessageBox(_("autopano command line too long.\nThis is a windows limitation\nPlease select less images, or place the images in a folder with\na shorter pathname"), _("Too many images selected"), - wxCANCEL | wxICON_ERROR ); + wxCANCEL | wxICON_ERROR, parent ); return cps; } #endif @@ -340,28 +341,27 @@ if (arguments.GetCount() > 127) { DEBUG_ERROR("Too many arguments for call to wxExecute()"); DEBUG_ERROR("Try using the %s parameter in preferences"); - wxMessageBox( _("Could not execute command: " + autopanoExe), _("wxExecute Error"), wxOK | wxICON_ERROR); + wxMessageBox( _("Could not execute command: " + autopanoExe), _("wxExecute Error"), wxOK | wxICON_ERROR, parent); return cps; } int ret = 0; // use MyExternalCmdExecDialog - ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, 0, _("finding control points")); + ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, parent, _("finding control points")); if (ret == -1) { - wxMessageBox( _("Could not execute command: " + cmd), _("wxExecute Error"), wxOK | wxICON_ERROR); + wxMessageBox( _("Could not execute command: " + cmd), _("wxExecute Error"), wxOK | wxICON_ERROR, parent); return cps; } else if (ret > 0) { wxMessageBox(_("command: ") + cmd + _("\nfailed with error code: ") + wxString::Format(wxT("%d"),ret), - _("wxExecute Error"), - wxOK | wxICON_ERROR); + _("wxExecute Error"), wxOK | wxICON_ERROR, parent); return cps; } if (! wxFileExists(ptofile.c_str())) { wxMessageBox(wxString(_("Could not open ")) + ptofile + _(" for reading\nThis is an indicator that the autopano call failed,\nor wrong command line parameters have been used.\n\nAutopano command: ") - + cmd, _("autopano failure"), wxOK | wxICON_ERROR ); + + cmd, _("autopano failure"), wxOK | wxICON_ERROR, parent ); return cps; } @@ -391,7 +391,7 @@ CPVector AutoPanoKolor::automatch(Panorama & pano, const UIntSet & imgs, - int nFeatures) + int nFeatures, wxWindow *parent) { CPVector cps; #ifdef __WXMSW__ @@ -445,7 +445,7 @@ if (cmd.size() > 32766) { wxMessageBox(_("autopano command line too long.\nThis is a windows limitation\nPlease select less images, or place the images in a folder with\na shorter pathname"), _("Too many images selected"), - wxCANCEL ); + wxCANCEL, parent); return cps; } #endif @@ -456,23 +456,23 @@ if (arguments.GetCount() > 127) { DEBUG_ERROR("Too many arguments for call to wxExecute()"); DEBUG_ERROR("Try using the %s parameter in preferences"); - wxMessageBox( _("Could not execute command: " + autopanoExe), _("wxExecute Error"), wxOK | wxICON_ERROR); + wxMessageBox( _("Could not execute command: " + autopanoExe), _("wxExecute Error"), wxOK | wxICON_ERROR, parent); return cps; } int ret = 0; // use MyExternalCmdExecDialog - ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, 0, _("finding control points")); + ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, parent, _("finding control points")); if (ret == -1) { wxMessageBox( _("Could not execute command: " + cmd), _("wxExecute Error"), - wxOK | wxICON_ERROR); + wxOK | wxICON_ERROR, parent); return cps; } else if (ret > 0) { wxMessageBox(_("command: ") + cmd + _("\nfailed with error code: ") + wxString::Format(wxT("%d"),ret), _("wxExecute Error"), - wxOK | wxICON_ERROR); + wxOK | wxICON_ERROR, parent); return cps; } @@ -482,7 +482,7 @@ wxMessageBox(wxString(_("Could not open ")) + ptofile + _(" for reading\nThis is an indicator that the autopano call failed,\nor wrong command line parameters have been used.\n\nAutopano command: ") + cmd + _("\n current directory:") + wxGetCwd(), - _("autopano failure"), wxCANCEL ); + _("autopano failure"), wxCANCEL, parent ); return cps; } // read and update control points Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.h =================================================================== --- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.h 2008-08-07 18:34:18 UTC (rev 3279) +++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.h 2008-08-07 20:20:31 UTC (rev 3280) @@ -46,7 +46,7 @@ * on the matcher selected */ virtual CPVector automatch(PT::Panorama & pano, const PT::UIntSet & imgs, - int nFeatures); + int nFeatures, wxWindow *parent=NULL); protected: @@ -70,7 +70,7 @@ virtual ~AutoPanoSift() {} ; virtual CPVector automatch(PT::Panorama & pano, const PT::UIntSet & imgs, - int nFeatures); + int nFeatures, wxWindow *parent=NULL); private: @@ -91,7 +91,7 @@ virtual ~AutoPanoKolor() {} ; virtual CPVector automatch(PT::Panorama & pano, const PT::UIntSet & imgs, - int nFeatures); + int nFeatures, wxWindow *parent=NULL); private: Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2008-08-07 18:34:18 UTC (rev 3279) +++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2008-08-07 20:20:31 UTC (rev 3280) @@ -276,7 +276,7 @@ , wxSpinCtrl)->GetValue(); AutoCtrlPointCreator matcher; - CPVector cps = matcher.automatch(*pano, selImg, nFeatures); + CPVector cps = matcher.automatch(*pano, selImg, nFeatures,this); wxString msg; wxMessageBox(wxString::Format(_("Added %d control points"), cps.size()), _("Autopano result"),wxOK|wxICON_INFORMATION,this); GlobalCmdHist::getInstance().addCommand( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gpa...@us...> - 2008-08-23 22:24:32
|
Revision: 3356 http://hugin.svn.sourceforge.net/hugin/?rev=3356&view=rev Author: gpatters1 Date: 2008-08-23 22:24:30 +0000 (Sat, 23 Aug 2008) Log Message: ----------- [2027795] Keep Optimizer error popup above main frame. Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp hugin/trunk/src/hugin1/base_wx/PTWXDlg.h hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-08-23 21:35:40 UTC (rev 3355) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-08-23 22:24:30 UTC (rev 3356) @@ -53,6 +53,8 @@ #else +wxWindow* appParent = NULL; + static void PTPrintErrorWX(char* fmt, va_list ap) { char message[257]; @@ -60,7 +62,7 @@ vsprintf(message, fmt, ap); // MessageBox(GetFocus(), (LPSTR)message, (LPSTR)"", MB_OK | MB_ICONHAND) ; - wxMessageBox(wxString(message,wxConvLocal), _("Panorama Tools"), wxOK | wxICON_HAND); + wxMessageBox(wxString(message,wxConvLocal), _("Panorama Tools"), wxOK | wxICON_HAND,appParent); } @@ -190,8 +192,9 @@ return TRUE; } -void registerPTWXDlgFcn() +void registerPTWXDlgFcn(wxWindow* parent) { + appParent = parent; PT_setProgressFcn(&PTProgressWX); PT_setErrorFcn(&PTPrintErrorWX); PT_setInfoDlgFcn(&PTInfoDlgWX); Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.h 2008-08-23 21:35:40 UTC (rev 3355) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.h 2008-08-23 22:24:30 UTC (rev 3356) @@ -24,7 +24,7 @@ #ifndef _PTWXDLG_H #define _PTWXDLG_H -void registerPTWXDlgFcn(); +void registerPTWXDlgFcn(wxWindow *parent=NULL); void deregisterPTWXDlgFcn(); Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2008-08-23 21:35:40 UTC (rev 3355) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2008-08-23 22:24:30 UTC (rev 3356) @@ -446,7 +446,7 @@ // temporarily disable PT progress dialog.. deregisterPTWXDlgFcn(); smartOptimize(optPano); - registerPTWXDlgFcn(); + registerPTWXDlgFcn(MainFrame::Get()); } progress.increaseProgress(1.0, std::string(wxString(_("Leveling the panorama")).mb_str(wxConvLocal))); Modified: hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp 2008-08-23 21:35:40 UTC (rev 3355) +++ hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp 2008-08-23 22:24:30 UTC (rev 3356) @@ -559,7 +559,7 @@ optPano.printPanoramaScript(std::cerr, optPano.getOptimizeVector(), optPano.getOptions(), allImg, false); #endif - registerPTWXDlgFcn(); + registerPTWXDlgFcn(MainFrame::Get()); // do global optimisation optPano.setCtrlPoints(cps); PTools::optimize(optPano); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-01-27 15:20:37
|
Revision: 3597 http://hugin.svn.sourceforge.net/hugin/?rev=3597&view=rev Author: stativ Date: 2009-01-27 15:20:29 +0000 (Tue, 27 Jan 2009) Log Message: ----------- Add more image filters to Add image dialog. Fixes bug #2031549 Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/platform.h hugin/trunk/src/hugin1/hugin/MainFrame.cpp hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp Modified: hugin/trunk/src/hugin1/base_wx/platform.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/platform.h 2009-01-27 09:22:27 UTC (rev 3596) +++ hugin/trunk/src/hugin1/base_wx/platform.h 2009-01-27 15:20:29 UTC (rev 3597) @@ -36,7 +36,7 @@ #define HUGIN_CONV_FILENAME (*wxConvFileName) #endif -#define HUGIN_WX_FILE_IMG_FILTER _("All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|All files (*)|*") +#define HUGIN_WX_FILE_IMG_FILTER _("All Image files|*.jpg;*.JPG;*jpeg;*JPEG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr;*.HDR;*.exr;*.EXR|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|TIFF files (*.tif,*.tiff)|*.tif;*.TIF;*.tiff;*.TIFF|PNG files (*.png)|*.png;*.PNG|HDR files (*.hdr)|*.hdr;*.HDR|EXR files (*.exr)|*.exr;*.EXR|All files (*)|*") #if defined __WXMAC__ Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-01-27 09:22:27 UTC (rev 3596) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-01-27 15:20:29 UTC (rev 3597) @@ -772,8 +772,16 @@ dlg.SetFilterIndex(0); else if (img_ext == wxT("jpg")) dlg.SetFilterIndex(1); + else if (img_ext == wxT("tiff")) + dlg.SetFilterIndex(2); + else if (img_ext == wxT("png")) + dlg.SetFilterIndex(3); + else if (img_ext == wxT("hdr")) + dlg.SetFilterIndex(4); + else if (img_ext == wxT("exr")) + dlg.SetFilterIndex(5); else if (img_ext == wxT("all files")) - dlg.SetFilterIndex(2); + dlg.SetFilterIndex(6); DEBUG_INFO ( "Image extention: " << img_ext.mb_str(wxConvLocal) ) // call the file dialog @@ -806,7 +814,11 @@ switch ( dlg.GetFilterIndex() ) { case 0: config->Write(wxT("lastImageType"), wxT("all images")); break; case 1: config->Write(wxT("lastImageType"), wxT("jpg")); break; - case 2: config->Write(wxT("lastImageType"), wxT("all files")); break; + case 2: config->Write(wxT("lastImageType"), wxT("tiff")); break; + case 3: config->Write(wxT("lastImageType"), wxT("png")); break; + case 4: config->Write(wxT("lastImageType"), wxT("hdr")); break; + case 5: config->Write(wxT("lastImageType"), wxT("exr")); break; + case 6: config->Write(wxT("lastImageType"), wxT("all files")); break; } } else { Modified: hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp 2009-01-27 09:22:27 UTC (rev 3596) +++ hugin/trunk/src/hugin1/hugin/wxPanoCommand.cpp 2009-01-27 15:20:29 UTC (rev 3597) @@ -445,8 +445,16 @@ dlg.SetFilterIndex(0); else if (img_ext == wxT("jpg")) dlg.SetFilterIndex(1); + else if (img_ext == wxT("tiff")) + dlg.SetFilterIndex(2); + else if (img_ext == wxT("png")) + dlg.SetFilterIndex(3); + else if (img_ext == wxT("hdr")) + dlg.SetFilterIndex(4); + else if (img_ext == wxT("exr")) + dlg.SetFilterIndex(5); else if (img_ext == wxT("all files")) - dlg.SetFilterIndex(2); + dlg.SetFilterIndex(6); DEBUG_INFO ( "Image extention: " << img_ext.mb_str(wxConvLocal) ); // call the file dialog @@ -464,7 +472,11 @@ switch ( dlg.GetFilterIndex() ) { case 0: config->Write(wxT("lastImageType"), wxT("all images")); break; case 1: config->Write(wxT("lastImageType"), wxT("jpg")); break; - case 2: config->Write(wxT("lastImageType"), wxT("all files")); break; + case 2: config->Write(wxT("lastImageType"), wxT("tiff")); break; + case 3: config->Write(wxT("lastImageType"), wxT("png")); break; + case 4: config->Write(wxT("lastImageType"), wxT("hdr")); break; + case 5: config->Write(wxT("lastImageType"), wxT("exr")); break; + case 6: config->Write(wxT("lastImageType"), wxT("all files")); break; } // add images. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-03-21 00:12:09
|
Revision: 3754 http://hugin.svn.sourceforge.net/hugin/?rev=3754&view=rev Author: brunopostle Date: 2009-03-21 00:11:49 +0000 (Sat, 21 Mar 2009) Log Message: ----------- French translations for .desktop files Bug #2694281 (Jean-Luc Coulon) Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/hugin.desktop hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.desktop Modified: hugin/trunk/src/hugin1/hugin/hugin.desktop =================================================================== --- hugin/trunk/src/hugin1/hugin/hugin.desktop 2009-03-21 00:05:16 UTC (rev 3753) +++ hugin/trunk/src/hugin1/hugin/hugin.desktop 2009-03-21 00:11:49 UTC (rev 3754) @@ -2,12 +2,12 @@ Name=Hugin panorama creator Name[cs]=Hugin pro skládání panoramat Name[de]=Hugin panorama creator -Name[fr]=Hugin créateur de panoramas +Name[fr]=Hugin - Créateur de panoramas Name[ru]=Сшиватель панорам Hugin Comment=Stitch photographs together Comment[cs]=Skládání panoramatických snímků Comment[de]=Erzeugt Panoramabildern aus mehreren Einzelbildern. -Comment[fr]=Assebler des photographies +Comment[fr]=Assembler des photographies Comment[ru]=Сшивка панорам из отдельных фотографий GenericName=Panorama stitcher GenericName[de]=Panorama Stitcher Modified: hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop =================================================================== --- hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop 2009-03-21 00:05:16 UTC (rev 3753) +++ hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop 2009-03-21 00:11:49 UTC (rev 3754) @@ -1,9 +1,12 @@ [Desktop Entry] Name=Hugin PTBatcher GUI Name[ru]=Графический интерфейс к PTBatcher +Name[fr]=Hugin - Interface grahique pour le traitement par lots PTBatcher Comment=Hugin project stitching queue manager +Comment[fr]=Gérer la file d'attente des projets Hugin d'assemblage GenericName=Panorama batch processor GUI GenericName[ru]=Пакетная сборка панорам +GenericName[fr]=Interface graphique pour le traitement par lots de panoramas Categories=Graphics; Exec=PTBatcherGUI Icon=hugin Modified: hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.desktop =================================================================== --- hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.desktop 2009-03-21 00:05:16 UTC (rev 3753) +++ hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.desktop 2009-03-21 00:11:49 UTC (rev 3754) @@ -1,7 +1,10 @@ [Desktop Entry] Name=Hugin project stitcher +Name[fr]=Hugin - Assembleur de projet Comment=Stitch an existing Hugin project +Comment[fr]=Assembler un projet Hugin existant GenericName=Panorama batch stitcher +GenericName[fr]=Assemblage par lots de panoramas Categories=Graphics; Exec=hugin_stitch_project Icon=hugin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2009-03-29 16:10:49
|
Revision: 3766 http://hugin.svn.sourceforge.net/hugin/?rev=3766&view=rev Author: ippei Date: 2009-03-29 16:10:46 +0000 (Sun, 29 Mar 2009) Log Message: ----------- Partial implementation of wide character support to the Progress API in ProgressReporterDialog class. Without this, Hugin crashes in Japanese when Celeste is used. Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/MyProgressDialog.cpp hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp Modified: hugin/trunk/src/hugin1/base_wx/MyProgressDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyProgressDialog.cpp 2009-03-29 16:08:03 UTC (rev 3765) +++ hugin/trunk/src/hugin1/base_wx/MyProgressDialog.cpp 2009-03-29 16:10:46 UTC (rev 3766) @@ -73,6 +73,25 @@ return true; } +// TODO entire ProgressReporter and ProgressDisplay API needs be updated to use wstring. +// Temporarily implemented only for this function. from here --> +bool ProgressReporterDialog::increaseProgress(double i, const std::wstring & msg) +{ + if (m_abort) return false; + + m_progress += i; + m_message = wxString(msg.c_str()); + // build the message: + int percentage = (int) floor(m_progress/m_maxProgress*100); + if (percentage > 100) percentage = 100; + std::cerr << m_message << ": " << percentage << "%" << std::endl; + if (!Update(percentage, m_message)) { + return false; + } + return true; +} +// <- to here + void ProgressReporterDialog::setMessage(const std::string & msg) { m_message = wxString(msg.c_str(), wxConvLocal); Modified: hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h 2009-03-29 16:08:03 UTC (rev 3765) +++ hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h 2009-03-29 16:10:46 UTC (rev 3766) @@ -46,6 +46,11 @@ virtual bool increaseProgress(double delta); virtual bool increaseProgress(double delta, const std::string & msg); + + // TODO entire ProgressReporter and ProgressDisplay API needs be updated to use wstring. + // Temporarily implemented only for this function. from here --> + virtual bool increaseProgress(double delta, const std::wstring & msg); + // <- to here virtual void setMessage(const std::string & msg); Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-03-29 16:08:03 UTC (rev 3765) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-03-29 16:10:46 UTC (rev 3766) @@ -2180,12 +2180,6 @@ wxString wxstrModelFileName = huginApp::Get()->GetXRCPath() + wxT("data/") + wxT(HUGIN_CELESTE_MODEL); // convert wxString to string string strModelFileName(wxstrModelFileName.mb_str(wxConvUTF8)); - #if __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE - char buf[100]; - wxstrModelFileName = MacGetPathToBundledResourceFile(CFSTR("celeste.model")); - strcpy( buf, (const char*) wxstrModelFileName.mb_str(wxConvUTF8)); - strModelFileName = buf; - #endif // SVM model file @@ -2199,7 +2193,7 @@ DEBUG_TRACE("Running Celeste"); - progress.increaseProgress(1.0, std::string(wxString(_("Running Celeste")).mb_str(wxConvLocal))); + progress.increaseProgress(1.0, std::wstring(wxString(_("Running Celeste")).wc_str(wxConvLocal))); // Vector to store Gabor filter responses vector<double> svm_responses_cp; @@ -2209,7 +2203,7 @@ // Get responses get_gabor_response(imagefile, mask, strModelFileName, threshold, mask_format, svm_responses_cp); - progress.increaseProgress(1.0, std::string(wxString(_("Running Celeste")).mb_str(wxConvLocal))); + progress.increaseProgress(1.0, std::wstring(wxString(_("Running Celeste")).wc_str(wxConvLocal))); // Print SVM results unsigned int removed = 0; @@ -2231,7 +2225,7 @@ } } - progress.increaseProgress(1.0, std::string(wxString(_("Running Celeste")).mb_str(wxConvLocal))); + progress.increaseProgress(1.0, std::wstring(wxString(_("Running Celeste")).wc_str(wxConvLocal))); wxMessageBox(wxString::Format(_("Removed %d control points"), removed), _("Celeste result"),wxOK|wxICON_INFORMATION,this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-04-20 05:37:45
|
Revision: 3794 http://hugin.svn.sourceforge.net/hugin/?rev=3794&view=rev Author: tmodes Date: 2009-04-20 05:37:40 +0000 (Mon, 20 Apr 2009) Log Message: ----------- Added some documentation Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp hugin/trunk/src/hugin1/hugin/CPImagesComboBox.h hugin/trunk/src/hugin1/hugin/ResetDialog.cpp hugin/trunk/src/hugin1/hugin/ResetDialog.h hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp hugin/trunk/src/hugin1/ptbatcher/BatchFrame.h Modified: hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp 2009-04-19 22:54:01 UTC (rev 3793) +++ hugin/trunk/src/hugin1/hugin/CPImagesComboBox.cpp 2009-04-20 05:37:40 UTC (rev 3794) @@ -1,3 +1,5 @@ +/** Implementation of CPImagesComboBox and CPImagesComboBoxXmlHandler */ + #include "hugin/CPImagesComboBox.h" BEGIN_EVENT_TABLE(CPImagesComboBox,wxOwnerDrawnComboBox) Modified: hugin/trunk/src/hugin1/hugin/CPImagesComboBox.h =================================================================== --- hugin/trunk/src/hugin1/hugin/CPImagesComboBox.h 2009-04-19 22:54:01 UTC (rev 3793) +++ hugin/trunk/src/hugin1/hugin/CPImagesComboBox.h 2009-04-20 05:37:40 UTC (rev 3794) @@ -1,5 +1,5 @@ // -*- c-basic-offset: 4 -*- -/** @file CPImagesComboBox.h +/* @file CPImagesComboBox.h * * * This is free software; you can redistribute it and/or @@ -32,25 +32,32 @@ using namespace std; using namespace PT; +/** Owner Drawn ComboBox for showing connected images on CP tab */ class CPImagesComboBox : public wxOwnerDrawnComboBox { public: + /** Paint method for drawing text and indication bar of combo box */ virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int WXUNUSED(flags)) const; + /** Get maximum CP distance for all images pairs containing the reference image */ void CalcCPDistance(Panorama * pano); + /** Set new reference image */ void SetRefImage(Panorama * pano, unsigned int newRefImg) { refImage=newRefImg; CalcCPDistance(pano); }; + /** Returns the reference image number */ const unsigned int GetRefImage() { return refImage; }; protected: + /** Mouse wheel handler to mimic wxChoice behavior */ void OnMouseWheel(wxMouseEvent & e); + /** Key handler to mimic wxChoice behavior */ void OnKeyDown(wxKeyEvent & e); private: unsigned int refImage; @@ -64,14 +71,17 @@ DECLARE_DYNAMIC_CLASS(CPImagesComboBox) }; -/** xrc handler */ +/** xrc handler for CPImagesComboBox */ class CPImagesComboBoxXmlHandler : public wxOwnerDrawnComboBoxXmlHandler { DECLARE_DYNAMIC_CLASS(CPImagesComboBoxXmlHandler) public: + /** Constructor */ CPImagesComboBoxXmlHandler(); + /** Create CPImagesComboBox from resource */ virtual wxObject *DoCreateResource(); + /** Internal use to identify right xml handler */ virtual bool CanHandle(wxXmlNode *node); }; Modified: hugin/trunk/src/hugin1/hugin/ResetDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/ResetDialog.cpp 2009-04-19 22:54:01 UTC (rev 3793) +++ hugin/trunk/src/hugin1/hugin/ResetDialog.cpp 2009-04-20 05:37:40 UTC (rev 3794) @@ -1,3 +1,5 @@ +/** implementation of ResetDialog */ + #include "hugin/ResetDialog.h" #include "common/wxPlatform.h" Modified: hugin/trunk/src/hugin1/hugin/ResetDialog.h =================================================================== --- hugin/trunk/src/hugin1/hugin/ResetDialog.h 2009-04-19 22:54:01 UTC (rev 3793) +++ hugin/trunk/src/hugin1/hugin/ResetDialog.h 2009-04-20 05:37:40 UTC (rev 3794) @@ -1,5 +1,5 @@ // -*- c-basic-offset: 4 -*- -/** @file ResetDialog.h +/* @file ResetDialog.h * * * This is free software; you can redistribute it and/or @@ -23,22 +23,48 @@ #include "panoinc_WX.h" +/** Dialog for reset panorama settings + * + * Dialog let user select, which parameter should be reseted. + * The user can select + * - reset position (yaw, pitch, roll) + * - reset fov (when images files have the right EXIF values, otherwise fov remains unchanged) + * - reset lens parameter (a, b, c, d, e, g, t) + * - reset exposure: to EXIF value (exposure correction) or zero (no exposure correction) + * - reset color + * - reset vignetting + * - reset camera response + */ class ResetDialog : public wxDialog { public: - // ctor. + /** Constructor, read from xrc ressource; restore last uses settings, size and position */ ResetDialog(wxWindow *parent); + /** Return TRUE, when user selected "Reset position" */ bool GetResetPos(); + /** Return TRUE, when user selected "Reset FOV" */ bool GetResetFOV(); + /** Return TRUE, when user selected "Reset lens" */ bool GetResetLens(); + /** Return TRUE, when user selected "Reset exposure" */ bool GetResetExposure(); + /** Return TRUE, when user selected "Reset exposure to EXIF", + * Return FALSE, when user selected "Reset exposure to ZERO" + */ bool GetResetExposureToExif(); + /** Return TRUE, when user selected "Reset color" */ bool GetResetColor(); + /** Return TRUE, when user selected "Reset vignetting" */ bool GetResetVignetting(); + /** Return TRUE, when user selected "Reset Camera Response" */ bool GetResetResponse(); protected: + /** Method for enabling/disable combobox to select reset exposure to EXIF or ZERO + * depending on state of "Reset exposure" checkbox + */ void OnSelectExposure(wxCommandEvent & e); + /** Saves current state of all checkboxes when closing dialog with Ok */ void OnOk(wxCommandEvent & e); private: Modified: hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp 2009-04-19 22:54:01 UTC (rev 3793) +++ hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp 2009-04-20 05:37:40 UTC (rev 3794) @@ -28,7 +28,7 @@ #include <wx/stdpaths.h> #include "PTBatcherGUI.h" -/** file drag and drop handler method */ +/* file drag and drop handler method */ bool BatchDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) { BatchFrame * MyBatchFrame = wxGetApp().GetFrame(); Modified: hugin/trunk/src/hugin1/ptbatcher/BatchFrame.h =================================================================== --- hugin/trunk/src/hugin1/ptbatcher/BatchFrame.h 2009-04-19 22:54:01 UTC (rev 3793) +++ hugin/trunk/src/hugin1/ptbatcher/BatchFrame.h 2009-04-20 05:37:40 UTC (rev 3794) @@ -33,10 +33,16 @@ #include "DirTraverser.h" //#include <wx/app.h> -/** simple class that forward the drop to the mainframe */ +/** Simple class that forward the drop to the mainframe */ class BatchDropTarget : public wxFileDropTarget { public: + /** File/directory drag and drop handler method + * + * When a project file is droped, it is added with default prefix. + * When a directory is dropped, the directory and all sub-directory are scanned and + * all found project files are added to the queue. + */ bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-04-28 05:33:24
|
Revision: 3809 http://hugin.svn.sourceforge.net/hugin/?rev=3809&view=rev Author: tmodes Date: 2009-04-28 05:33:07 +0000 (Tue, 28 Apr 2009) Log Message: ----------- Send to Batch in Hugin starts PTBatcherGUI and adds project to queue Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/PanoPanel.cpp hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/PanoPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2009-04-28 02:34:34 UTC (rev 3808) +++ hugin/trunk/src/hugin1/hugin/PanoPanel.cpp 2009-04-28 05:33:07 UTC (rev 3809) @@ -1033,7 +1033,14 @@ wxString projectFile = MainFrame::Get()->getProjectName(); if(wxFileName::FileExists(projectFile)) { - int i=0; +#ifdef __WINDOWS__ + wxString huginPath = getExePath(wxGetApp().argv[0])+wxFileName::GetPathSeparator(); +#else + wxString huginPath = _T(""); //we call the batch processor directly without path on linux +#endif + wxExecute(huginPath+wxT("PTBatcherGUI ")+wxQuoteFilename(projectFile)); + + /*int i=0; wxString batchFileName = wxStandardPaths::Get().GetUserConfigDir()+wxFileName::GetPathSeparator(); batchFileName = batchFileName.Append(_T(".ptbs")) << i; while(wxFileName::FileExists(batchFileName)){ @@ -1044,7 +1051,7 @@ wxFile batchFile; batchFile.Create(batchFileName); batchFile.Write(projectFile,wxConvLocal); - batchFile.Close(); + batchFile.Close(); */ } } Modified: hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp 2009-04-28 02:34:34 UTC (rev 3808) +++ hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp 2009-04-28 05:33:07 UTC (rev 3809) @@ -154,9 +154,9 @@ //we define the working dir to search in and the file name syntax of the spool files //wxMessageBox( _T("new file received1"),_T("new file received1"),wxOK | wxICON_INFORMATION ); - wxDir* workingDir = new wxDir(wxStandardPaths::Get().GetUserConfigDir()); - wxString fileSent = _T(".ptbs*"); - wxString pending; + //wxDir* workingDir = new wxDir(wxStandardPaths::Get().GetUserConfigDir()); + //wxString fileSent = _T(".ptbs*"); + //wxString pending; /*wxString fileTemp = _T(".ptbt*"); wxString temp = _T(""); //we check for existing temporary files @@ -217,9 +217,9 @@ change = true; } //wxMessageBox( _T("test"),_T("Error!"),wxOK | wxICON_INFORMATION ); - pending = workingDir->FindFirst(workingDir->GetName(),fileSent,wxDIR_FILES | wxDIR_HIDDEN); + //pending = workingDir->FindFirst(workingDir->GetName(),fileSent,wxDIR_FILES | wxDIR_HIDDEN); //wxMessageBox( _T("test1"),_T("Error!"),wxOK | wxICON_INFORMATION ); - if(!pending.IsEmpty()) + /*if(!pending.IsEmpty()) { wxString projectPending = _T(""); //wxMessageBox( _T("new file received"),spoolFile,wxOK | wxICON_INFORMATION ); @@ -237,7 +237,7 @@ if(!wxRemoveFile(pending)) wxMessageBox( _("Error: Could not remove temporary file"),_("Error!"),wxOK | wxICON_INFORMATION ); - } + }*/ //wxMessageBox( _T("test2"),_T("Error!"),wxOK | wxICON_INFORMATION ); wxFileName* tempFile; //wxMessageBox( _T("test3"),_T("Error!"),wxOK | wxICON_INFORMATION ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-06-10 18:16:21
|
Revision: 3937 http://hugin.svn.sourceforge.net/hugin/?rev=3937&view=rev Author: brunopostle Date: 2009-06-10 18:16:19 +0000 (Wed, 10 Jun 2009) Log Message: ----------- Hungarian translation (H?\195?\182ss Lajos) Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/hugin.desktop hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop Modified: hugin/trunk/src/hugin1/hugin/hugin.desktop =================================================================== --- hugin/trunk/src/hugin1/hugin/hugin.desktop 2009-06-10 15:48:29 UTC (rev 3936) +++ hugin/trunk/src/hugin1/hugin/hugin.desktop 2009-06-10 18:16:19 UTC (rev 3937) @@ -4,16 +4,19 @@ Name[de]=Hugin - Panorama-Editor Name[fr]=Hugin - Créateur de panoramas Name[ru]=Сшиватель панорам Hugin +Name[hu]=Hugin panoráma készítő Comment=Stitch photographs together Comment[cs]=Skládání panoramatických snímků Comment[de]=Erzeugt Panoramabildern aus mehreren Einzelbildern. Comment[fr]=Assembler des photographies Comment[ru]=Сшивка панорам из отдельных фотографий +Comment[hu]=Fényképek összefűzése egymással GenericName=Panorama stitcher GenericName[de]=Panorama Stitcher GenericName[fr]=Assemblage de panoramas GenericName[cs]=Nástroj pro skládání panoramat GenericName[ru]=Сшиватель панорам +GenericName[hu]=Panoráma összefűző Categories=Graphics; Exec=hugin Icon=hugin Modified: hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop =================================================================== --- hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop 2009-06-10 15:48:29 UTC (rev 3936) +++ hugin/trunk/src/hugin1/ptbatcher/PTBatcherGUI.desktop 2009-06-10 18:16:19 UTC (rev 3937) @@ -3,13 +3,16 @@ Name[ru]=Графический интерфейс к PTBatcher Name[fr]=Hugin - Interface grahique pour le traitement par lots PTBatcher Name[de]=Hugin - Stapelverarbeitung +Name[hu]=Hugin kötegelt feldolgozó Comment=Hugin project stitching queue manager Comment[fr]=Gérer la file d'attente des projets Hugin d'assemblage Comment[de]=Stapelverarbeitung für die Panoramaerstellung +Comment[hu]=Hugin projekt összefűző sor kezelő GenericName=Panorama batch processor GUI GenericName[ru]=Пакетная сборка панорам GenericName[fr]=Interface graphique pour le traitement par lots de panoramas GenericName[de]=Panorama Stapelverarbeitung +GenericName[hu]=Panoráma kötegelt feldolgozó GUI Categories=Graphics; Exec=PTBatcherGUI %F Icon=hugin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gpa...@us...> - 2009-08-15 04:01:21
|
Revision: 4211 http://hugin.svn.sourceforge.net/hugin/?rev=4211&view=rev Author: gpatters1 Date: 2009-08-15 04:01:15 +0000 (Sat, 15 Aug 2009) Log Message: ----------- [2062016] Do not report an error message if cancel is pressed when creating control points. Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2009-08-15 03:28:28 UTC (rev 4210) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.cpp 2009-08-15 04:01:15 UTC (rev 4211) @@ -587,6 +587,7 @@ wxBoxSizer * topsizer = new wxBoxSizer( wxVERTICAL ); m_execPanel = new MyExecPanel(this); + m_cancelled = false; topsizer->Add(m_execPanel, 1, wxEXPAND | wxALL, 2); @@ -604,11 +605,17 @@ void MyExecDialog::OnProcessTerminate(wxProcessEvent & event) { DEBUG_DEBUG("Process terminated with return code: " << event.GetExitCode()); - EndModal(event.GetExitCode()); + if (m_cancelled) { + EndModal(HUGIN_EXIT_CODE_CANCELLED); + } else { + EndModal(event.GetExitCode()); + } } void MyExecDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { + DEBUG_DEBUG("Cancel Pressed"); + m_cancelled = true; m_execPanel->KillProcess(); } Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2009-08-15 03:28:28 UTC (rev 4210) +++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2009-08-15 04:01:15 UTC (rev 4211) @@ -27,6 +27,8 @@ #ifndef _MYEXTERNALCMDEXECDIALOG__H #define _MYEXTERNALCMDEXECDIALOG__H +const int HUGIN_EXIT_CODE_CANCELLED = -255; + class MyExternalCmdExecDialog; class HuginPipedProcess; int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent, wxString title); @@ -158,6 +160,7 @@ private: MyExecPanel * m_execPanel; + bool m_cancelled; // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() Modified: hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp 2009-08-15 03:28:28 UTC (rev 4210) +++ hugin/trunk/src/hugin1/hugin/AutoCtrlPointCreator.cpp 2009-08-15 04:01:15 UTC (rev 4211) @@ -513,7 +513,9 @@ // use MyExternalCmdExecDialog ret = MyExecuteCommandOnDialog(autopanoExe, autopanoArgs, parent, _("finding control points")); - if (ret == -1) { + if (ret == HUGIN_EXIT_CODE_CANCELLED) { + return cps; + } else if (ret == -1) { wxMessageBox( _("Could not execute command: " + cmd), _("wxExecute Error"), wxOK | wxICON_ERROR, parent); return cps; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2009-09-07 23:17:32
|
Revision: 4349 http://hugin.svn.sourceforge.net/hugin/?rev=4349&view=rev Author: yuv Date: 2009-09-07 23:17:08 +0000 (Mon, 07 Sep 2009) Log Message: ----------- remove old MSVC build cruft (use CMake now) Removed Paths: ------------- hugin/trunk/src/hugin1/hugin/hugin.vcproj hugin/trunk/src/hugin1/nona_gui/nona_gui.vcproj Deleted: hugin/trunk/src/hugin1/hugin/hugin.vcproj =================================================================== --- hugin/trunk/src/hugin1/hugin/hugin.vcproj 2009-09-07 23:06:51 UTC (rev 4348) +++ hugin/trunk/src/hugin1/hugin/hugin.vcproj 2009-09-07 23:17:08 UTC (rev 4349) @@ -1,468 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="hugin" - ProjectGUID="{FF6A5DA5-C4F3-4FC2-AF9F-E0F8CAA0A70B}" - RootNamespace="hugin" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\mswd;..\..\..\libs\wxWidgets\include" - PreprocessorDefinitions="HasPANO13;DEBUG;WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - PrecompiledHeaderFile=".\Debug/XrcDemoVC.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib" - OutputFile="$(OutDir)/$(ProjectName).exe" - LinkIncremental="2" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\boost\stage\lib" - IgnoreDefaultLibraryNames="libcd.lib,libcid.lib,msvcrt.lib" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/xmldemo.pdb" - SubSystem="1" - EntryPointSymbol="WinMainCRTStartup" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\Debug/XrcDemoVC.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool" - CommandLine="xcopy xrc Debug\xrc /I /Y -xcopy xrc\data Debug\xrc\data /I /Y -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="2057" - AdditionalIncludeDirectories=""..\..\..\libs\wxWidgets\include""/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\msw;..\..\..\libs\wxWidgets\include" - PreprocessorDefinitions="HasPANO13;NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - PrecompiledHeaderFile=".\Release/XrcDemoVC.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib" - OutputFile="$(OutDir)/$(ProjectName).exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12;..\..\..\libs\boost\stage\lib" - IgnoreDefaultLibraryNames="libc.lib,libci.lib,msvcrtd.lib" - ProgramDatabaseFile=".\Release/xmldemo.pdb" - SubSystem="2" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\Release/XrcDemoVC.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool" - Description="Install into temp folder" - CommandLine="xcopy xrc Release\xrc /I /Y -xcopy xrc\data Release\xrc\data /I /Y -"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" - AdditionalIncludeDirectories=""..\..\..\libs\wxWidgets\include""/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release Unicode|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\mswu;..\..\..\libs\wxWidgets\include" - PreprocessorDefinitions="HasPANO13;NDEBUG;WIN32;__WXMSW__;WINVER=0x0400;STRICT;UNICODE;wxUSE_UNICODE=1" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - PrecompiledHeaderFile=".\Release/XrcDemoVC.pch" - AssemblerListingLocation=".\Release Unicode/" - ObjectFile=".\Release Unicode/" - ProgramDataBaseFileName=".\Release Unicode/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="2" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib" - OutputFile="$(OutDir)/$(ProjectName).exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12;..\..\..\libs\boost\stage\lib" - IgnoreDefaultLibraryNames="libc.lib,libci.lib,msvcrtd.lib" - ProgramDatabaseFile=".\Release/xmldemo.pdb" - SubSystem="2" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\Release/XrcDemoVC.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool" - Description="Installing to temporary folder" - CommandLine="xcopy xrc "Release Unicode\xrc" /I /Y -xcopy xrc\data "Release Unicode\xrc\data" /I /Y -" - ExcludedFromBuild="FALSE"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" - AdditionalIncludeDirectories=""..\..\..\libs\wxWidgets\include""/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter=""> - <File - RelativePath=".\AssistantPanel.cpp"> - </File> - <File - RelativePath=".\AutoCtrlPointCreator.cpp"> - </File> - <File - RelativePath=".\CommandHistory.cpp"> - </File> - <File - RelativePath=".\CPEditorPanel.cpp"> - </File> - <File - RelativePath=".\CPImageCtrl.cpp"> - </File> - <File - RelativePath=".\CPListFrame.cpp"> - </File> - <File - RelativePath=".\CropPanel.cpp"> - </File> - <File - RelativePath=".\HFOVDialog.cpp"> - </File> - <File - RelativePath=".\huginApp.cpp"> - </File> - <File - RelativePath=".\ImageCache.cpp"> - </File> - <File - RelativePath=".\ImagesList.cpp"> - </File> - <File - RelativePath=".\ImagesPanel.cpp"> - </File> - <File - RelativePath=".\LensPanel.cpp"> - </File> - <File - RelativePath=".\LocalizedFileTipProvider.cpp"> - </File> - <File - RelativePath=".\MainFrame.cpp"> - </File> - <File - RelativePath=".\MyExternalCmdExecDialog.cpp"> - </File> - <File - RelativePath=".\MyProgressDialog.cpp"> - </File> - <File - RelativePath=".\NonaStitcherPanel.cpp"> - </File> - <File - RelativePath=".\OptimizePanel.cpp"> - </File> - <File - RelativePath=".\OptimizePhotometricPanel.cpp"> - </File> - <File - RelativePath=".\PanoDruid.cpp"> - </File> - <File - RelativePath=".\PanoPanel.cpp"> - </File> - <File - RelativePath=".\Plot2D.cpp"> - </File> - <File - RelativePath=".\PreferencesDialog.cpp"> - </File> - <File - RelativePath=".\PreviewFrame.cpp"> - </File> - <File - RelativePath=".\PreviewPanel.cpp"> - </File> - <File - RelativePath=".\PTStitcherPanel.cpp"> - </File> - <File - RelativePath=".\PTWXDlg.cpp"> - </File> - <File - RelativePath=".\RunStitcherFrame.cpp"> - </File> - <File - RelativePath=".\TextKillFocusHandler.cpp"> - </File> - <File - RelativePath=".\win_prep.h"> - </File> - <File - RelativePath=".\wxPanoCommand.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter=""> - <File - RelativePath="..\include\hugin\AnchorPositionCtrl.h"> - </File> - <File - RelativePath="..\include\hugin\AssistantPanel.h"> - </File> - <File - RelativePath="..\include\hugin\AutoCtrlPointCreator.h"> - </File> - <File - RelativePath="..\include\hugin\CommandHistory.h"> - </File> - <File - RelativePath="..\include\hugin\config.h"> - </File> - <File - RelativePath="..\include\hugin\config_defaults.h"> - </File> - <File - RelativePath="..\include\hugin\CPEditorPanel.h"> - </File> - <File - RelativePath="..\include\hugin\CPEditorPanelHandler.h"> - </File> - <File - RelativePath="..\include\hugin\CPFineTuneFrame.h"> - </File> - <File - RelativePath="..\include\hugin\CPImageCtrl.h"> - </File> - <File - RelativePath="..\include\hugin\CPListFrame.h"> - </File> - <File - RelativePath="..\include\hugin\CPZoomDisplayPanel.h"> - </File> - <File - RelativePath="..\include\hugin\CropPanel.h"> - </File> - <File - RelativePath="..\include\hugin\HFOVDialog.h"> - </File> - <File - RelativePath="..\include\hugin\huginApp.h"> - </File> - <File - RelativePath="..\include\hugin\ImageCache.h"> - </File> - <File - RelativePath="..\include\hugin\ImageProcessing.h"> - </File> - <File - RelativePath="..\include\hugin\ImagesList.h"> - </File> - <File - RelativePath="..\include\hugin\ImagesPanel.h"> - </File> - <File - RelativePath="..\include\hugin\LensPanel.h"> - </File> - <File - RelativePath="..\include\hugin\LocalizedFileTipProvider.h"> - </File> - <File - RelativePath="..\include\hugin\MainFrame.h"> - </File> - <File - RelativePath="..\include\hugin\MyExternalCmdExecDialog.h"> - </File> - <File - RelativePath="..\include\hugin\MyProgressDialog.h"> - </File> - <File - RelativePath="..\include\hugin\NonaStitcherPanel.h"> - </File> - <File - RelativePath="..\include\hugin\OptimizePanel.h"> - </File> - <File - RelativePath="..\include\hugin\OptimizePhotometricPanel.h"> - </File> - <File - RelativePath="..\include\hugin\PanoDruid.h"> - </File> - <File - RelativePath="..\include\hugin\PanoPanel.h"> - </File> - <File - RelativePath="..\include\hugin\Plot2D.h"> - </File> - <File - RelativePath="..\include\hugin\PreferencesDialog.h"> - </File> - <File - RelativePath="..\include\hugin\PreviewFrame.h"> - </File> - <File - RelativePath="..\include\hugin\PreviewPanel.h"> - </File> - <File - RelativePath="..\include\hugin\PTStitcherPanel.h"> - </File> - <File - RelativePath="..\include\hugin\PTWXDlg.h"> - </File> - <File - RelativePath="..\include\hugin\RunOptimizerFrame.h"> - </File> - <File - RelativePath="..\include\hugin\RunStitcherFrame.h"> - </File> - <File - RelativePath="..\include\hugin\StitcherPanel.h"> - </File> - <File - RelativePath="..\include\hugin\TextKillFocusHandler.h"> - </File> - <File - RelativePath="..\include\hugin\VigCorrDialog.h"> - </File> - <File - RelativePath="..\include\hugin\wxPanoCommand.h"> - </File> - </Filter> - <Filter - Name="Resource Files" - Filter=""> - <File - RelativePath=".\hugin_rc.rc"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Deleted: hugin/trunk/src/hugin1/nona_gui/nona_gui.vcproj =================================================================== --- hugin/trunk/src/hugin1/nona_gui/nona_gui.vcproj 2009-09-07 23:06:51 UTC (rev 4348) +++ hugin/trunk/src/hugin1/nona_gui/nona_gui.vcproj 2009-09-07 23:17:08 UTC (rev 4349) @@ -1,243 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="nona_gui" - RootNamespace="nona_gui" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\mswd;..\..\..\libs\wxWidgets\include" - PreprocessorDefinitions="HasPANO13;DEBUG;WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT" - RuntimeLibrary="1" - BufferSecurityCheck="TRUE" - PrecompiledHeaderFile=".\Debug/XrcDemoVC.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="3" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib" - OutputFile="$(OutDir)/$(ProjectName).exe" - LinkIncremental="2" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12;..\..\..\libs\boost\stage\lib" - IgnoreDefaultLibraryNames="libcd.lib,libcid.lib,msvcrt.lib" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/xmldemo.pdb" - SubSystem="2" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\Debug/XrcDemoVC.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="2057" - AdditionalIncludeDirectories=""..\..\..\libs\wxWidgets\include""/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\msw;..\..\..\libs\wxWidgets\include" - PreprocessorDefinitions="HasPANO13;NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - PrecompiledHeaderFile=".\Release/XrcDemoVC.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib" - OutputFile="$(OutDir)/$(ProjectName).exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12;..\..\..\libs\boost\stage\lib" - IgnoreDefaultLibraryNames="" - ProgramDatabaseFile=".\Release/xmldemo.pdb" - SubSystem="2" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\Release/XrcDemoVC.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" - AdditionalIncludeDirectories=""..\..\..\libs\wxWidgets\include""/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release Unicode|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE"> - <Tool - Name="VCCLCompilerTool" - Optimization="1" - InlineFunctionExpansion="2" - AdditionalIncludeDirectories="../include;..\..\..\libs\wxWidgets\src\tiff;..\..\..\libs\wxWidgets\src\zlib;..\..\..\libs\wxWidgets\src\jpeg;..\..\..\libs\wxWidgets\src\png;..\..\..\libs\wxWidgets\src;..\foreign;..\..\..\libs\libpano;..\..\..\libs\boost;..\..\..\libs\wxWidgets\lib\vc_lib\mswu;..\..\..\libs\wxWidgets\include" - PreprocessorDefinitions="HasPANO13;NDEBUG;WIN32;__WXMSW__;WINVER=0x0400;STRICT;UNICODE;wxUSE_UNICODE=1" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - PrecompiledHeaderFile=".\Release/XrcDemoVC.pch" - AssemblerListingLocation=".\Release Unicode/" - ObjectFile=".\Release Unicode/" - ProgramDataBaseFileName=".\Release Unicode/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - CompileAs="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib" - OutputFile="$(OutDir)/$(ProjectName).exe" - LinkIncremental="1" - SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="..\..\..\libs\wxWidgets\lib\vc_lib;..\..\..\libs\libpano\pano12;..\..\..\libs\boost\stage\lib" - IgnoreDefaultLibraryNames="" - ProgramDatabaseFile=".\Release/xmldemo.pdb" - SubSystem="2" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\Release/XrcDemoVC.tlb" - HeaderFileName=""/> - <Tool - Name="VCPostBuildEventTool" - Description="Installing to temporary folder" - CommandLine="vc_hugin_inst.bat" - ExcludedFromBuild="TRUE"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="2057" - AdditionalIncludeDirectories=""..\..\..\libs\wxWidgets\include""/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter=""> - <File - RelativePath="..\hugin\MyProgressDialog.cpp"> - </File> - <File - RelativePath=".\nona_gui.cpp"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter=""> - </Filter> - <Filter - Name="Resource Files" - Filter=""> - <File - RelativePath=".\nona_gui_rc.rc"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2009-09-10 16:14:15
|
Revision: 4361 http://hugin.svn.sourceforge.net/hugin/?rev=4361&view=rev Author: yuv Date: 2009-09-10 16:14:09 +0000 (Thu, 10 Sep 2009) Log Message: ----------- restore progress dialog Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/CMakeLists.txt hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp hugin/trunk/src/hugin1/hugin/huginApp.cpp Added Paths: ----------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp hugin/trunk/src/hugin1/base_wx/PTWXDlg.h Modified: hugin/trunk/src/hugin1/base_wx/CMakeLists.txt =================================================================== --- hugin/trunk/src/hugin1/base_wx/CMakeLists.txt 2009-09-10 06:24:25 UTC (rev 4360) +++ hugin/trunk/src/hugin1/base_wx/CMakeLists.txt 2009-09-10 16:14:09 UTC (rev 4361) @@ -1,5 +1,5 @@ -SET(HUGIN_WX_BASE_SRC ImageCache.cpp MyProgressDialog.cpp Plot2D.cpp +SET(HUGIN_WX_BASE_SRC ImageCache.cpp MyProgressDialog.cpp Plot2D.cpp PTWXDlg.cpp huginConfig.cpp MyExternalCmdExecDialog.cpp platform.cpp RunStitchPanel.cpp ) Added: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp (rev 0) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2009-09-10 16:14:09 UTC (rev 4361) @@ -0,0 +1,191 @@ +// -*- c-basic-offset: 4 -*- + +/** @file OptimizePanel.cpp + * + * @brief implementation of OptimizePanel + * + * @author Pablo d'Angelo <pab...@we...> + * + * $Id: PTWXDlg.cpp 3356 2008-08-23 22:24:30Z gpatters1 $ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> +#include "panoinc.h" +#include "panoinc_WX.h" + +extern "C" { +#include <pano13/filter.h> +#include <pano13/queryfeature.h> +} + +// Error reporting + +wxWindow* appParent = NULL; + +static void PTPrintErrorWX(char* fmt, va_list ap) +{ + char message[257]; + + vsprintf(message, fmt, ap); + +// MessageBox(GetFocus(), (LPSTR)message, (LPSTR)"", MB_OK | MB_ICONHAND) ; + wxMessageBox(wxString(message,wxConvLocal), _("Panorama Tools"), wxOK | wxICON_HAND,appParent); +} + + +// Progress report; return false if canceled + + +static int PTProgressWX( int command, char* argument ){ + + static wxProgressDialog * dlg = 0; +// MSG msg; + long percent; + switch( command ){ + case _initProgress: + if (dlg) { + dlg->Destroy(); + dlg = 0; + } else { + dlg = new wxProgressDialog(_("Panorama Tools"), + _("\n\n\n"), 100, NULL, + wxPD_APP_MODAL | wxPD_CAN_ABORT); + if (dlg == 0) { + return FALSE; + } + dlg->Update(0, wxString(argument, wxConvLocal)); + } + return TRUE; + case _setProgress: + if (dlg) { + sscanf(argument,"%ld", &percent); + if(percent>100) percent = 100; + if(percent<0 ) percent = 0; + if (! dlg->Update(percent)) { + return FALSE; + } + } + return TRUE; + break; + case _disposeProgress: + if( dlg != 0 ) + { + dlg->Destroy(); + dlg=0; + } + + return TRUE; + + case _idleProgress: + return TRUE; + + } + return TRUE; +} + + +static int PTInfoDlgWX ( int command, char* argument ) // Display info: same argumenmts as progress +{ + char text[256]; + static char mainMessage[256]; + + static wxProgressDialog * dlg = 0; +// MSG msg; + switch( command ){ + case _initProgress: + if (dlg) { + dlg->Destroy(); + dlg = 0; + } else { + // we need to ensure that there is are enough lines in the dialog.. + // create progress dialog + dlg = new wxProgressDialog(_("Panorama Tools"), +#ifdef __WXMAC__ + _("0123456789012345678901234567890123456789012345\n\n\n\n\n"), +#else + _("0123456789012345678901234567890123456789012345\n\n\n"), +#endif + 100, NULL, + wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME); + if (dlg == 0) { + return FALSE; + } +#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8 + dlg->Pulse(wxString(argument, wxConvLocal)); +#elif wxMAJOR_VERSION == 2 + dlg->Update(0, wxString(argument, wxConvLocal)); +#endif + } + return TRUE; + case _setProgress: + if (dlg) { + if( *argument != 0 ) + { + bool cont; + + if( *argument != '+' ) + { + strcpy( mainMessage, argument ); + strcpy( text, argument ); + } + else + { + sprintf( text,"%s%s", mainMessage, &(argument[1]) ); + } +#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8 + cont = dlg->Pulse(wxString(argument, wxConvLocal)); +#elif wxMAJOR_VERSION == 2 + cont = dlg->Update(1, wxString(argument, wxConvLocal)); +#endif + if (! cont) { + return FALSE; + } + } + } + return TRUE; + break; + case _disposeProgress: + if( dlg != 0 ) + { + dlg->Destroy(); + dlg=0; + } + + return TRUE; + + case _idleProgress: + return TRUE; + } + return TRUE; +} + +void registerPTWXDlgFcn(wxWindow* parent) +{ + appParent = parent; + PT_setProgressFcn(&PTProgressWX); + PT_setErrorFcn(&PTPrintErrorWX); + PT_setInfoDlgFcn(&PTInfoDlgWX); +}; + +void deregisterPTWXDlgFcn() +{ + PT_setProgressFcn(NULL); + PT_setErrorFcn(NULL); + PT_setInfoDlgFcn(NULL); +} + Added: hugin/trunk/src/hugin1/base_wx/PTWXDlg.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.h (rev 0) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.h 2009-09-10 16:14:09 UTC (rev 4361) @@ -0,0 +1,31 @@ +// -*- c-basic-offset: 4 -*- +/** @file PTWXDlg.h + * + * @author Pablo d'Angelo <pab...@we...> + * + * $Id: PTWXDlg.h 3356 2008-08-23 22:24:30Z gpatters1 $ + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef _PTWXDLG_H +#define _PTWXDLG_H + +void registerPTWXDlgFcn(wxWindow *parent=NULL); +void deregisterPTWXDlgFcn(); + + +#endif // _PTWXDLG_H Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-09-10 06:24:25 UTC (rev 4360) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-09-10 16:14:09 UTC (rev 4361) @@ -51,6 +51,7 @@ #include "hugin/huginApp.h" #include "hugin/AutoCtrlPointCreator.h" #include "hugin/TextKillFocusHandler.h" +#include "base_wx/PTWXDlg.h" #include "hugin/PanoDruid.h" #include "base_wx/MyProgressDialog.h" #include "hugin/config_defaults.h" @@ -560,7 +561,10 @@ { wxBusyCursor bc; + // temporarily disable PT progress dialog.. + deregisterPTWXDlgFcn(); smartOptimize(optPano); + registerPTWXDlgFcn(MainFrame::Get()); } progress.increaseProgress(1.0, std::wstring(wxString(_("Leveling the panorama")).wc_str(wxConvLocal))); Modified: hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp 2009-09-10 06:24:25 UTC (rev 4360) +++ hugin/trunk/src/hugin1/hugin/OptimizePanel.cpp 2009-09-10 16:14:09 UTC (rev 4361) @@ -36,6 +36,7 @@ #include "hugin/CommandHistory.h" #include "hugin/MainFrame.h" #include "base_wx/MyProgressDialog.h" +#include "base_wx/PTWXDlg.h" #include "hugin/config_defaults.h" using namespace std; @@ -551,6 +552,7 @@ optPano.setCtrlPoints(newCP); // temporarily disable PT progress dialog.. + deregisterPTWXDlgFcn(); { wxBusyCursor bc; // run pairwise optimizer @@ -562,6 +564,7 @@ optPano.printPanoramaScript(std::cerr, optPano.getOptimizeVector(), optPano.getOptions(), allImg, false); #endif + registerPTWXDlgFcn(MainFrame::Get()); // do global optimisation optPano.setCtrlPoints(cps); PTools::optimize(optPano); Modified: hugin/trunk/src/hugin1/hugin/huginApp.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/huginApp.cpp 2009-09-10 06:24:25 UTC (rev 4360) +++ hugin/trunk/src/hugin1/hugin/huginApp.cpp 2009-09-10 16:14:09 UTC (rev 4361) @@ -47,6 +47,7 @@ #include "hugin/ImagesList.h" #include "hugin/PreviewPanel.h" #include "hugin/GLPreviewFrame.h" +#include "base_wx/PTWXDlg.h" #include "hugin/CommandHistory.h" #include "hugin/wxPanoCommand.h" @@ -115,6 +116,9 @@ wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), 1); #endif + // register our custom pano tools dialog handlers + registerPTWXDlgFcn(); + // required by wxHtmlHelpController wxFileSystem::AddHandler(new wxZipFSHandler); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2009-10-11 18:45:03
|
Revision: 4603 http://hugin.svn.sourceforge.net/hugin/?rev=4603&view=rev Author: yuv Date: 2009-10-11 18:44:55 +0000 (Sun, 11 Oct 2009) Log Message: ----------- empty messages need not translation - fix gettext warning about empty msgid Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp hugin/trunk/src/hugin1/ptbatcher/Batch.cpp Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-10-11 18:16:45 UTC (rev 4602) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-10-11 18:44:55 UTC (rev 4603) @@ -513,7 +513,7 @@ wxMessageBox(_("Celeste model file not found, Hugin needs to be properly installed." ), _("Fatal Error")); } - MainFrame::Get()->SetStatusText(_(""),0); + MainFrame::Get()->SetStatusText("",0); } DEBUG_TRACE("Finished running Celeste"); Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-10-11 18:16:45 UTC (rev 4602) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-10-11 18:44:55 UTC (rev 4603) @@ -2226,7 +2226,7 @@ DEBUG_TRACE("Finished running Celeste"); - MainFrame::Get()->SetStatusText(_(""),0); + MainFrame::Get()->SetStatusText("",0); } } Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-10-11 18:16:45 UTC (rev 4602) +++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-10-11 18:44:55 UTC (rev 4603) @@ -1017,7 +1017,7 @@ cout << endl; } } - MainFrame::Get()->SetStatusText(_(""),0); + MainFrame::Get()->SetStatusText("",0); } Modified: hugin/trunk/src/hugin1/ptbatcher/Batch.cpp =================================================================== --- hugin/trunk/src/hugin1/ptbatcher/Batch.cpp 2009-10-11 18:16:45 UTC (rev 4602) +++ hugin/trunk/src/hugin1/ptbatcher/Batch.cpp 2009-10-11 18:44:55 UTC (rev 4603) @@ -128,7 +128,7 @@ long idGenTemp = 1; textStream.ReadLine().ToLong(&idGenTemp); //then for each project: project path, prefix, id, status, skip - while((projectName = textStream.ReadLine()).Cmp(_(""))!=0) + while((projectName = textStream.ReadLine()).Cmp("")!=0) { //we add project to internal list AddProjectToBatch(projectName,textStream.ReadLine()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Pablo d'A. <pab...@we...> - 2009-10-11 20:03:03
|
yu...@us... schrieb: > Revision: 4603 > http://hugin.svn.sourceforge.net/hugin/?rev=4603&view=rev > Author: yuv > Date: 2009-10-11 18:44:55 +0000 (Sun, 11 Oct 2009) > > Log Message: > ----------- > empty messages need not translation - fix gettext warning about empty msgid > - MainFrame::Get()->SetStatusText(_(""),0); > + MainFrame::Get()->SetStatusText("",0); This will break the Unicode build on windows. It is better to use MainFrame::Get()->SetStatusText(wxT(""),0); instead. |
From: <yu...@us...> - 2009-10-12 15:12:43
|
Revision: 4618 http://hugin.svn.sourceforge.net/hugin/?rev=4618&view=rev Author: yuv Date: 2009-10-12 15:12:36 +0000 (Mon, 12 Oct 2009) Log Message: ----------- better fix for empty strings Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp hugin/trunk/src/hugin1/ptbatcher/Batch.cpp Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-10-12 14:15:07 UTC (rev 4617) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-10-12 15:12:36 UTC (rev 4618) @@ -512,7 +512,7 @@ wxMessageBox(_("Celeste model file not found, Hugin needs to be properly installed." ), _("Fatal Error")); } - MainFrame::Get()->SetStatusText("",0); + MainFrame::Get()->SetStatusText(wxT(""),0); } DEBUG_TRACE("Finished running Celeste"); Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-10-12 14:15:07 UTC (rev 4617) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-10-12 15:12:36 UTC (rev 4618) @@ -2229,7 +2229,7 @@ DEBUG_TRACE("Finished running Celeste"); - MainFrame::Get()->SetStatusText("",0); + MainFrame::Get()->SetStatusText(wxT(""),0); } } Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-10-12 14:15:07 UTC (rev 4617) +++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-10-12 15:12:36 UTC (rev 4618) @@ -1016,7 +1016,7 @@ ); } - MainFrame::Get()->SetStatusText("",0); + MainFrame::Get()->SetStatusText(wxT(""),0); } Modified: hugin/trunk/src/hugin1/ptbatcher/Batch.cpp =================================================================== --- hugin/trunk/src/hugin1/ptbatcher/Batch.cpp 2009-10-12 14:15:07 UTC (rev 4617) +++ hugin/trunk/src/hugin1/ptbatcher/Batch.cpp 2009-10-12 15:12:36 UTC (rev 4618) @@ -128,7 +128,7 @@ long idGenTemp = 1; textStream.ReadLine().ToLong(&idGenTemp); //then for each project: project path, prefix, id, status, skip - while((projectName = textStream.ReadLine()).Cmp("")!=0) + while((projectName = textStream.ReadLine()).Cmp(wxT(""))!=0) { //we add project to internal list AddProjectToBatch(projectName,textStream.ReadLine()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-03-01 06:17:32
|
Revision: 5037 http://hugin.svn.sourceforge.net/hugin/?rev=5037&view=rev Author: tmodes Date: 2010-03-01 06:17:23 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Warn user about invalid characters in filenames Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/platform.cpp hugin/trunk/src/hugin1/base_wx/platform.h hugin/trunk/src/hugin1/hugin/MainFrame.cpp hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp Modified: hugin/trunk/src/hugin1/base_wx/platform.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/platform.cpp 2010-03-01 06:15:14 UTC (rev 5036) +++ hugin/trunk/src/hugin1/base_wx/platform.cpp 2010-03-01 06:17:23 UTC (rev 5037) @@ -287,3 +287,27 @@ #endif // MAC_SELF_CONTAINED_BUNDLE #endif // __WXMAC__ + +const wxString getInvalidCharacters() +{ +#if defined __WXMSW__ + // the characters :"*?<>| are not allowed in filenames, these are handled well by the file dialog + // we need only to check for characters, which does not work with the makefiles + return wxT("=;%"); +#else + return wxT("=;:%"); +#endif +}; + +bool containsInvalidCharacters(const wxString stringToTest) +{ + if(stringToTest.IsEmpty()) + return false; + wxString forbiddenChars=getInvalidCharacters(); + for(unsigned int j=0;j<forbiddenChars.size();j++) + { + if(stringToTest.Find(forbiddenChars[j])!=wxNOT_FOUND) + return true; + }; + return false; +}; Modified: hugin/trunk/src/hugin1/base_wx/platform.h =================================================================== --- hugin/trunk/src/hugin1/base_wx/platform.h 2010-03-01 06:15:14 UTC (rev 5036) +++ hugin/trunk/src/hugin1/base_wx/platform.h 2010-03-01 06:17:23 UTC (rev 5037) @@ -59,4 +59,9 @@ #endif //__WXMAC__ +/** returns all invalid characters for the filename (mainly characters, which does not work with gnu make) */ +const wxString getInvalidCharacters(); +/** returns true, if the given strings contains invalid characters */ +bool containsInvalidCharacters(const wxString stringToTest); + #endif Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2010-03-01 06:15:14 UTC (rev 5036) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2010-03-01 06:17:23 UTC (rev 5037) @@ -824,20 +824,31 @@ // e safe the current path to config config->Write(wxT("/actualPath"), dlg.GetDirectory()); // remember for later - std::vector<std::string> filesv; - for (unsigned int i=0; i< Pathnames.GetCount(); i++) { - filesv.push_back((const char *)Pathnames[i].mb_str(HUGIN_CONV_FILENAME)); + bool foundForbiddenChars=false; + for(unsigned int i=0;i<Pathnames.GetCount(); i++) + foundForbiddenChars=foundForbiddenChars || containsInvalidCharacters(Pathnames[i]); + if(foundForbiddenChars) + { + wxMessageBox(wxString::Format(_("The filename(s) contains one of the following invalid characters: %s\nHugin can not work with these filenames. Please rename your file(s) and try again."),getInvalidCharacters().c_str()), + _("Error"),wxOK | wxICON_EXCLAMATION,this); } + else + { + std::vector<std::string> filesv; + for (unsigned int i=0; i< Pathnames.GetCount(); i++) { + filesv.push_back((const char *)Pathnames[i].mb_str(HUGIN_CONV_FILENAME)); + } - // we got some images to add. - if (filesv.size() > 0) { - // use a Command to ensure proper undo and updating of GUI - // parts - wxBusyCursor(); - GlobalCmdHist::getInstance().addCommand( - new wxAddImagesCmd(pano,filesv) - ); - } + // we got some images to add. + if (filesv.size() > 0) { + // use a Command to ensure proper undo and updating of GUI + // parts + wxBusyCursor(); + GlobalCmdHist::getInstance().addCommand( + new wxAddImagesCmd(pano,filesv) + ); + }; + }; DEBUG_INFO ( wxString::Format(wxT("img_ext: %d"), dlg.GetFilterIndex()).mb_str(wxConvLocal) ) // save the image extension switch ( dlg.GetFilterIndex() ) { Modified: hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp 2010-03-01 06:15:14 UTC (rev 5036) +++ hugin/trunk/src/hugin1/ptbatcher/BatchFrame.cpp 2010-03-01 06:17:23 UTC (rev 5037) @@ -413,6 +413,13 @@ wxSAVE, wxDefaultPosition); if (dlg.ShowModal() == wxID_OK) { + while(containsInvalidCharacters(dlg.GetPath())) + { + wxMessageBox(wxString::Format(_("The given filename contains one of the following invalid characters: %s\nHugin can not work with this filename. Please enter a valid filename."),getInvalidCharacters().c_str()), + _("Error"),wxOK | wxICON_EXCLAMATION,this); + if(dlg.ShowModal()!=wxID_OK) + return; + }; wxString outname(dlg.GetPath()); ChangePrefix(selIndex,outname); //SetStatusText(_T("Changed prefix for "+projListBox->GetSelectedProject())); Modified: hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp =================================================================== --- hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp 2010-03-01 06:15:14 UTC (rev 5036) +++ hugin/trunk/src/hugin1/stitch_project/hugin_stitch_project.cpp 2010-03-01 06:17:23 UTC (rev 5037) @@ -374,6 +374,13 @@ wxSAVE, wxDefaultPosition); dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/actualPath"),wxT(""))); if (dlg.ShowModal() == wxID_OK) { + while(containsInvalidCharacters(dlg.GetPath())) + { + wxMessageBox(wxString::Format(_("The given filename contains one of the following invalid characters: %s\nHugin can not work with this filename. Please enter a valid filename."),getInvalidCharacters().c_str()), + _("Error"),wxOK | wxICON_EXCLAMATION); + if(dlg.ShowModal()!=wxID_OK) + return false; + }; wxConfig::Get()->Write(wxT("/actualPath"), dlg.GetDirectory()); // remember for later outname = dlg.GetPath(); } else { // bail This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |