[Lmuse-cvs-traffic] muse/muse extmidieditor.cpp,1.13,1.14 extmidieditor.h,1.11,1.12

[Mathias L. <lun...@us...>]

Update of /cvsroot/lmuse/muse/muse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4693/muse

Modified Files:
	extmidieditor.cpp extmidieditor.h 
Log Message:
Controller-pane fixes

Index: extmidieditor.h
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/extmidieditor.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** extmidieditor.h	25 Oct 2004 20:44:10 -0000	1.11
--- extmidieditor.h	24 Mar 2005 21:33:19 -0000	1.12
***************
*** 15,18 ****
--- 15,19 ----
  
  #define EXTMIDIEDITOR_XSCALE -10
+ #define EXTMIDIEDITOR_DEFAULT_CTRLHEIGHT 100
  
  #include "midieditor.h"

Index: extmidieditor.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/extmidieditor.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** extmidieditor.cpp	13 Jan 2005 21:15:38 -0000	1.13
--- extmidieditor.cpp	24 Mar 2005 21:33:19 -0000	1.14
***************
*** 209,213 ****
        int j=0;
        for (std::list<CtrlEdit*>::const_iterator i = ctrlEditList.begin(); i != ctrlEditList.end(); ++i, j++) {
!             CtrlEditSettings* ctrl = new CtrlEditSettings((*i)->getPanelHeight(), (*i)->controller()->num());
              s->setControlEditSettings(j, ctrl);
              }
--- 209,215 ----
        int j=0;
        for (std::list<CtrlEdit*>::const_iterator i = ctrlEditList.begin(); i != ctrlEditList.end(); ++i, j++) {
!             CtrlEdit* ctrlEdit = (*i);
!             int ctrlid = ctrlEdit->controllerId();
!             CtrlEditSettings* ctrl = new CtrlEditSettings(ctrlEdit->getPanelHeight(), ctrlid);
              s->setControlEditSettings(j, ctrl);
              }
***************
*** 388,391 ****
--- 390,417 ----
        CtrlEdit* ctrlEdit = new CtrlEdit(splitter, this, EXTMIDIEDITOR_XSCALE, false, "extMidiEditorCtrlEdit");
        splitter->setResizeMode(ctrlEdit, QSplitter::KeepSize);
+ 
+       // Calculate sizes:
+       QValueList<int> sizes = splitter->sizes();
+       QValueList<int> newSizes;
+       QValueListIterator<int> i = sizes.begin();
+ 
+       int editorHeight = *i - EXTMIDIEDITOR_DEFAULT_CTRLHEIGHT;
+       int ctrlHeight   = EXTMIDIEDITOR_DEFAULT_CTRLHEIGHT;
+       if (editorHeight < 0) {
+             ctrlHeight = EXTMIDIEDITOR_DEFAULT_CTRLHEIGHT + editorHeight;
+             editorHeight = *i - ctrlHeight;
+             }
+       if (editorHeight < 0) {
+             editorHeight = 5;
+             }
+ 
+       newSizes.append(editorHeight);
+       for (i++; i != sizes.end(); i++) {
+             newSizes.append(*i);
+             }
+       newSizes.pop_back();
+       newSizes.append(ctrlHeight);
+       splitter->setSizes(newSizes);
+ 
        ctrlEdit->blockSignals(true);
        connect(tools2,   SIGNAL(toolChanged(int)),   ctrlEdit, SLOT(setTool(int)));
***************
*** 399,402 ****
--- 425,429 ----
        ctrlEdit->setXPos(hscroll->pos());
        ctrlEdit->setXMag(hscroll->getScaleValue());
+       ctrlEdit->setController(CTRL_VELOCITY);
  
        ctrlEdit->show();