Changeset 1289

Timestamp:

10/20/07 13:17:21 (12 months ago)

Author:

calvin

Message:

pattern editor beat toolbar works again, added accelerators for ctrl-0-9: sets step in sequencer and pattern editor, pattern editor right click -> clear works, hidden parameters are not shown in pattern editor

Location:

trunk/src/buzelib

Files:

• PatternView.cpp (modified) (11 diffs)
• PatternView.h (modified) (3 diffs)
• SequenceView.cpp (modified) (1 diff)
• SequenceView.h (modified) (2 diffs)
• buze.rc (modified) (2 diffs)
• resource.h (modified) (2 diffs)

trunk/src/buzelib/PatternView.cpp

@@ -18 +18 @@
 
 namespace {
+
+struct beat_type {
+        int verydark, dark;
+};
+
+beat_type all_beats[] = {
+        { 8, 4 },
+        { 9, 3 },
+        { 12, 3 },
+        { 12, 4 },
+        { 16, 4 },
+        { 16, 8 },
+        { 18, 3 },
+        { 18, 6 },
+        { 18, 9 },
+};
+
+int all_beats_count = sizeof(all_beats) / sizeof(beat_type);
 
 bool isShiftDown() {
@@ -442 +460 @@
         int sel = beatDropDown.GetCurSel();
         if (sel == -1) return 0;
+        beat_type& bt = all_beats[sel];
+        patternEditor.editor.SetHighlightRows(bt.verydark, bt.dark);
 //    patternEditor.beat = sel;
         patternEditor.Invalidate();
@@ -482 +502 @@
                         if (updatePlugin == machine) {
                                 bindPatternEditor();
-                                patternEditor.ScrollToView();
                                 patternEditor.UpdateScrollbars();
                                 patternEditor.UpdateCaret();
+                                patternEditor.ScrollToView();
                                 patternEditor.Invalidate(FALSE);
                                 patternEditor.editor.Invalidate(FALSE);
@@ -594 +614 @@
 
         if (GetFocus() != beatDropDown) {
-                //beatDropDown.SetCurSel(patternEditor.beat);
+                for (int i = 0; i < all_beats_count; i++) {
+                        beat_type& bt = all_beats[i];
+                        if (bt.verydark == patternEditor.editor.verydark_row && bt.dark == patternEditor.editor.dark_row) {
+                                beatDropDown.SetCurSel(i);
+                                break;
+                        }
+                }
         }
 
@@ -1117 +1143 @@
 
         for (size_t i = 0; i< machine->loader->plugin_info->global_parameters.size(); i++, parameter_index++) {
-                //TODO: document->configuration->getMachineParameterVisibility(machine->machineInfo->uri, parameter_index);
+                // if parameter was marked hidden in parameterview, dont add the column to the pattern editor
+                if (mainFrame->getMachineParameterHidden(machine, 1, 0, i)) continue;
+
                 const zzub::parameter* paraGlobal = machine->loader->plugin_info->global_parameters[i];
                 
@@ -1134 +1162 @@
                 parameter_index = first_track_index;
                 for (size_t i = 0; i< machine->loader->plugin_info->track_parameters.size(); i++, parameter_index++) {
-                        //TODO: document->configuration->getMachineParameterVisibility(machine->machineInfo->uri, parameter_index);
+                        // if parameter was marked hidden in parameterview, dont add the column to the pattern editor
+                        if (mainFrame->getMachineParameterHidden(machine, 2, j, i)) continue;
+
                         const zzub::parameter* paraTrack = machine->loader->plugin_info->track_parameters[i];
                         patternEditor.AddColumn(2, j, i, paraTrack->type, getNoValue(paraTrack), getParamMinValue(paraTrack), getParamMaxValue(paraTrack));
@@ -1154 +1184 @@
         patternEditor.MoveCursor(pos.group, pos.track, pos.column, pos.editPos, pos.row, false);
         
-        // TODO: scroll editor to pos.scroll*
+        // scroll editor to pos.scroll*
         POINT scroll = { pos.scrollColumns, pos.scrollRows };
         patternEditor.ScrollTo(scroll);
@@ -1344 +1374 @@
 
         // see also CPatternEditor::getRowColor() for more beat stuff
-        beatDropDown.AddString("3 / 3");
-        beatDropDown.AddString("4 / 3");
-        beatDropDown.AddString("3 / 4");
-        beatDropDown.AddString("4 / 4");
-        beatDropDown.AddString("5 / 4");
-        beatDropDown.AddString("5 / 5");
-        beatDropDown.AddString("6 / 6");
-        beatDropDown.AddString("6 / 8");
-        beatDropDown.AddString("8 / 8");
+        for (int i = 0; i < all_beats_count; i++) {
+                beat_type& bt = all_beats[i];
+                std::stringstream strm;
+                strm << bt.verydark << " / " << bt.dark;
+                beatDropDown.AddString(strm.str().c_str());
+        }
 
         octaveDropDown.SetRedraw();
@@ -1713 +1740 @@
 }
 
-LRESULT CPatternView::OnClear(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
-        patternEditor.Clear();
-        return 0;
-}
-
 LRESULT CPatternView::OnRButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
 
@@ -1755 +1777 @@
         menu.InsertMenu(-1, (!hasPattern||!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_COPY, "Copy\tCtrl+C");
         menu.InsertMenu(-1, (!hasPattern?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_PASTE, "Paste\tCtrl+V");
-        menu.InsertMenu(-1, (!hasPattern||!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_CLEAR, "Clear\tDelete");
+        menu.InsertMenu(-1, (!hasPattern||!patternEditor.HasSelection()?MF_GRAYED:0)|MF_BYPOSITION|MF_STRING, (UINT_PTR)ID_EDIT_DELETE, "Clear\tDelete");
 
         ClientToScreen(&pt);
@@ -1859 +1881 @@
         return false;
 }
+
+LRESULT CPatternView::OnSetStepRange(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
+        int step = wID - ID_EDIT_STEP_0;
+
+        MessageBox("HAHA", stringFromInt(step, 0, ' ').c_str());
+        if (step < 0 || step > 9) return 0;
+        patternEditor.editor.step = step;
+        return 0;
+}

trunk/src/buzelib/PatternView.h

@@ -206 +206 @@
                 COMMAND_ID_HANDLER(ID_PATTERNEDITOR_MOVECURSOR, OnMoveCursor)
 
+                COMMAND_RANGE_HANDLER(ID_EDIT_STEP_0, ID_EDIT_STEP_9, OnSetStepRange)
+
         END_MSG_MAP()
 
@@ -268 +270 @@
         LRESULT OnMoveNextTrack(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnMovePrevTrack(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-        LRESULT OnClear(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnToggleColumnControl(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnOctaveUp(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
@@ -315 +316 @@
         LRESULT OnEdit(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnMoveCursor(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+        LRESULT OnSetStepRange(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 
     virtual BOOL OnIdle();

trunk/src/buzelib/SequenceView.cpp

@@ -766 +766 @@
         return 0;
 }
+
+LRESULT CSequenceView::OnSetStepRange(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
+        int step = wID - ID_EDIT_STEP_0;
+        if (step < 0 || step > 9) return 0;
+        editor.step = step;
+        return 0;
+}

trunk/src/buzelib/SequenceView.h

@@ -110 +110 @@
                 COMMAND_ID_HANDLER(ID_PATTERN_CLONE, OnPatternClone)
                 COMMAND_ID_HANDLER(ID_MACHINE_PARAMETERS, OnMachineParameters)
+                COMMAND_RANGE_HANDLER(ID_EDIT_STEP_0, ID_EDIT_STEP_9, OnSetStepRange)
 
         END_MSG_MAP()
@@ -185 +186 @@
         LRESULT OnPatternCreate(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
         LRESULT OnMachineParameters(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+        LRESULT OnSetStepRange(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 
         virtual BOOL OnIdle();

trunk/src/buzelib/buze.rc

@@ -879 +879 @@
         ">",                    ID_PATTERNEDITOR_NEXTWAVE, ASCII, NOINVERT
         "<",                    ID_PATTERNEDITOR_PREVWAVE, ASCII, NOINVERT
+        "0",                    ID_EDIT_STEP_0, VIRTKEY, CONTROL, NOINVERT
+        "1",                    ID_EDIT_STEP_1, VIRTKEY, CONTROL, NOINVERT
+        "2",                    ID_EDIT_STEP_2, VIRTKEY, CONTROL, NOINVERT
+        "3",                    ID_EDIT_STEP_3, VIRTKEY, CONTROL, NOINVERT
+        "4",                    ID_EDIT_STEP_4, VIRTKEY, CONTROL, NOINVERT
+        "5",                    ID_EDIT_STEP_5, VIRTKEY, CONTROL, NOINVERT
+        "6",                    ID_EDIT_STEP_6, VIRTKEY, CONTROL, NOINVERT
+        "7",                    ID_EDIT_STEP_7, VIRTKEY, CONTROL, NOINVERT
+        "8",                    ID_EDIT_STEP_8, VIRTKEY, CONTROL, NOINVERT
+        "9",                    ID_EDIT_STEP_9, VIRTKEY, CONTROL, NOINVERT
 END
 
@@ -939 +949 @@
     VK_RETURN,      ID_PATTERN_CLONE,       VIRTKEY, SHIFT, CONTROL, 
                                                     NOINVERT
+        "0",                    ID_EDIT_STEP_0, VIRTKEY, CONTROL, NOINVERT
+        "1",                    ID_EDIT_STEP_1, VIRTKEY, CONTROL, NOINVERT
+        "2",                    ID_EDIT_STEP_2, VIRTKEY, CONTROL, NOINVERT
+        "3",                    ID_EDIT_STEP_3, VIRTKEY, CONTROL, NOINVERT
+        "4",                    ID_EDIT_STEP_4, VIRTKEY, CONTROL, NOINVERT
+        "5",                    ID_EDIT_STEP_5, VIRTKEY, CONTROL, NOINVERT
+        "6",                    ID_EDIT_STEP_6, VIRTKEY, CONTROL, NOINVERT
+        "7",                    ID_EDIT_STEP_7, VIRTKEY, CONTROL, NOINVERT
+        "8",                    ID_EDIT_STEP_8, VIRTKEY, CONTROL, NOINVERT
+        "9",                    ID_EDIT_STEP_9, VIRTKEY, CONTROL, NOINVERT
 END
 

trunk/src/buzelib/resource.h

@@ -388 +388 @@
 #define ID_PATTERNVIEW_TRANSPOSENOTESONLYDOWN 53422
 #define ID_WAVE_ZOOM_WORD              53423
+#define ID_EDIT_STEP_0                 53424
+#define ID_EDIT_STEP_1                 53425
+#define ID_EDIT_STEP_2                 53426
+#define ID_EDIT_STEP_3                 53427
+#define ID_EDIT_STEP_4                 53428
+#define ID_EDIT_STEP_5                 53429
+#define ID_EDIT_STEP_6                 53430
+#define ID_EDIT_STEP_7                 53431
+#define ID_EDIT_STEP_8                 53432
+#define ID_EDIT_STEP_9                 53433
 
 // Next default values for new objects
@@ -394 +404 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        238
-#define _APS_NEXT_COMMAND_VALUE         53424
+#define _APS_NEXT_COMMAND_VALUE         53434
 #define _APS_NEXT_CONTROL_VALUE         1082
 #define _APS_NEXT_SYMED_VALUE           101