Diff of /src/hugin1/hugin/CPImageCtrl.cpp [36a47f] .. [2a43e8] Maximize Restore

  Switch to unified view

a/src/hugin1/hugin/CPImageCtrl.cpp b/src/hugin1/hugin/CPImageCtrl.cpp
...
...
729
    }
729
    }
730
730
731
    // draw known points.
731
    // draw known points.
732
    for(size_t i=0; i<m_points.size(); i++)
732
    for(size_t i=0; i<m_points.size(); i++)
733
    {
733
    {
734
        m_points[i].Draw(dc, editState==KNOWN_POINT_SELECTED && i==selectedPointNr);
734
        if (!(editState == KNOWN_POINT_SELECTED && i==selectedPointNr))
735
        {
736
            m_points[i].Draw(dc, false);
737
        };
735
    }
738
    }
736
739
737
    switch(editState) {
740
    switch(editState) {
738
    case NEW_POINT_SELECTED:
741
    case NEW_POINT_SELECTED:
739
        // Boundary check
742
        // Boundary check
...
...
760
        }
763
        }
761
764
762
        break;
765
        break;
763
    case NEW_LINE_CREATING:
766
    case NEW_LINE_CREATING:
764
        m_selectedPoint.Draw(dc, false, true);
767
        m_selectedPoint.Draw(dc, false, true);
768
        break;
769
    case KNOWN_POINT_SELECTED:
770
        m_points[selectedPointNr].Draw(dc, true);
765
        break;
771
        break;
766
    case NO_SELECTION:
772
    case NO_SELECTION:
767
    case NO_IMAGE:
773
    case NO_IMAGE:
768
        break;
774
        break;
769
    }
775
    }
...
...
1021
{
1027
{
1022
    DisplayedControlPoint dcp(cp, this, mirrored);
1028
    DisplayedControlPoint dcp(cp, this, mirrored);
1023
    dcp.SetColour(pointColors[m_points.size() % pointColors.size()], textColours[m_points.size() % textColours.size()]);
1029
    dcp.SetColour(pointColors[m_points.size() % pointColors.size()], textColours[m_points.size() % textColours.size()]);
1024
    dcp.SetLabel(wxString::Format(wxT("%d"), m_points.size()));
1030
    dcp.SetLabel(wxString::Format(wxT("%d"), m_points.size()));
1025
    m_points.push_back(dcp);
1031
    m_points.push_back(dcp);
1032
}
1033
1034
void CPImageCtrl::clearCtrlPointList()
1035
{
1036
    m_points.clear();
1026
    if(editState == KNOWN_POINT_SELECTED)
1037
    if(editState == KNOWN_POINT_SELECTED)
1027
    {
1038
    {
1028
        editState = NO_SELECTION;
1039
        editState = NO_SELECTION;
1029
    };
1040
    };
1030
    selectedPointNr = UINT_MAX;
1041
    selectedPointNr = UINT_MAX;
1031
}
1032
1033
void CPImageCtrl::clearCtrlPointList()
1034
{
1035
    m_points.clear();
1036
};
1042
};
1037
1043
1038
void CPImageCtrl::clearNewPoint()
1044
void CPImageCtrl::clearNewPoint()
1039
{
1045
{
1040
    DEBUG_TRACE("clearNewPoint");
1046
    DEBUG_TRACE("clearNewPoint");