From: <pst...@us...> - 2009-02-17 00:51:56
|
Revision: 708 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=708&view=rev Author: pstieber Date: 2009-02-17 00:51:53 +0000 (Tue, 17 Feb 2009) Log Message: ----------- Removed the velocity dialog code. This will eventually be handled by the base class code. Currently the piano window scrolling code is incorrect. Modified Paths: -------------- trunk/jazz/src/PianoFrame.cpp trunk/jazz/src/PianoFrame.h trunk/jazz/src/PianoWindow.cpp trunk/jazz/src/PianoWindow.h Modified: trunk/jazz/src/PianoFrame.cpp =================================================================== --- trunk/jazz/src/PianoFrame.cpp 2009-02-17 00:50:11 UTC (rev 707) +++ trunk/jazz/src/PianoFrame.cpp 2009-02-17 00:51:53 UTC (rev 708) @@ -184,7 +184,6 @@ // EVT_MENU(ID_SEARCH_AND_REPLACE, JZPianoFrame::OnSearchReplace) // EVT_MENU(ID_TRANSPOSE, JZPianoFrame::OnTranspose) // EVT_MENU(ID_SET_CHANNEL, JZPianoFrame::OnSetChannel) - EVT_MENU(ID_VELOCITY, JZPianoFrame::OnActivateVelocityDialog) // EVT_MENU(ID_LENGTH, JZPianoFrame::OnLength) EVT_MENU(MEN_MIDIDELAY, JZPianoFrame::OnActivateMidiDelayDialog) EVT_MENU(MEN_SEQLENGTH, JZPianoFrame::OnActivateSequenceLengthDialog) @@ -768,11 +767,6 @@ mpPianoWindow->ActivateSequenceLengthDialog(); } -void JZPianoFrame::OnActivateVelocityDialog(wxCommandEvent& Event) -{ - mpPianoWindow->ActivateVelocityDialog(); -} - void JZPianoFrame::ActClose(wxCommandEvent& Event) { Show(false); Modified: trunk/jazz/src/PianoFrame.h =================================================================== --- trunk/jazz/src/PianoFrame.h 2009-02-17 00:50:11 UTC (rev 707) +++ trunk/jazz/src/PianoFrame.h 2009-02-17 00:51:53 UTC (rev 708) @@ -95,7 +95,6 @@ void OnActivateSettingsDialog(wxCommandEvent& Event); void OnActivateMidiDelayDialog(wxCommandEvent& Event); void OnActivateSequenceLengthDialog(wxCommandEvent& Event); - void OnActivateVelocityDialog(wxCommandEvent& Event); void CtrlChannelAftertouchEdit(wxCommandEvent& Event); void OnCtrlPolyAftertouchEdit(wxCommandEvent& Event); Modified: trunk/jazz/src/PianoWindow.cpp =================================================================== --- trunk/jazz/src/PianoWindow.cpp 2009-02-17 00:50:11 UTC (rev 707) +++ trunk/jazz/src/PianoWindow.cpp 2009-02-17 00:51:53 UTC (rev 708) @@ -3199,39 +3199,3 @@ Refresh(); } } - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -void JZPianoWindow::ActivateVelocityDialog() -{ - int FromValue = 64; - int ToValue = 0; - int modes[] = - { - 8, // set - 12, // add - 16, // subtract - -1, // End of list - }; - - int Mode = modes[0]; - - if (!EventsSelected()) - { - return; - } - - jppResourceDialog dialog(this, "velocity"); - dialog.Attach("start" ,&FromValue); - dialog.Attach("stop", &ToValue); - dialog.Attach("mode", &Mode, modes); - - if (dialog.ShowModal() == wxID_OK) - { - //execute the command - tCmdVelocity cmd(mpFilter, FromValue, ToValue, Mode); - cmd.Execute(); - SetScrollRanges(); - Refresh(); - } -} Modified: trunk/jazz/src/PianoWindow.h =================================================================== --- trunk/jazz/src/PianoWindow.h 2009-02-17 00:50:11 UTC (rev 707) +++ trunk/jazz/src/PianoWindow.h 2009-02-17 00:51:53 UTC (rev 708) @@ -187,8 +187,6 @@ void ActivateSequenceLengthDialog(); - void ActivateVelocityDialog(); - private: JZPianoFrame* mpPianoFrame; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |