From: <bto...@us...> - 2008-01-28 06:23:18
|
Revision: 2710 http://hugin.svn.sourceforge.net/hugin/?rev=2710&view=rev Author: btownshend Date: 2008-01-27 22:23:17 -0800 (Sun, 27 Jan 2008) Log Message: ----------- Added const qualifier to error function to match expectations of latest revision of libpano/filter.h Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-01-28 00:15:36 UTC (rev 2709) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-01-28 06:23:17 UTC (rev 2710) @@ -53,7 +53,7 @@ #else -static void PTPrintErrorWX(char* fmt, va_list ap) +static void PTPrintErrorWX(const char* fmt, va_list ap) { char message[257]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-01-28 07:21:39
|
Revision: 2711 http://hugin.svn.sourceforge.net/hugin/?rev=2711&view=rev Author: dangelo Date: 2008-01-27 23:21:36 -0800 (Sun, 27 Jan 2008) Log Message: ----------- revert 2710. Patch to libpano13 is half-backed and I'll revert it too. Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-01-28 06:23:17 UTC (rev 2710) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-01-28 07:21:36 UTC (rev 2711) @@ -53,7 +53,7 @@ #else -static void PTPrintErrorWX(const char* fmt, va_list ap) +static void PTPrintErrorWX(char* fmt, va_list ap) { char message[257]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-05-25 17:10:56
|
Revision: 3084 http://hugin.svn.sourceforge.net/hugin/?rev=3084&view=rev Author: dangelo Date: 2008-05-25 10:10:54 -0700 (Sun, 25 May 2008) Log Message: ----------- use a wxProgressDialog::Pulse to update the optimisation progress display. Requires wxWidgets 2.8 Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-25 16:03:57 UTC (rev 3083) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-25 17:10:54 UTC (rev 3084) @@ -136,7 +136,7 @@ if (dlg == 0) { return FALSE; } - dlg->Update(0, wxString(argument, wxConvLocal)); + dlg->Pulse(wxString(argument, wxConvLocal)); } return TRUE; case _setProgress: @@ -152,7 +152,7 @@ { sprintf( text,"%s%s", mainMessage, &(argument[1]) ); } - if (! dlg->Update(0, wxString(text, wxConvLocal))) { + if (! dlg->Pulse(wxString(text, wxConvLocal))) { return FALSE; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-05-26 19:54:16
|
Revision: 3087 http://hugin.svn.sourceforge.net/hugin/?rev=3087&view=rev Author: dangelo Date: 2008-05-26 12:54:15 -0700 (Mon, 26 May 2008) Log Message: ----------- try to make optimizer progress display wider Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-26 19:35:17 UTC (rev 3086) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-26 19:54:15 UTC (rev 3087) @@ -131,7 +131,7 @@ // we need to ensure that there is are enough lines in the dialog.. // create progress dialog dlg = new wxProgressDialog(_("Panorama Tools"), - _("\n\n\n"), 100, NULL, + _(" \n\n\n"), 100, NULL, wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME); if (dlg == 0) { return FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-05-26 20:01:39
|
Revision: 3088 http://hugin.svn.sourceforge.net/hugin/?rev=3088&view=rev Author: dangelo Date: 2008-05-26 13:01:37 -0700 (Mon, 26 May 2008) Log Message: ----------- Use numbers as placeholders for optimize string (should work better with proportional fonts) Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-26 19:54:15 UTC (rev 3087) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-26 20:01:37 UTC (rev 3088) @@ -131,7 +131,7 @@ // we need to ensure that there is are enough lines in the dialog.. // create progress dialog dlg = new wxProgressDialog(_("Panorama Tools"), - _(" \n\n\n"), 100, NULL, + _("0123456789012345678901234567890123456789012345\n\n\n"), 100, NULL, wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME); if (dlg == 0) { return FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-05-27 15:43:16
|
Revision: 3090 http://hugin.svn.sourceforge.net/hugin/?rev=3090&view=rev Author: dangelo Date: 2008-05-27 08:43:09 -0700 (Tue, 27 May 2008) Log Message: ----------- do not require wxWidgets 2.8 Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-27 13:42:57 UTC (rev 3089) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-27 15:43:09 UTC (rev 3090) @@ -136,13 +136,19 @@ if (dlg == 0) { return FALSE; } +#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8 dlg->Pulse(wxString(argument, wxConvLocal)); +#elsif 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 ); @@ -152,7 +158,12 @@ { sprintf( text,"%s%s", mainMessage, &(argument[1]) ); } - if (! dlg->Pulse(wxString(text, wxConvLocal))) { +#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8 + cont = dlg->Pulse(wxString(argument, wxConvLocal)); +#elsif wxMAJOR_VERSION == 2 + cont = dlg->Update(1, wxString(argument, wxConvLocal)); +#endif + if (! cont) { return FALSE; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gko...@us...> - 2008-05-27 20:57:26
|
Revision: 3094 http://hugin.svn.sourceforge.net/hugin/?rev=3094&view=rev Author: gkohlmeyer Date: 2008-05-27 13:56:58 -0700 (Tue, 27 May 2008) Log Message: ----------- Fix of #elsif statement to #elif statement Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-27 19:52:00 UTC (rev 3093) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-05-27 20:56:58 UTC (rev 3094) @@ -138,7 +138,7 @@ } #if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8 dlg->Pulse(wxString(argument, wxConvLocal)); -#elsif wxMAJOR_VERSION == 2 +#elif wxMAJOR_VERSION == 2 dlg->Update(0, wxString(argument, wxConvLocal)); #endif } @@ -160,7 +160,7 @@ } #if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8 cont = dlg->Pulse(wxString(argument, wxConvLocal)); -#elsif wxMAJOR_VERSION == 2 +#elif wxMAJOR_VERSION == 2 cont = dlg->Update(1, wxString(argument, wxConvLocal)); #endif if (! cont) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-06-12 06:24:38
|
Revision: 3122 http://hugin.svn.sourceforge.net/hugin/?rev=3122&view=rev Author: dangelo Date: 2008-06-11 23:24:34 -0700 (Wed, 11 Jun 2008) Log Message: ----------- Use more lines on for optimize progress dialog on OSX Modified Paths: -------------- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp =================================================================== --- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-06-11 11:27:06 UTC (rev 3121) +++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2008-06-12 06:24:34 UTC (rev 3122) @@ -131,7 +131,12 @@ // we need to ensure that there is are enough lines in the dialog.. // create progress dialog dlg = new wxProgressDialog(_("Panorama Tools"), - _("0123456789012345678901234567890123456789012345\n\n\n"), 100, NULL, +#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; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |