Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse/midiedit dlist.cpp,1.9,1.9.2.1 dlist.h,1.5,1.5.2.1 drumedit.cpp,1.22.2.5,1.22.2.6 ecanvas.cpp,1.8.2.1,1.8.2.2
|
From: Robert J. <spa...@us...> - 2006-01-02 23:15:21
|
Update of /cvsroot/lmuse/muse/muse/midiedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2136/muse/midiedit Modified Files: Tag: REL07 dlist.cpp dlist.h drumedit.cpp ecanvas.cpp Log Message: see changelog Index: dlist.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/Attic/dlist.h,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** dlist.h 17 Jan 2004 11:34:00 -0000 1.5 --- dlist.h 2 Jan 2006 23:15:08 -0000 1.5.2.1 *************** *** 11,15 **** #include "view.h" ! #define TH 18 // normale Track-Höhe class QPainter; --- 11,15 ---- #include "view.h" ! #define TH 18 // normale Track-H�e class QPainter; *************** *** 32,35 **** --- 32,36 ---- int selectedColumn; + int startY; int curY; *************** *** 46,50 **** void devicesPopupMenu(DrumMap* t, int x, int y, bool changeAll); Q_OBJECT ! void setCurDrumInstrument(int n); private slots: --- 47,51 ---- void devicesPopupMenu(DrumMap* t, int x, int y, bool changeAll); Q_OBJECT ! //void setCurDrumInstrument(int n); private slots: *************** *** 63,72 **** void tracklistChanged(); void songChanged(int); - public: DList(QHeader*, QWidget* parent, int ymag); ~DList(); void setScroll(ScrollScale* s) { scroll = s; } int getSelectedInstrument(); }; --- 64,78 ---- void tracklistChanged(); void songChanged(int); public: + void lineEdit(int line, int section); + void setCurDrumInstrument(int n); DList(QHeader*, QWidget* parent, int ymag); ~DList(); void setScroll(ScrollScale* s) { scroll = s; } int getSelectedInstrument(); + + enum DCols { COL_MUTE=0, COL_NAME, COL_QNT, COL_ENOTE, COL_LEN, + COL_ANOTE, COL_CHANNEL, COL_PORT, + COL_LV1, COL_LV2, COL_LV3, COL_LV4, COL_NONE=-1}; }; Index: drumedit.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/drumedit.cpp,v retrieving revision 1.22.2.5 retrieving revision 1.22.2.6 diff -C2 -d -r1.22.2.5 -r1.22.2.6 *** drumedit.cpp 1 Jan 2006 21:19:14 -0000 1.22.2.5 --- drumedit.cpp 2 Jan 2006 23:15:08 -0000 1.22.2.6 *************** *** 856,859 **** --- 856,874 ---- return; } + else if (key == Key_Up) { + dlist->setCurDrumInstrument(dlist->getSelectedInstrument()-1); + dlist->redraw(); + return; + } + else if (key == Key_F2) { + dlist->lineEdit(dlist->getSelectedInstrument(),(int)DList::COL_NAME); + return; + } + else if (key == Key_Down) { + dlist->setCurDrumInstrument(dlist->getSelectedInstrument()+1); + dlist->redraw(); + return; + } + else if (key == shortcuts[SHRT_POS_INC].key) { dc->cmd(DrumCanvas::CMD_RIGHT); Index: dlist.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/Attic/dlist.cpp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** dlist.cpp 30 May 2004 09:58:07 -0000 1.9 --- dlist.cpp 2 Jan 2006 23:15:08 -0000 1.9.2.1 *************** *** 22,28 **** #include "scrollscale.h" ! enum DCols { COL_MUTE=0, COL_NAME, COL_QNT, COL_ENOTE, COL_LEN, ! COL_ANOTE, COL_CHANNEL, COL_PORT, ! COL_LV1, COL_LV2, COL_LV3, COL_LV4, COL_NONE=-1}; //--------------------------------------------------------- --- 22,28 ---- #include "scrollscale.h" ! // enum DCols { COL_MUTE=0, COL_NAME, COL_QNT, COL_ENOTE, COL_LEN, ! // COL_ANOTE, COL_CHANNEL, COL_PORT, ! // COL_LV1, COL_LV2, COL_LV3, COL_LV4, COL_NONE=-1}; //--------------------------------------------------------- *************** *** 342,346 **** // int button = ev->button(); unsigned pitch = y / TH; - DrumMap* dm = &drumMap[pitch]; int section = header->sectionAt(x); --- 342,345 ---- *************** *** 348,351 **** --- 347,361 ---- if (section == COL_NAME || section == COL_LEN || section == COL_LV1 || section == COL_LV2 || section == COL_LV3 || section == COL_LV4) { + lineEdit(pitch, section); + } + else + viewMousePressEvent(ev); + } + + + + void DList::lineEdit(int line, int section) + { + DrumMap* dm = &drumMap[line]; editEntry = dm; if (editor == 0) { *************** *** 357,361 **** int colx = mapx(header->sectionPos(section)); int colw = rmapx(header->sectionSize(section)); ! int coly = mapy(pitch * TH); int colh = rmapy(TH); selectedColumn = section; //Store selected column to have an idea of which one was selected when return is pressed --- 367,371 ---- int colx = mapx(header->sectionPos(section)); int colw = rmapx(header->sectionSize(section)); ! int coly = mapy(line * TH); int colh = rmapy(TH); selectedColumn = section; //Store selected column to have an idea of which one was selected when return is pressed *************** *** 394,401 **** editor->selectAll(); editor->show(); ! } ! else ! viewMousePressEvent(ev); ! } //--------------------------------------------------------- --- 404,424 ---- editor->selectAll(); editor->show(); ! editor->setFocus(); ! ! } ! ! ! ! ! ! ! ! ! ! ! ! ! ! //--------------------------------------------------------- *************** *** 423,426 **** --- 446,452 ---- void DList::setCurDrumInstrument(int instr) { + printf("setCurDrumInstrument %d\n",instr); + if (instr < 0 || instr >= DRUM_MAPSIZE -1) + return; // illegal instrument DrumMap* dm = &drumMap[instr]; if (currentlySelected != dm) { Index: ecanvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/ecanvas.cpp,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** ecanvas.cpp 8 May 2005 13:33:13 -0000 1.8.2.1 --- ecanvas.cpp 2 Jan 2006 23:15:08 -0000 1.8.2.2 *************** *** 290,309 **** iCItem i, iLeftmost; CItem* leftmost = NULL; ! for (i = items.end(), i--; i != items.begin(); i--) { ! if (i->second->isSelected()) { ! iLeftmost = i; leftmost = i->second; } } - if (leftmost) { - if (iLeftmost != items.begin()) { - //Add item - if (key != shortcuts[SHRT_SEL_LEFT_ADD].key) - deselectAll(); - - iLeftmost--; - iLeftmost->second->setSelected(true); - updateSelection(); - } - } } else if (key == shortcuts[SHRT_INC_PITCH].key) { --- 290,311 ---- iCItem i, iLeftmost; CItem* leftmost = NULL; ! if (items.size() > 0 ) { ! for (i = items.end(), i--; i != items.begin(); i--) { ! if (i->second->isSelected()) { ! iLeftmost = i; leftmost = i->second; ! } } + if (leftmost) { + if (iLeftmost != items.begin()) { + //Add item + if (key != shortcuts[SHRT_SEL_LEFT_ADD].key) + deselectAll(); + + iLeftmost--; + iLeftmost->second->setSelected(true); + updateSelection(); + } + } } } else if (key == shortcuts[SHRT_INC_PITCH].key) { |