From: <hug...@li...> - 2013-09-09 17:51:27
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/2a43e83684d5 changeset: 6329:2a43e83684d5 user: tmodes date: Sat Aug 10 11:31:46 2013 +0200 description: Fixes drawing of cp again Revert changes from changeset 36a47be8ad because of unwanted side effect (z order problem) Try to fix the issue another way diffstat: src/hugin1/hugin/CPImageCtrl.cpp | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diffs (47 lines): diff -r 36a47fbe8a7d -r 2a43e83684d5 src/hugin1/hugin/CPImageCtrl.cpp --- a/src/hugin1/hugin/CPImageCtrl.cpp Thu Aug 08 20:10:15 2013 +0200 +++ b/src/hugin1/hugin/CPImageCtrl.cpp Sat Aug 10 11:31:46 2013 +0200 @@ -731,7 +731,10 @@ // draw known points. for(size_t i=0; i<m_points.size(); i++) { - m_points[i].Draw(dc, editState==KNOWN_POINT_SELECTED && i==selectedPointNr); + if (!(editState == KNOWN_POINT_SELECTED && i==selectedPointNr)) + { + m_points[i].Draw(dc, false); + }; } switch(editState) { @@ -763,6 +766,9 @@ case NEW_LINE_CREATING: m_selectedPoint.Draw(dc, false, true); break; + case KNOWN_POINT_SELECTED: + m_points[selectedPointNr].Draw(dc, true); + break; case NO_SELECTION: case NO_IMAGE: break; @@ -1023,16 +1029,16 @@ dcp.SetColour(pointColors[m_points.size() % pointColors.size()], textColours[m_points.size() % textColours.size()]); dcp.SetLabel(wxString::Format(wxT("%d"), m_points.size())); m_points.push_back(dcp); +} + +void CPImageCtrl::clearCtrlPointList() +{ + m_points.clear(); if(editState == KNOWN_POINT_SELECTED) { editState = NO_SELECTION; }; selectedPointNr = UINT_MAX; -} - -void CPImageCtrl::clearCtrlPointList() -{ - m_points.clear(); }; void CPImageCtrl::clearNewPoint() |