Use a vector<pair<...>> to store screens and cinemas instead of a map.

[dcpomatic.git] / src / wx / screens_panel.cc

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 925784cafa0f41baa3e2a12de9270955a86565aa..2075515f353fe46edae7eb3b02ec13ae0064508f 100644 (file)
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -55,8 +55,11 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
        sizer->Add (_search, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP);
 
        auto targets = new wxBoxSizer (wxHORIZONTAL);
-       _targets = new TreeListCtrl (this);
+       _targets = new wxTreeListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTL_MULTIPLE | wxTL_3STATE | wxTL_NO_HEADER);
        _targets->AppendColumn (wxT("foo"));
+       _targets->SetSortColumn (0);
+       _targets->SetItemComparator (&_comparator);
+
        targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
        add_cinemas ();
@@ -134,14 +137,12 @@ ScreensPanel::add_cinema (shared_ptr<Cinema> cinema)
 
        auto id = _targets->AppendItem(_targets->GetRootItem(), std_to_wx(cinema->name));
 
-       _cinemas[id] = cinema;
+       _cinemas.push_back(make_pair(id, cinema));
 
        for (auto screen: cinema->screens()) {
                add_screen (cinema, screen);
        }
 
-       _targets->SetSortColumn (0);
-
        return id;
 }
 
@@ -158,7 +159,7 @@ ScreensPanel::add_screen (shared_ptr<Cinema> cinema, shared_ptr<Screen> screen)
                return {};
        }
 
-       _screens[_targets->AppendItem(cinema_iter->first, std_to_wx(screen->name))] = screen;
+       _screens.push_back(make_pair(_targets->AppendItem(cinema_iter->first, std_to_wx(screen->name)), screen));
        return cinema_iter->first;
 }
 
@@ -374,7 +375,7 @@ ScreensPanel::screens () const
 
        for (auto item = _targets->GetFirstItem(); item.IsOk(); item = _targets->GetNextItem(item)) {
                if (_targets->GetCheckedState(item) == wxCHK_CHECKED) {
-                       auto screen_iter = _screens.find(item);
+                       auto screen_iter = screen_by_tree_list_item(item);
                        if (screen_iter != _screens.end()) {
                                output.push_back (screen_iter->second);
                        }
@@ -399,20 +400,20 @@ ScreensPanel::selection_changed ()
                return;
        }
 
-       wxTreeListItems s;
-       _targets->GetSelections (s);
+       wxTreeListItems selection;
+       _targets->GetSelections (selection);
 
        _selected_cinemas.clear ();
        _selected_screens.clear ();
 
-       for (size_t i = 0; i < s.size(); ++i) {
-               auto cinema = _cinemas.find (s[i]);
+       for (size_t i = 0; i < selection.size(); ++i) {
+               auto cinema = cinema_by_tree_list_item(selection[i]);
                if (cinema != _cinemas.end ()) {
-                       _selected_cinemas[cinema->first] = cinema->second;
+                       _selected_cinemas.push_back(*cinema);
                }
-               auto screen = _screens.find (s[i]);
+               auto screen = screen_by_tree_list_item(selection[i]);
                if (screen != _screens.end ()) {
-                       _selected_screens[screen->first] = screen->second;
+                       _selected_screens.push_back(*screen);
                }
        }
 
@@ -470,7 +471,8 @@ ScreensPanel::search_changed ()
 void
 ScreensPanel::checkbox_changed (wxTreeListEvent& ev)
 {
-       if (_cinemas.find(ev.GetItem()) != _cinemas.end()) {
+       auto cinema_iter = cinema_by_tree_list_item(ev.GetItem());
+       if (cinema_iter != _cinemas.end()) {
                /* Cinema: check/uncheck all children */
                auto const checked = _targets->GetCheckedState(ev.GetItem());
                for (auto child = _targets->GetFirstChild(ev.GetItem()); child.IsOk(); child = _targets->GetNextSibling(child)) {
@@ -502,14 +504,22 @@ ScreensPanel::checkbox_changed (wxTreeListEvent& ev)
 }
 
 
-
-wxIMPLEMENT_DYNAMIC_CLASS (TreeListCtrl, wxTreeListCtrl);
+ScreensPanel::Cinemas::iterator
+ScreensPanel::cinema_by_tree_list_item (wxTreeListItem item)
+{
+       return std::find_if(
+               _cinemas.begin(), _cinemas.end(),
+               [item](pair<wxTreeListItem, shared_ptr<Cinema>> const& s) { return s.first == item; }
+               );
+}
 
 
-int
-TreeListCtrl::OnCompareItems (wxTreeListItem const& a, wxTreeListItem const& b)
+ScreensPanel::Screens::const_iterator
+ScreensPanel::screen_by_tree_list_item (wxTreeListItem item) const
 {
-       return strcoll (wx_to_std(GetItemText(a)).c_str(), wx_to_std(GetItemText(b)).c_str());
+       return std::find_if(
+               _screens.begin(), _screens.end(),
+               [item](pair<wxTreeListItem, shared_ptr<Screen>> const& s) { return s.first == item; }
+               );
 }
 
-