Mercurial > hg > svgui

changeset 713:6d79ad93fef0 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix indentation
author Chris Cannam
date Fri, 10 Jan 2014 09:52:38 +0000
parents 833cd1b8014f
children 797eb48f38c1
files view/Pane.cpp
diffstat 1 files changed, 119 insertions(+), 119 deletions(-) [+]
line wrap: on
line diff
--- a/view/Pane.cpp	Fri Jan 10 09:04:06 2014 +0000
+++ b/view/Pane.cpp	Fri Jan 10 09:52:38 2014 +0000
@@ -173,7 +173,7 @@
         }
 
         m_reset = new NotifyingPushButton;
-    m_reset->setFlat(true);
+        m_reset->setFlat(true);
         m_reset->setCursor(Qt::ArrowCursor);
         m_reset->setFixedHeight(16);
         m_reset->setFixedWidth(16);
@@ -1308,12 +1308,12 @@
         (mode == ViewManager::MeasureMode &&
          (e->buttons() & Qt::LeftButton) && m_shiftPressed)) {
 
-    if (mode != ViewManager::NavigateMode) {
-        setCursor(Qt::PointingHandCursor);
-    }
-
-    m_navigating = true;
-    m_dragCentreFrame = m_centreFrame;
+        if (mode != ViewManager::NavigateMode) {
+            setCursor(Qt::PointingHandCursor);
+        }
+
+        m_navigating = true;
+        m_dragCentreFrame = m_centreFrame;
         m_dragStartMinValue = 0;
         
         float vmin, vmax, dmin, dmax;
@@ -1325,63 +1325,63 @@
 
         if (!hasTopLayerTimeXAxis()) return;
 
-    bool closeToLeft = false, closeToRight = false;
-    Selection selection = getSelectionAt(e->x(), closeToLeft, closeToRight);
-
-    if ((closeToLeft || closeToRight) && !(closeToLeft && closeToRight)) {
-
-        m_manager->removeSelection(selection);
-
-        if (closeToLeft) {
-        m_selectionStartFrame = selection.getEndFrame();
+        bool closeToLeft = false, closeToRight = false;
+        Selection selection = getSelectionAt(e->x(), closeToLeft, closeToRight);
+
+        if ((closeToLeft || closeToRight) && !(closeToLeft && closeToRight)) {
+
+            m_manager->removeSelection(selection);
+
+            if (closeToLeft) {
+                m_selectionStartFrame = selection.getEndFrame();
+            } else {
+                m_selectionStartFrame = selection.getStartFrame();
+            }
+            
+            m_manager->setInProgressSelection(selection, false);
+            m_resizing = true;
+            
         } else {
-        m_selectionStartFrame = selection.getStartFrame();
-        }
-
-        m_manager->setInProgressSelection(selection, false);
-        m_resizing = true;
+            
+            int mouseFrame = getFrameForX(e->x());
+            size_t resolution = 1;
+            int snapFrame = mouseFrame;
     
-    } else {
-
-        int mouseFrame = getFrameForX(e->x());
-        size_t resolution = 1;
-        int snapFrame = mouseFrame;
-    
-        Layer *layer = getSelectedLayer();
-        if (layer && !m_shiftPressed) {
-        layer->snapToFeatureFrame(this, snapFrame,
-                      resolution, Layer::SnapLeft);
-        }
+            Layer *layer = getSelectedLayer();
+            if (layer && !m_shiftPressed) {
+                layer->snapToFeatureFrame(this, snapFrame,
+                                          resolution, Layer::SnapLeft);
+            }
         
-        if (snapFrame < 0) snapFrame = 0;
-        m_selectionStartFrame = snapFrame;
-        if (m_manager) {
-        m_manager->setInProgressSelection
+            if (snapFrame < 0) snapFrame = 0;
+            m_selectionStartFrame = snapFrame;
+            if (m_manager) {
+                m_manager->setInProgressSelection
                     (Selection(alignToReference(snapFrame),
                                alignToReference(snapFrame + resolution)),
                      !m_ctrlPressed);
+            }
+
+            m_resizing = false;
         }
 
-        m_resizing = false;
-    }
-
-    update();
+        update();
 
     } else if (mode == ViewManager::DrawMode) {
 
-    Layer *layer = getSelectedLayer();
-    if (layer && layer->isLayerEditable()) {
-        layer->drawStart(this, e);
-    }
+        Layer *layer = getSelectedLayer();
+        if (layer && layer->isLayerEditable()) {
+            layer->drawStart(this, e);
+        }
 
     } else if (mode == ViewManager::EraseMode) {
 
-    Layer *layer = getSelectedLayer();
-    if (layer && layer->isLayerEditable()) {
-        layer->eraseStart(this, e);
-    }
-
-    // GF: handle mouse press for NoteEditMode 
+        Layer *layer = getSelectedLayer();
+        if (layer && layer->isLayerEditable()) {
+            layer->eraseStart(this, e);
+        }
+
+        // GF: handle mouse press for NoteEditMode 
     } else if (mode == ViewManager::NoteEditMode) {
 
         std::cerr << "mouse pressed in note edit mode" << std::endl;
@@ -1420,28 +1420,28 @@
     m_releasing = true;
 
     if (m_clickedInRange) {
-    mouseMoveEvent(e);
+        mouseMoveEvent(e);
     }
 
     if (m_navigating || mode == ViewManager::NavigateMode) {
 
-    m_navigating = false;
-
-    if (mode != ViewManager::NavigateMode) {
-        // restore cursor
-        toolModeChanged();
-    }
-
-    if (m_shiftPressed) {
-
-        int x0 = std::min(m_clickPos.x(), m_mousePos.x());
-        int x1 = std::max(m_clickPos.x(), m_mousePos.x());
-
-        int y0 = std::min(m_clickPos.y(), m_mousePos.y());
-        int y1 = std::max(m_clickPos.y(), m_mousePos.y());
+        m_navigating = false;
+
+        if (mode != ViewManager::NavigateMode) {
+            // restore cursor
+            toolModeChanged();
+        }
+
+        if (m_shiftPressed) {
+
+            int x0 = std::min(m_clickPos.x(), m_mousePos.x());
+            int x1 = std::max(m_clickPos.x(), m_mousePos.x());
+
+            int y0 = std::min(m_clickPos.y(), m_mousePos.y());
+            int y1 = std::max(m_clickPos.y(), m_mousePos.y());
 
             zoomToRegion(x0, y0, x1, y1);
-    }
+        }
 
     } else if (mode == ViewManager::SelectMode) {
 
@@ -1450,33 +1450,33 @@
             return;
         }
 
-    if (m_manager && m_manager->haveInProgressSelection()) {
-
-        bool exclusive;
-        Selection selection = m_manager->getInProgressSelection(exclusive);
+        if (m_manager && m_manager->haveInProgressSelection()) {
+
+            bool exclusive;
+            Selection selection = m_manager->getInProgressSelection(exclusive);
         
-        if (selection.getEndFrame() < selection.getStartFrame() + 2) {
-        selection = Selection();
+            if (selection.getEndFrame() < selection.getStartFrame() + 2) {
+                selection = Selection();
+            }
+        
+            m_manager->clearInProgressSelection();
+        
+            if (exclusive) {
+                m_manager->setSelection(selection);
+            } else {
+                m_manager->addSelection(selection);
+            }
         }
-        
-        m_manager->clearInProgressSelection();
-        
-        if (exclusive) {
-        m_manager->setSelection(selection);
-        } else {
-        m_manager->addSelection(selection);
+    
+        update();
+
+    } else if (mode == ViewManager::DrawMode) {
+
+        Layer *layer = getSelectedLayer();
+        if (layer && layer->isLayerEditable()) {
+            layer->drawEnd(this, e);
+            update();
         }
-    }
-    
-    update();
-
-    } else if (mode == ViewManager::DrawMode) {
-
-    Layer *layer = getSelectedLayer();
-    if (layer && layer->isLayerEditable()) {
-        layer->drawEnd(this, e);
-        update();
-    }
 
     } else if (mode == ViewManager::EraseMode) {
 
@@ -1611,26 +1611,26 @@
             }
         }
 
-    return;
+        return;
     }
 
     if (m_navigating || mode == ViewManager::NavigateMode) {
 
-    if (m_shiftPressed) {
-
-        m_mousePos = e->pos();
-        update();
-
-    } else {
+        if (m_shiftPressed) {
+
+            m_mousePos = e->pos();
+            update();
+
+        } else {
 
             dragTopLayer(e);
         }
 
     } else if (mode == ViewManager::SelectMode) {
 
-            if (!hasTopLayerTimeXAxis()) return;
-
-            dragExtendSelection(e);
+        if (!hasTopLayerTimeXAxis()) return;
+
+        dragExtendSelection(e);
 
     } else if (mode == ViewManager::DrawMode) {
 
@@ -1646,7 +1646,7 @@
             layer->eraseDrag(this, e);
         }
 
-    // GF: handling NoteEditMode dragging and boundary actions for mouseMoveEvent
+        // GF: handling NoteEditMode dragging and boundary actions for mouseMoveEvent
     } else if (mode == ViewManager::NoteEditMode) {
 
         bool resist = true;
@@ -2514,33 +2514,33 @@
     switch (mode) {
 
     case ViewManager::NavigateMode:
-    setCursor(Qt::PointingHandCursor);
-    break;
+        setCursor(Qt::PointingHandCursor);
+        break;
     
     case ViewManager::SelectMode:
-    setCursor(Qt::ArrowCursor);
-    break;
+        setCursor(Qt::ArrowCursor);
+        break;
     
     case ViewManager::EditMode:
-    setCursor(Qt::UpArrowCursor);
-    break;
+        setCursor(Qt::UpArrowCursor);
+        break;
     
     case ViewManager::DrawMode:
-    setCursor(Qt::CrossCursor);
-    break;
+        setCursor(Qt::CrossCursor);
+        break;
     
     case ViewManager::EraseMode:
-    setCursor(Qt::CrossCursor);
-    break;
+        setCursor(Qt::CrossCursor);
+        break;
 
     case ViewManager::MeasureMode:
         if (m_measureCursor1) setCursor(*m_measureCursor1);
-    break;
-
-    // GF: NoteEditMode uses the same default cursor as EditMode, but it will change in a context sensitive manner.
+        break;
+
+        // GF: NoteEditMode uses the same default cursor as EditMode, but it will change in a context sensitive manner.
     case ViewManager::NoteEditMode:
-    setCursor(Qt::UpArrowCursor);
-    break;
+        setCursor(Qt::UpArrowCursor);
+        break;
 
 /*  
     case ViewManager::TextMode:
@@ -2681,21 +2681,21 @@
     } else if (mode == ViewManager::DrawMode) {
         
         //!!! could call through to a layer function to find out exact meaning
-    if (editable) {
+        if (editable) {
             help = tr("Click to add a new item in the active layer");
         }
 
     } else if (mode == ViewManager::EraseMode) {
         
         //!!! could call through to a layer function to find out exact meaning
-    if (editable) {
+        if (editable) {
             help = tr("Click to erase an item from the active layer");
         }
         
     } else if (mode == ViewManager::EditMode) {
         
         //!!! could call through to layer
-    if (editable) {
+        if (editable) {
             help = tr("Click and drag an item in the active layer to move it; hold Shift to override initial resistance");
             if (pos) {
                 bool closeToLeft = false, closeToRight = false;