Changeset 1263

Timestamp:

09/22/07 16:02:35 (11 months ago)

Author:

calvin

Message:

fix a couple of typos, restore cursor and scroll positions in pattern editor when switching machine and/or pattern

Location:

trunk/src/buzelib

Files:

• Document.cpp (modified) (1 diff)
• PatternEditor/PatternEditorControl.cpp (modified) (1 diff)
• PatternEditor/PatternEditorControl.h (modified) (1 diff)
• PatternEditor/PatternEditorInner.cpp (modified) (2 diffs)
• PatternEditor/PatternEditorInner.h (modified) (1 diff)
• PatternView.cpp (modified) (5 diffs)

trunk/src/buzelib/Document.cpp

@@ -223 +223 @@
 
         MachineConnect* undo=new MachineConnect();
-        undo->init(output, input, getConnectionAmp(conn), getConnectionAmp(conn));
+        undo->init(output, input, getConnectionAmp(conn), getConnectionPan(conn));
 
         return undoManager.insertAndCommit(redo, undo);

trunk/src/buzelib/PatternEditor/PatternEditorControl.cpp

@@ -250 +250 @@
 }
 
-void CPatternEditorControl::MoveCursor(int group, int track, int column, int y, bool affectsel) {
-        for (int i = 0; i < editor.columns.size(); i++) {
-                PATTERNCOLUMN& col = editor.columns[i];
-                if (col.group == group && col.track == track && col.column == column) {
-                        int cursor_x = editor.ScreenUnitsToCursorColumn(col.unit);
+void CPatternEditorControl::MoveCursor(int group, int track, int column, int index, int y, bool affectsel) {
+        for (int i = 0; i < editor.columns.size(); i++) {
+                PATTERNCOLUMN& col = editor.columns[i];
+                if (col.group == group && col.track == track && col.column == column) {
+                        int cursor_x = editor.ScreenUnitsToCursorColumn(col.unit) + index;
                         editor.MoveCursor(cursor_x - editor.cursor.x, y - editor.cursor.y, affectsel);
                         break;

trunk/src/buzelib/PatternEditor/PatternEditorControl.h

@@ -69 +69 @@
         void AddPianoRoll() { editor.AddPianoRoll(); }
         void AllocatePattern() { editor.AllocatePatternBitmap(); }
+        void ScrollTo(const POINT& pt) { editor.ScrollTo(pt); }
         void ScrollToView() { editor.ScrollToView(editor.cursor); }
         void ScrollToView(const POINT& pt) { editor.ScrollToView(pt); }
         void SelectRange(int from_col, int from_row, int to_col, int to_row) { editor.SelectRange(from_col, from_row / editor.skip, to_col, to_row / editor.skip); }
         void MoveCursor(int x, int y, bool affectsel) { editor.MoveCursor(x, y, affectsel); }
-        void MoveCursor(int group, int track, int column, int y, bool affectsel);
+        void MoveCursor(int group, int track, int column, int index, int y, bool affectsel);
         POINT GetCursor() { return editor.cursor; }
         int GetColumns() { return editor.columns.size(); }

trunk/src/buzelib/PatternEditor/PatternEditorInner.cpp

@@ -951 +951 @@
 }
 
+void CPatternEditorInner::ScrollTo(POINT new_scroll) {
+        SetScrollPos(SB_VERT, new_scroll.y);
+        SetScrollPos(SB_HORZ, new_scroll.x);
+        ScrollWindow((scroll.x - new_scroll.x) * font_size.cx, (scroll.y - new_scroll.y) * font_size.cy, 0);
+        scroll = new_scroll;
+        UpdateWindow();
+        UpdateCaretPosition();
+        GetParent().SendMessage(WM_COMMAND, MAKEWPARAM(ID_PATTERNEDITOR_SCROLLED, 0), 0);
+}
+
 void CPatternEditorInner::ScrollToView(POINT pt) {
         if (rcClient.right == 0) return ;
@@ -959 +969 @@
 
         POINT screen = { rcClient.right / font_size.cx - 2, rcClient.bottom / font_size.cy - 1 };
-        POINT last_scroll = scroll;
-
-        if (pt.y - scroll.y < 0)
-                scroll.y = pt.y;
-
-        if (pt.y - scroll.y >= screen.y)
-                scroll.y = pt.y - screen.y;
+        POINT new_scroll = scroll;
+
+        if (pt.y - new_scroll.y < 0)
+                new_scroll.y = pt.y;
+
+        if (pt.y - new_scroll.y >= screen.y)
+                new_scroll.y = pt.y - screen.y;
 
         int cursorunits = CursorColumnToScreenUnits(pt.x);
 
-        if (cursorunits - scroll.x < 0)
-                scroll.x = cursorunits;
-
-        if (cursorunits - scroll.x > screen.x)
-                scroll.x = cursorunits - screen.x;
-
-        if (scroll.y != last_scroll.y || scroll.x != last_scroll.x) {
-                SetScrollPos(SB_VERT, scroll.y);
-                SetScrollPos(SB_HORZ, scroll.x);
-                ScrollWindow((last_scroll.x - scroll.x) * font_size.cx, (last_scroll.y - scroll.y) * font_size.cy, 0);
-                UpdateWindow();
-                UpdateCaretPosition();
-                GetParent().SendMessage(WM_COMMAND, MAKEWPARAM(ID_PATTERNEDITOR_SCROLLED, 0), 0);
+        if (cursorunits - new_scroll.x < 0)
+                new_scroll.x = cursorunits;
+
+        if (cursorunits - new_scroll.x > screen.x)
+                new_scroll.x = cursorunits - screen.x;
+
+        if (scroll.y != new_scroll.y || scroll.x != new_scroll.x) {
+                ScrollTo(new_scroll);
         }
 }

trunk/src/buzelib/PatternEditor/PatternEditorInner.h

@@ -153 +153 @@
         void SetThemeColor(theme_index index, COLORREF color);
         void MoveCursor(int x, int y, bool affectsel);
-        void ScrollToView(POINT pt);
+        void ScrollTo(POINT pt);                // scroll to position pt
+        void ScrollToView(POINT pt);    // scroll so position pt is visible
         bool HasSelection();
         bool GetSelectionRectScreen(RECT* rc);

trunk/src/buzelib/PatternView.cpp

@@ -1048 +1048 @@
                 patternEditor.AddColumn(0, i, 1, paraPanning->type, paraPanning->value_none, paraPanning->value_min, paraPanning->value_max);
                 for (size_t k = 0; k < pattern->getRows(); k++) {
-                        zzub::patterntrack* track = pattern->getPatternTrack(0, 0);
+                        zzub::patterntrack* track = pattern->getPatternTrack(0, i);
                         int v = track->getValue(k, 0);
                         if (v != getNoValue(paraVolume))
@@ -1097 +1097 @@
 
         pattern_position pos = document->getPatternPosition(machine, pattern);
-        patternEditor.MoveCursor(pos.group, pos.track, pos.column, pos.row, false);
+        patternEditor.MoveCursor(pos.group, pos.track, pos.column, pos.editPos, pos.row, false);
         
         // TODO: scroll editor to pos.scroll*
-        patternEditor.ScrollToView();
+        POINT scroll = { pos.scrollColumns, pos.scrollRows };
+        patternEditor.ScrollTo(scroll);
 
         patternEditor.UpdateWindow();
@@ -1433 +1434 @@
 LRESULT CPatternView::OnPasteValue(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
         pattern_position pos = document->getPatternPosition(machine, pattern);
-        patterntrack* track = machine->getStateTrackCopy(pos.group, pos.track);
-        int value = track->getValue(0, pos.column);
-        const parameter* param = track->getParam(pos.column);
+        patterntrack* state_track = machine->getStateTrackCopy(pos.group, pos.track);
+        int value = state_track->getValue(0, pos.column);
+        const parameter* param = state_track->getParam(pos.column);
+
+        patterntrack* pattern_track = pattern->getPatternTrack(pos.group, pos.track);
+
         if (getNoValue(param) != value) {// && document->editPattern(machine, pattern, pos.row, pos.group, pos.track, pos.column, 0, value, 0)) {
 
@@ -1442 +1446 @@
 
                 PatternEdit* undo = new PatternEdit(this, machine, pattern);
-                int oldv = track->getValue(pos.row, pos.column);
+                int oldv = pattern_track->getValue(pos.row, pos.column);
                 undo->addEdit(pos.row, pos.group, pos.track, pos.column, oldv);
 
@@ -1461 +1465 @@
         bool yeah = false;
         for (int i = 0; i<track->getParams(); i++) {
-                int value = track->getValue(0, i);
-                const parameter* param = track->getParam(i);
-                if (getNoValue(param) != value) { // && document->editPattern(machine, pattern, pos.row, pos.group, pos.track, i, 0, value, 0)) {
-                        redo->addEdit(pos.row, pos.group, pos.track, pos.column, value);
+                int value = machine->getParameter(pos.group, pos.track, i);
+                const parameter* param = machine->getMachineParameter(pos.group, pos.track, i);
+                if (getNoValue(param) != value) {
                         zzub::patterntrack* vt = pattern->getPatternTrack(pos.group, pos.track);
-                        int oldv = vt->getValue(pos.row, pos.column);
-
-                        redo->addEdit(pos.row, pos.group, pos.track, pos.column, value);
-                        undo->addEdit(pos.row, pos.group, pos.track, pos.column, oldv);
+                        int oldv = vt->getValue(pos.row, i);
+
+                        redo->addEdit(pos.row, pos.group, pos.track, i, value);
+                        undo->addEdit(pos.row, pos.group, pos.track, i, oldv);
                         yeah = true;
                 }