From: <bl...@us...> - 2008-11-06 17:02:16
|
Revision: 3530 http://hugin.svn.sourceforge.net/hugin/?rev=3530&view=rev Author: blimbo Date: 2008-11-06 17:02:05 +0000 (Thu, 06 Nov 2008) Log Message: ----------- Windows debugging messages via wx alert boxes Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2008-11-05 19:46:42 UTC (rev 3529) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2008-11-06 17:02:05 UTC (rev 3530) @@ -2129,7 +2129,8 @@ }else{ // Windows debug end - cout << "Celeste: Setting locale" << endl; + //cout << "Celeste: Setting locale" << endl; + wxMessageBox(wxString::Format(_("Celeste: Setting locale")), _("Celeste"), wxICON_EXCLAMATION, this); // set numeric locale to C, for correct number output char * old_locale = setlocale(LC_NUMERIC,NULL); @@ -2138,7 +2139,8 @@ MainFrame::Get()->SetStatusText(_("searching for cloud-like control points..."),0); // Windows debug - cout << "Celeste: Creating storage matrix" << endl; + //cout << "Celeste: Creating storage matrix" << endl; + wxMessageBox(wxString::Format(_("Celeste: Creating storage matrix")), _("Celeste"), wxICON_EXCLAMATION, this); // Create the storage matrix gNumLocs = currentPoints.size(); @@ -2153,11 +2155,17 @@ gLocations[glocation_counter][0] = (int)it->second.x1; gLocations[glocation_counter][1] = (int)it->second.y1; glocation_counter++; + + //cout << "Celeste: Creating storage matrix" << endl; + wxMessageBox(wxString::Format(_("Celeste: Loading CP into matrix")), _("Celeste"), wxICON_EXCLAMATION, this); + } // Windows debug - cout << "Celeste: Storage matrix filled" << endl; + //cout << "Celeste: Storage matrix filled" << endl; + wxMessageBox(wxString::Format(_("Celeste: Storage matrix filled")), _("Celeste"), wxICON_EXCLAMATION, this); + // Get Celeste paramaters wxConfigBase *cfg = wxConfigBase::Get(); @@ -2185,7 +2193,8 @@ string modelfile = buf; // Windows debug - cout << "Celeste: Checking model file exists" << endl; + //cout << "Celeste: Checking model file exists" << endl; + wxMessageBox(wxString::Format(_("Celeste: Checking model file exists")), _("Celeste"), wxICON_EXCLAMATION, this); // SVM model file if (! wxFile::Exists(wxString::FromAscii(buf)) ) { @@ -2205,13 +2214,16 @@ unsigned int mask = 0; // Windows debug - cout << "Celeste: Running get_gabor_response function" << endl; + //cout << "Celeste: Running get_gabor_response function" << endl; + wxMessageBox(wxString::Format(_("Celeste: Running get_gabor_response function")), _("Celeste"), wxICON_EXCLAMATION, this); + get_gabor_response(imagefile,mask,modelfile,threshold,mask_format,svm_responses); // Windows debug - cout << "Celeste: Finished running get_gabor_response function" << endl; - + //cout << "Celeste: Finished running get_gabor_response function" << endl; + wxMessageBox(wxString::Format(_("Celeste: Finished running get_gabor_response function")), _("Celeste"), wxICON_EXCLAMATION, this); + // Print SVM results unsigned int removed = 0; for (unsigned int c = 0; c < svm_responses.size(); c++){ @@ -2219,7 +2231,8 @@ if (svm_responses[c] >= threshold){ // Windows debug - cout << "Celeste: Removing CPs" << endl; + //cout << "Celeste: Removing CPs" << endl; + wxMessageBox(wxString::Format(_("Celeste: Removing CPs")), _("Celeste"), wxICON_EXCLAMATION, this); unsigned int pNr = localPNr2GlobalPNr((c - removed)); DEBUG_DEBUG("about to delete point " << pNr); @@ -2233,7 +2246,8 @@ } // Windows debug - cout << "Celeste: Finished removing CPs" << endl; + //cout << "Celeste: Finished removing CPs" << endl; + wxMessageBox(wxString::Format(_("Celeste: Finished removing CPs")), _("Celeste"), wxICON_EXCLAMATION, this); wxMessageBox(wxString::Format(_("Finished running Celeste.\n%d cloud-like control points removed."), removed), _("Celeste"), wxICON_EXCLAMATION, this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <har...@us...> - 2008-11-11 19:02:39
|
Revision: 3544 http://hugin.svn.sourceforge.net/hugin/?rev=3544&view=rev Author: harryvanderwolf Date: 2008-11-11 19:02:21 +0000 (Tue, 11 Nov 2008) Log Message: ----------- undo local change to CPEditorPanel.cpp Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2008-11-11 18:51:02 UTC (rev 3543) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2008-11-11 19:02:21 UTC (rev 3544) @@ -53,7 +53,7 @@ #include "vigra_ext/Correlation.h" // Celeste header -//#include "CelesteDebug.h" +#include "CelesteDebug.h" #include "CelesteGlobals.h" #include "Utilities.h" #include <stdio.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2008-11-14 04:12:53
|
Revision: 3552 http://hugin.svn.sourceforge.net/hugin/?rev=3552&view=rev Author: yuv Date: 2008-11-14 04:12:42 +0000 (Fri, 14 Nov 2008) Log Message: ----------- Celeste - user warning instead of DEBUG_WARN with Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2008-11-13 22:27:07 UTC (rev 3551) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2008-11-14 04:12:42 UTC (rev 3552) @@ -2118,8 +2118,8 @@ { if (currentPoints.size() == 0) { - DEBUG_WARN("Cannot run celeste without at least one control point connecting the two images"); - cout << "Cannot run celeste without at least one control point connecting the two images" << endl; + wxMessageBox(_("Cannot run celeste without at least one control point connecting the two images"),_("Error")); + cout << "Cannot run celeste without at least one control point connecting the two images" << endl; }else{ ProgressReporterDialog progress(3, _("Running Celeste"), _("Running Celeste"),this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gpa...@us...> - 2009-06-28 22:30:17
|
Revision: 3972 http://hugin.svn.sourceforge.net/hugin/?rev=3972&view=rev Author: gpatters1 Date: 2009-06-28 22:30:16 +0000 (Sun, 28 Jun 2009) Log Message: ----------- [2805325] Fix for assertion triggered when F is pressed during CP creation. Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-06-26 12:06:04 UTC (rev 3971) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-06-28 22:30:16 UTC (rev 3972) @@ -1887,7 +1887,7 @@ bool left = e.GetEventObject() == m_leftImg; if (cpCreationState == NO_POINT) { FineTuneSelectedPoint(left); - } else { + } else if (cpCreationState == BOTH_POINTS_SELECTED) { FineTuneNewPoint(left); } } else if (e.GetKeyCode() == 'g') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-01-11 06:51:02
|
Revision: 4872 http://hugin.svn.sourceforge.net/hugin/?rev=4872&view=rev Author: tmodes Date: 2010-01-11 06:50:53 +0000 (Mon, 11 Jan 2010) Log Message: ----------- Fixes small typo, patch by Andreas Metzler Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2010-01-11 06:44:54 UTC (rev 4871) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2010-01-11 06:50:53 UTC (rev 4872) @@ -447,7 +447,7 @@ } else if (ev.GetEventObject() == m_rightImg){ left = false; } else { - DEBUG_FATAL("UNKOWN SOURCE OF CPEvent"); + DEBUG_FATAL("UNKNOWN SOURCE OF CPEvent"); } switch (ev.getMode()) { @@ -1680,7 +1680,7 @@ cp.mode = ControlPoint::Y; break; default: - DEBUG_FATAL("unkown control point type selected"); + DEBUG_FATAL("unknown control point type selected"); return; break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-04-30 16:54:31
|
Revision: 5128 http://hugin.svn.sourceforge.net/hugin/?rev=5128&view=rev Author: tmodes Date: 2010-04-30 16:54:22 +0000 (Fri, 30 Apr 2010) Log Message: ----------- Range checking for manual input of cp coordinates [2994750] Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2010-04-30 16:36:20 UTC (rev 5127) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2010-04-30 16:54:22 UTC (rev 5128) @@ -1646,24 +1646,40 @@ ControlPoint cp = currentPoints[nr].second; // update point state - if (!str2double(m_x1Text->GetValue(), cp.x1)) { + double oldValue=cp.x1; + bool valid_input=str2double(m_x1Text->GetValue(), cp.x1); + if(valid_input) + valid_input=(cp.x1>=0) && (cp.x1<=m_pano->getSrcImage(cp.image1Nr).getWidth()); + if (!valid_input) { m_x1Text->Clear(); - *m_x1Text << cp.x1; + *m_x1Text << oldValue; return; } - if (!str2double(m_y1Text->GetValue(), cp.y1)) { + oldValue=cp.y1; + valid_input=str2double(m_y1Text->GetValue(), cp.y1); + if(valid_input) + valid_input=(cp.y1>=0) && (cp.y1<=m_pano->getSrcImage(cp.image1Nr).getHeight()); + if (!valid_input) { m_y1Text->Clear(); - *m_y1Text << cp.y1; + *m_y1Text << oldValue; return; } - if (!str2double(m_x2Text->GetValue(),cp.x2)) { + oldValue=cp.x2; + valid_input=str2double(m_x2Text->GetValue(), cp.x2); + if(valid_input) + valid_input=(cp.x2>=0) && (cp.x2<=m_pano->getSrcImage(cp.image2Nr).getWidth()); + if (!valid_input) { m_x2Text->Clear(); - *m_x2Text << cp.x2; + *m_x2Text << oldValue; return; } - if (!str2double(m_y2Text->GetValue(),cp.y2)) { + oldValue=cp.y2; + valid_input=str2double(m_y2Text->GetValue(), cp.y2); + if(valid_input) + valid_input=(cp.y2>=0) && (cp.y2<=m_pano->getSrcImage(cp.image1Nr).getHeight()); + if (!valid_input) { m_y2Text->Clear(); - *m_y2Text << cp.x2; + *m_y2Text << oldValue; return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |