Changeset b775443 in git


Ignore:
Timestamp:
21/09/11 13:18:17 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
d8dbdff
Parents:
6e63fd3
Message:

src/mainfrm.cc: Fix to set the correct filename on the root of the
survey tree.

git-svn-id: file:///home/survex-svn/survex/trunk@3745 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r6e63fd3 rb775443  
     1Wed Sep 21 12:17:19 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * src/mainfrm.cc: Fix to set the correct filename on the root of the
     4          survey tree.
     5
    16Wed Sep 21 11:25:53 GMT 2011  Olly Betts <olly@survex.com>
    27
  • src/mainfrm.cc

    r6e63fd3 rb775443  
    12861286    m_DateExt = datemax - m_DateMin;
    12871287
    1288     // Sort the labels.
    1289     m_Labels.sort(LabelCmp(separator));
    1290 
    1291     // Fill the tree of stations and prefixes.
    1292     FillTree();
    1293 
    1294     // Sort labels so that entrances are displayed in preference,
    1295     // then fixed points, then exported points, then other points.
    1296     //
    1297     // Also sort by leaf name so that we'll tend to choose labels
    1298     // from different surveys, rather than labels from surveys which
    1299     // are earlier in the list.
    1300     m_Labels.sort(LabelPlotCmp(separator));
    1301 
    13021288    // Centre the dataset around the origin.
    13031289    CentreDataset(Vector3(xmin, ymin, zmin));
     
    13171303    // Update window title.
    13181304    SetTitle(m_Title + " - "APP_NAME);
    1319 
    1320     if (!m_FindBox->GetValue().empty()) {
    1321         // Highlight any stations matching the current search.
    1322         wxCommandEvent dummy;
    1323         OnFind(dummy);
    1324     }
    13251305
    13261306    return true;
     
    16571637    if (!same_file)
    16581638        m_File = file;
     1639
     1640    // Sort the labels ready for filling the tree.
     1641    m_Labels.sort(LabelCmp(separator));
     1642
     1643    // Fill the tree of stations and prefixes.
     1644    FillTree();
     1645
     1646    // Sort labels so that entrances are displayed in preference,
     1647    // then fixed points, then exported points, then other points.
     1648    //
     1649    // Also sort by leaf name so that we'll tend to choose labels
     1650    // from different surveys, rather than labels from surveys which
     1651    // are earlier in the list.
     1652    m_Labels.sort(LabelPlotCmp(separator));
     1653
     1654    if (!m_FindBox->GetValue().empty()) {
     1655        // Highlight any stations matching the current search.
     1656        wxCommandEvent dummy;
     1657        OnFind(dummy);
     1658    }
    16591659
    16601660    wxWindow * win = NULL;
Note: See TracChangeset for help on using the changeset viewer.