Changeset 1318

Timestamp:

12/20/07 19:38:54 (10 months ago)

Author:

calvin

Message:

zoner: pattern editor updates: customizable note off string, theme colors for note offs and margin text, sticky selections
ld0d: added oscilloscope to AnalyzerView?
calvin: added context menu to AnalyzerView?

Location:

trunk/src/buzelib

Files:

• AnalyzerView.cpp (modified) (4 diffs)
• AnalyzerView.h (modified) (4 diffs)
• BuzeConfiguration.cpp (modified) (1 diff)
• BuzeConfiguration.h (modified) (1 diff)
• Document.h (modified) (1 diff)
• MachineView.cpp (modified) (2 diffs)
• MainFrm.cpp (modified) (3 diffs)
• MainFrm.h (modified) (1 diff)
• PatternEditor/PatternEditorControl.cpp (modified) (1 diff)
• PatternEditor/PatternEditorInner.cpp (modified) (8 diffs)
• PatternEditor/PatternEditorInner.h (modified) (4 diffs)
• PatternView.cpp (modified) (3 diffs)
• PatternView.h (modified) (1 diff)
• resource.h (modified) (1 diff)

trunk/src/buzelib/AnalyzerView.cpp

@@ -21 +21 @@
     bitmapBits = 0;
     bufferScreenWidth = 0;
+        mode = 0;
     setBufferSize(MAX_FFT_SIZE*2);
 }
@@ -123 +124 @@
 }
 
+static float fftfunc(float x)
+{
+        if(x == 0.0) return 0.0;
+
+        x = log10(x) * 40.0 - 40;
+
+        return x;
+}
+
+void AnalyzerView::drawOscilloscope()
+{
+        int i, len;
+        RECT rect;
+        GetClientRect(&rect);
+        int _width = rect.right - rect.left;
+        int _height = rect.bottom - rect.top;
+
+        queueCritial.lock();
+        deque<vector<int> > copyQueue = fftQueue;
+        fftQueue.clear();
+        queueCritial.unlock();
+
+        if (!copyQueue.empty()) {
+                vector<int>& points = copyQueue.front();
+
+                memset(bitmapBits, 0, _height * _width * sizeof(bitmapBits[0]));
+
+                len = points.size();
+                if(len > _width) len = _width;
+                if(len > 512) len = 512;
+
+                int y = points[0] * 100 / 32768 + 200;
+                if(y < 0) y = 0;
+                else if(y >= _height) y = _height - 1;
+                int prevy = y;
+
+                for(i = 0; i < len; i++) {
+                        y = points[i] * 100 / 32768 + 200;
+                        if(y < 0) y = 0;
+                        else if(y >= _height) y = _height - 1;
+
+                        int sy;
+
+                        /* draw line: skip first pixel unless ydiff = 0 */
+
+                        if(y < prevy) {
+                                prevy--;
+
+                                for(int j = y; j <= prevy; j++) {
+                                        bitmapBits[i + j * _width] = RGB(64, 255, 64);
+                                }
+                        } else if(y > prevy) {
+                                prevy++;
+
+                                for(int j = prevy; j <= y; j++) {
+                                        bitmapBits[i + j * _width] = RGB(64, 255, 64);
+                                }
+                        } else { /* y = prevy */
+                                bitmapBits[i + y * _width] = RGB(64, 255, 64);
+                        }
+
+                        prevy = y;
+                }
+        }
+
+        /* draw fft */
+
+        int pts = fft.Points() / 2 + 1;
+        float scaleHeight = (float)_height / (float)pts;///(float)fft.Points()/2;
+        double frqd = (double)pts / (double)_height;
+
+        if (!copyQueue.empty()) {
+
+                vector<int>& points = copyQueue.front();
+                fft.Transform(points);
+
+                if(pts > _width)
+                        pts = _width;
+
+                int y = fftfunc(fft.GetIntensity(0));
+                if(y < 0) y = 0;
+                else if(y >= _height) y = _height - 1;
+                int prevy = y;
+
+                for (int i = 0; i < pts; i++) {
+
+                        y = fftfunc(fft.GetIntensity(i));
+                        if(y < 0) y = 0;
+                        else if(y >= _height) y = _height - 1;
+
+                        int sy;
+
+                        /* draw line: skip first pixel unless ydiff = 0 */
+
+                        if(y < prevy) {
+                                prevy--;
+
+                                for(int j = y; j <= prevy; j++) {
+                                        bitmapBits[i + j * _width] = RGB(64, 255, 64);
+                                }
+                        } else if(y > prevy) {
+                                prevy++;
+
+                                for(int j = prevy; j <= y; j++) {
+                                        bitmapBits[i + j * _width] = RGB(64, 255, 64);
+                                }
+                        } else { /* y = prevy */
+                                bitmapBits[i + y * _width] = RGB(64, 255, 64);
+                        }
+
+                        prevy = y;
+                }
+                copyQueue.pop_front();
+        }
+
+        while (!copyQueue.empty()) {
+                vector<int>& points = copyQueue.front();
+                fft.Transform(points);
+
+                copyQueue.pop_front();
+        }
+}
+
+LRESULT AnalyzerView::OnEraseBkgnd(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
+        return TRUE;
+}
+
 LRESULT AnalyzerView::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
 
     if (!background.m_hBitmap) return 0;
 
-    drawFft();
+    if (mode == 0)
+                drawFft(); else
+        if (mode == 1)
+                drawOscilloscope();
 
     CPaintDC dc(m_hWnd);
@@ -143 +274 @@
 }
 
+LRESULT AnalyzerView::OnRButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) {
+        // set up context menu that sends ID_ANALYZER_MODE_FIRST ID_ANALYZER_MODE_FIRST+1 etc
+        POINT pt = { LOWORD(lParam), HIWORD(lParam) };
+        CMenu menu; 
+        menu.CreatePopupMenu();
+        menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING|(mode==0?MF_CHECKED:0), (UINT_PTR)ID_ANALYZER_MODE_FIRST + 0, "Simple");
+        menu.InsertMenu(-1, MF_BYPOSITION|MF_STRING|(mode==1?MF_CHECKED:0), (UINT_PTR)ID_ANALYZER_MODE_FIRST + 1, "Oscilloscope");
+
+        ClientToScreen(&pt);
+
+        menu.TrackPopupMenu(TPM_CENTERALIGN | TPM_LEFTBUTTON, pt.x, pt.y, m_hWnd, 0);
+
+        return 0;
+}
+
+LRESULT AnalyzerView::OnAnalyzerSetMode(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) {
+        RECT rect;
+        GetClientRect(&rect);
+        int _width = rect.right - rect.left;
+        int _height = rect.bottom - rect.top;
+        memset(bitmapBits, 0, _height * _width * sizeof(bitmapBits[0]));
+
+        WORD type = wID - ID_ANALYZER_MODE_FIRST;
+        switch (type) {
+                case 0:
+                        mode = 0;
+                        break;
+                case 1:
+                        mode = 1;
+                        break;
+        }
+        return 0;
+}
+
 void AnalyzerView::writeBuffer(float** buffer, size_t numSamples) {
 
@@ -166 +331 @@
 }
 
+

trunk/src/buzelib/AnalyzerView.h

@@ -17 +17 @@
     unsigned int* bitmapBits;
     CBitmap background;
+        int mode;
 
 public:
-//      DECLARE_WND_CLASS("WaveTableView")
+        DECLARE_WND_CLASS("AnalyzerView")
 //      DECLARE_WND_CLASS_EX("AnalyzerView", CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS, BLACK)
 
@@ -29 +30 @@
                 MESSAGE_HANDLER(WM_CLOSE, OnClose)
                 MESSAGE_HANDLER(WM_SETFOCUS, OnFocus)
+                MESSAGE_HANDLER(WM_RBUTTONDOWN, OnRButtonDown)
+                MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd)
+
+                COMMAND_RANGE_HANDLER(ID_ANALYZER_MODE_FIRST, ID_ANALYZER_MODE_LAST, OnAnalyzerSetMode)
         END_MSG_MAP()
 
@@ -35 +40 @@
         ~AnalyzerView(void);
 
-        static CWndClassInfo& GetWndClassInfo() {
-    static CWndClassInfo wc = 
-        { {
-                sizeof(WNDCLASSEX), CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS, StartWindowProc,0, 0, NULL, NULL, NULL, (HBRUSH)::GetStockObject(BLACK_BRUSH),NULL,GetWndClassName(), NULL
-      },
-      NULL, NULL, IDC_ARROW, TRUE, 0, _T("")
-    };
-    return wc;
-  }
-
-  static LPCTSTR GetWndClassName()
-  {
-    return _T("AnalyzerView");
-  }
-
         LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
         LRESULT OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
@@ -55 +45 @@
         LRESULT OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
         LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnRButtonDown(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnEraseBkgnd(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+        LRESULT OnAnalyzerSetMode(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
 
     void writeBuffer(float** samples, size_t numSamples);
 
     void drawFft();
+    void drawOscilloscope();
         //void work(float* buffer, unsigned int numSamples);
 };

trunk/src/buzelib/BuzeConfiguration.cpp

@@ -369 +369 @@
         return atof(str.c_str());
 }
+
+std::string CConfiguration::getNoteOffString() {
+        string s;
+        if (!getConfigString("Settings", "NoteOffString", &s))
+                return "off";
+
+        if (s.size() > 3)
+                s.resize(3);
+        return s;
+}
+
+void CConfiguration::setNoteOffString(std::string s) {
+        setConfigString("Settings", "NoteOffString", s);
+}

trunk/src/buzelib/BuzeConfiguration.h

@@ -68 +68 @@
         double getMachineScale();
 
+        void setNoteOffString(std::string s);
+        std::string getNoteOffString();
+
 };

trunk/src/buzelib/Document.h

@@ -55 +55 @@
 
         UpdateTheme,
+        UpdateSettings,
 
         UpdateClearWave,

trunk/src/buzelib/MachineView.cpp

@@ -242 +242 @@
                         if (scale<MAX_MACHINE_SCALE) {
                                 scale+=0.1;
+                                _Module.configuration->setMachineScale(scale);
                                 invalidateMachines();
                         }
@@ -247 +248 @@
                         if (scale>0.3) {
                                 scale-=0.1;
+                                _Module.configuration->setMachineScale(scale);
                                 invalidateMachines();
                         }

trunk/src/buzelib/MainFrm.cpp

@@ -1604 +1604 @@
         }
 
+        if (player->getSoloMachine() != 0)
+                document->setMachineSolo(player->getSoloMachine(), FALSE);
+
         return 0;
 }
@@ -2846 +2849 @@
         { "PE Text Note", RGB(0x20, 0x20, 0x80) }, 
         { "PE Text Shade", RGB(0x68, 0x68, 0x68) }, 
+        { "PE Text Margin", RGB(0x7F, 0x73, 0x53) },
+        { "PE Text Note Off", RGB(0xdd, 0x33, 0xdd) },
         { "SA Amp BG", RGB(0x70, 0x80, 0x90) }, 
         { "SA Amp Line", RGB(0x00, 0xC8, 0x00) }, 
@@ -2918 +2923 @@
 }
 
+void CMainFrame::setDefaultOverrideColor(std::string dest, std::string src) {
+        map<string, COLORREF>::iterator i;
+
+        if (theme.find(dest) != theme.end())
+                return;
+
+        i = theme.find(src);
+
+        if (i != theme.end())
+                theme.insert(pair<string, COLORREF>(dest, i->second));
+}
+
 void CMainFrame::setTheme(std::string themeName) {
 
         theme.clear();
 
-        for (unsigned int i = 0; i< defaultThemeCount; i++) {
-                theme.insert(pair<string, COLORREF>(defaultTheme[i].name, defaultTheme[i].color));
-        }
 
         FileReader reader;
         string fileName = "Themes/" + themeName + ".col";
-        if (!reader.open(fileName.c_str())) goto finishTheme;
-
-        while (!reader.eof()) {
-                std::string line=trim(reader.readLine());
-                if (line.length()==0) continue;
-                if (line.at(0)=='#') continue;
-                
-                size_t lt = line.find_first_of('\t');
-                if (lt == string::npos) continue;
-
-                string name = trim(line.substr(0, lt));
-                string colorstr = trim(line.substr(lt+1));
-                if (colorstr.length() != 6) continue;
-
-                COLORREF color = RGB(
-                        intFromHex(colorstr.substr(0, 2)),
-                        intFromHex(colorstr.substr(2, 2)),
-                        intFromHex(colorstr.substr(4, 2))
-                );
-                theme[name] = color;//.insert(pair<string, COLORREF>(name, color));
-        }
-        
-        reader.close();
-
-finishTheme:
+        if (reader.open(fileName.c_str())) {
+
+                while (!reader.eof()) {
+                        std::string line=trim(reader.readLine());
+                        if (line.length()==0) continue;
+                        if (line.at(0)=='#') continue;
+                        
+                        size_t lt = line.find_first_of('\t');
+                        if (lt == string::npos) continue;
+
+                        string name = trim(line.substr(0, lt));
+                        string colorstr = trim(line.substr(lt+1));
+                        if (colorstr.length() != 6) continue;
+
+                        COLORREF color = RGB(
+                                intFromHex(colorstr.substr(0, 2)),
+                                intFromHex(colorstr.substr(2, 2)),
+                                intFromHex(colorstr.substr(4, 2))
+                        );
+                        theme[name] = color;
+                }
+                reader.close();
+        }
+
+#if 0 // Uncomment this so that legacy buzz themes look their best with buze's new theme values
+
+        // Theme-based defaults
+
+        setDefaultOverrideColor("PE Text Note",         "PE Text");
+        setDefaultOverrideColor("PE Text Note Off",     "PE Text");
+        setDefaultOverrideColor("PE Text Shade",        "PE Text");
+        setDefaultOverrideColor("PE Text Margin",       "PE Text Note");
+
+#endif
+
+        // Defaults
+
+        for (unsigned int i = 0; i< defaultThemeCount; i++) {
+                if (theme.find(defaultTheme[i].name) == theme.end())
+                        theme.insert(pair<string, COLORREF>(defaultTheme[i].name, defaultTheme[i].color));
+        }
+
         document->updateAllViews(0, UpdateTheme);
 

trunk/src/buzelib/MainFrm.h

@@ -562 +562 @@
         std::string getThemeName(size_t index);
         void setTheme(std::string theme);
+        void setDefaultOverrideColor(std::string dest, std::string src);
         COLORREF getThemeColor(std::string name);
 

trunk/src/buzelib/PatternEditor/PatternEditorControl.cpp

@@ -33 +33 @@
         screenDC.SelectFont(editor.track_font);
         screenDC.SetBkColor(bgcolor);
-        screenDC.SetTextColor(editor.colors[PE_TextNote]);
+        screenDC.SetTextColor(editor.colors[PE_TextMargin]);
 
         // render row numbers

trunk/src/buzelib/PatternEditor/PatternEditorInner.cpp

@@ -23 +23 @@
 }
 
-std::string noteFromInt(unsigned char i) {
-        if (i == 255) return "off";
+std::string noteFromInt(unsigned char i, std::string noteOffStr) {
+        if (i == 255) return noteOffStr;
         char* notes[]={"..", "C-", "C#", "D-", "D#", "E-", "F-", "F#", "G-", "G#", "A-", "A#", "B-", "..", "..", "..", ".." };
         char pc[16];
@@ -65 +65 @@
         step = 1;
         last_play_pos = -1;
+        noteOffStr = "off";
+        stickySelection = false;
 
         SetThemeColor(PE_BG, RGB(0xDA, 0xD6, 0xC9));
@@ -151 +153 @@
                         if (v == columns[j].novalue)
                                 dc.SetTextColor(colors[PE_TextShade]); else
-                        if (columns[j].type == pattern_column_type_note)
-                                dc.SetTextColor(colors[PE_TextNote]); else
-                                dc.SetTextColor(colors[PE_TextValue]);
+                        if (columns[j].type == pattern_column_type_note) {
+                                if (v == 255) // This represents a note off
+                                        dc.SetTextColor(colors[PE_TextNoteOff]);
+                                else
+                                        dc.SetTextColor(colors[PE_TextNote]);
+                        }
+                        else dc.SetTextColor(colors[PE_TextValue]);
 
                         int dest_x = columns[j].unit * font_size.cx;
@@ -663 +669 @@
         switch (type) {
                 case pattern_column_type_note:
-                        return v!=novalue?noteFromInt(v):"...";
+                        return v!=novalue?noteFromInt(v, noteOffStr):"...";
                 case pattern_column_type_byte:
                         return v!=novalue?hexFromInt(v, 2, '0'):"..";
@@ -919 +925 @@
         if (affectsel) {
                 if (IsShiftDown()) {
+                        if (stickySelection == true) {
+                                if (cursor_columns[last_cursor.x].column < select_start.x ||
+                                        cursor_columns[last_cursor.x].column > select_end.x ||
+                                        last_cursor.y < select_start.y ||
+                                        last_cursor.y > select_end.y)
+                                {
+                                        InvalidateSelection();
+                                        SelectRange(-1, -1, -1, -1);
+                                }
+                        }
                         if (select_first.x == -1) {
                                 // begin selection
@@ -928 +944 @@
                 } else {
                         if (select_first.x != -1) {
-                                SelectRange(-1, -1, -1, -1);
+                                if (stickySelection == false)
+                                        SelectRange(-1, -1, -1, -1);
                         }
                 }
@@ -1072 +1089 @@
         if (!m_hWnd) return ;
 
+        InvalidateSelection(&rcPrevSel);
+}
+
+void CPatternEditorInner::InvalidateSelection(RECT *rcPrevSel) {
         RECT rcSel;
+        
+        if(!rcPrevSel)
+                rcPrevSel = &rcSel;
+
         if (!GetSelectionRectScreen(&rcSel))
                 rcSel.left = -1;
 
-        if (rcSel.left != -1 && rcPrevSel.left != -1) {
-                UnionRect(&rcSel, &rcSel, &rcPrevSel);
+        if (rcSel.left != -1 && rcPrevSel->left != -1) {
+                UnionRect(&rcSel, &rcSel, rcPrevSel);
         } else 
         if (rcSel.left == -1) {
-                rcSel = rcPrevSel;
+                rcSel = *rcPrevSel;
         }
 
@@ -1112 +1137 @@
 void CPatternEditorInner::SetThemeColor(theme_index index, COLORREF color) {
         colors[index] = color;
+}
+
+void CPatternEditorInner::SetNoteOffStr(std::string s) {
+        noteOffStr = s;
+        
+}
+
+void CPatternEditorInner::SetStickySelection(bool setting) {
+        stickySelection = setting;
 }
 

trunk/src/buzelib/PatternEditor/PatternEditorInner.h

@@ -74 +74 @@
         PE_TextNote = 6,
         PE_TextValue = 7,
+        PE_TextNoteOff = 8,
+        PE_TextMargin = 9,
+
 };
 
 class CPatternEditorInner : public CWindowImpl<CPatternEditorInner> {
 public:
-        COLORREF colors[8];
+        COLORREF colors[10];
         SIZE font_size, pattern_size;
         RECT rcClient;
@@ -88 +91 @@
         CBitmap pattern_bitmap;
         CFont track_font;
+        std::string noteOffStr;
+        bool stickySelection;
 
         int rows, total_rows;
@@ -152 +157 @@
         void SetFont(HFONT hFont, bool bRedraw = 1);
         void SetThemeColor(theme_index index, COLORREF color);
+        void SetNoteOffStr(std::string s);
+        void SetStickySelection(bool setting);
         void MoveCursor(int x, int y, bool affectsel);
         void ScrollTo(POINT pt);                // scroll to position pt
@@ -159 +166 @@
         bool GetRangeRectScreen(int from_col, int from_row, int to_col, int to_row, RECT* rc);
         bool GetSelectionRect(RECT* rc);
+        void InvalidateSelection(RECT *rcPrevSel = NULL);
         void SetHighlightRows(int verydarkrow, int darkrow);
         void SelectRange(int from_col, int from_row, int to_col, int to_row);

trunk/src/buzelib/PatternView.cpp

@@ -224 +224 @@
         setPatternEditorFont();
 
+        bindSettings();
         bindTheme();
         bindPatternEditor();
@@ -574 +575 @@
                         break;
                 }
+                case UpdateSettings:
+                        bindSettings();
+                        break;