Changeset 1287

Timestamp:

10/16/07 13:52:29 (11 months ago)

Author:

calvin

Message:

pattern editor wave dropdown updates when a wave column is changed, fix crash when working on selections bigger than current pattern, also fix crash on song-clear or app-close or delete-machine because of wrongly attached/detached plugin event handlers in pattern editor

Location:

trunk/src/buzelib

Files:

• PatternEditor/PatternEditorInner.cpp (modified) (1 diff)
• PatternView.cpp (modified) (8 diffs)

trunk/src/buzelib/PatternEditor/PatternEditorInner.cpp

@@ -223 +223 @@
         rc->bottom = select_end.y * skip;
         if (select_start.x == -1) return false;
+
+        // make sure selection is valid in case we made the selection on a bigger
+        // pattern and now try to copy from a smaller where the selection goes 
+        // outside the pattern extensions
+        if (rc->left < 0) rc->left = 0;
+        if (rc->left >= columns.size()) rc->left = columns.size() -1;
+        if (rc->right < 0) rc->right = 0;
+        if (rc->right >= columns.size()) rc->right = columns.size() -1;
+        if (rc->top < 0) rc->top = 0;
+        if (rc->top >= total_rows) rc->top = total_rows -1;
+        if (rc->bottom < 0) rc->bottom = 0;
+        if (rc->bottom >= total_rows) rc->bottom = total_rows -1;
         return true;
 }

trunk/src/buzelib/PatternView.cpp

@@ -221 +221 @@
         mainFrame->addTimerHandler(this);
 
-        machine->addEventHandler(this);
         return 0;
 }
@@ -233 +232 @@
 
 LRESULT CPatternView::OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) {
-        machine->removeEventHandler(this);
 
         setPattern(0,0); // in case pattern is deleted and window updated before window is fully destroyed
@@ -1038 +1036 @@
 void CPatternView::setPattern(zzub::metaplugin* toMachine, zzub::pattern* toPattern) {
 
+        if (machine != 0) machine->removeEventHandler(this);
+
         if (toMachine == 0 && toPattern == 0) {
                 this->pattern = 0;
@@ -1051 +1051 @@
         bindPatternEditor();
         bindMachinePatternPanel();
+
+        if (machine != 0) machine->addEventHandler(this);
 }
 
@@ -1553 +1555 @@
         const PATTERNCOLUMN& col = patternEditor.GetColumn(patternEditor.editor.drag_to.x);
         pastePatternTrack(selection, patternEditor.editor.drag_to.y * patternEditor.GetSkip(), col.group, col.track, col.column);
+        delete selection;
         return 0;
 }
@@ -1575 +1578 @@
         undo->addEdit(cursor.y, col.group, col.track, col.column, oldv);
 
-        if (col.type == pattern_column_type_note) {
+        size_t wavec = track->getWaveColumn();
+
+        if (col.type == pattern_column_type_note && ccol.index == 0) {
                 int wave = getSelectedWave();
                 if (wave != -1) {
-                        size_t wavec = track->getWaveColumn();
-
                         if (wavec != no_column) {
                                 if (v == 255 || v == col.novalue) wave = track->getParam(wavec)->value_none;
@@ -1589 +1592 @@
                 }
         }
-
-
         document->undoManager.insertAndCommit(redo, undo);
+
+        // change selected wave in dropdown if a wave was entered
+        if (wavec != no_column && col.column == wavec) {
+                int wave = track->getValue(cursor.y, wavec);
+                int wave_index = 0;
+                for (size_t i = 0; wave > 0 && i < document->player->getWaves(); i++) {
+                        wave_info_ex* entry = document->player->getWave(i);
+                        int levelcount = entry->get_levels();
+                        if (levelcount) {
+                                if (i == wave - 1) {
+                                        waveDropDown.SetCurSel(wave_index);
+                                        break;
+                                }
+                                wave_index++;
+                        }
+                }
+        }
 
         // play note
@@ -1726 +1744 @@
         menu.InsertMenu(-1, (document->player->getSoloMachine() == machine?MF_CHECKED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_SOLO, "Solo Machine\tCtrl+L");
         menu.InsertMenu(-1, (machine->isMuted()?MF_CHECKED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_MUTE, "Mute Machine\tCtrl+M");
-        menu.InsertMenu(-1, (!hasPattern?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_PARAMETERS, "Machine Parameters");
+        menu.InsertMenu(-1, (!hasPattern?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_MACHINE_PARAMETERS, "Machine Parameters\tShift+Enter");
         menu.InsertMenu(-1, MF_BYPOSITION|MF_SEPARATOR);
         menu.InsertMenu(-1, (!hasPattern?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_PATTERN_PROPERTIES, "Pattern Properties\tCtrl+Backspace");