comparison base/ViewManager.cpp @ 45:b11edc8b8ea0

* Restore proper channel selection support for new layers
* Use binary mode for SV file I/O on Windows
* Commands for selection

 */
 
 #include "ViewManager.h"
 #include "AudioPlaySource.h"
 #include "Model.h"
+#include "CommandHistory.h"
 
 #include <iostream>
 
 //#define DEBUG_VIEW_MANAGER 1
 

 }
 
 void
 ViewManager::setSelection(const Selection &selection)
 {
-    m_selections.setSelection(selection);
+    MultiSelection ms(m_selections);
+    ms.setSelection(selection);
+    setSelections(ms);
+}
+
+void
+ViewManager::addSelection(const Selection &selection)
+{
+    MultiSelection ms(m_selections);
+    ms.addSelection(selection);
+    setSelections(ms);
+}
+
+void
+ViewManager::removeSelection(const Selection &selection)
+{
+    MultiSelection ms(m_selections);
+    ms.removeSelection(selection);
+    setSelections(ms);
+}
+
+void
+ViewManager::clearSelections()
+{
+    MultiSelection ms(m_selections);
+    ms.clearSelections();
+    setSelections(ms);
+}
+
+void
+ViewManager::setSelections(const MultiSelection &ms)
+{
+    if (m_selections.getSelections() == ms.getSelections()) return;
+    SetSelectionCommand *command = new SetSelectionCommand(this, ms);
+    CommandHistory::getInstance()->addCommand(command);
+}
+
+void
+ViewManager::signalSelectionChange()
+{
     emit selectionChanged();
 }
 
-void
-ViewManager::addSelection(const Selection &selection)
-{
-    m_selections.addSelection(selection);
-    emit selectionChanged();
-}
-
-void
-ViewManager::removeSelection(const Selection &selection)
-{
-    m_selections.removeSelection(selection);
-    emit selectionChanged();
-}
-
-void
-ViewManager::clearSelections()
-{
-    m_selections.clearSelections();
-    emit selectionChanged();
+ViewManager::SetSelectionCommand::SetSelectionCommand(ViewManager *vm,
+						      const MultiSelection &ms) :
+    m_vm(vm),
+    m_oldSelection(vm->m_selections),
+    m_newSelection(ms)
+{
+}
+
+ViewManager::SetSelectionCommand::~SetSelectionCommand() { }
+
+void
+ViewManager::SetSelectionCommand::execute()
+{
+    m_vm->m_selections = m_newSelection;
+    m_vm->signalSelectionChange();
+}
+
+void
+ViewManager::SetSelectionCommand::unexecute()
+{
+    m_vm->m_selections = m_oldSelection;
+    m_vm->signalSelectionChange();
+}
+
+QString
+ViewManager::SetSelectionCommand::getName() const
+{
+    if (m_newSelection.getSelections().empty()) return tr("Clear Selection");
+    else return tr("Select");
 }
 
 Selection
 ViewManager::getContainingSelection(size_t frame, bool defaultToFollowing) const
 {