Menu
▾
▴
SF.net SVN: jazzplusplus:[696] trunk/jazz/src
|
From: <pst...@us...> - 2009-01-21 06:04:41
|
Revision: 696
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=696&view=rev
Author: pstieber
Date: 2009-01-21 06:04:36 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
1. Updated some resource IDs.
2. Continued with the event frame cleanup.
Modified Paths:
--------------
trunk/jazz/src/EventFrame.cpp
trunk/jazz/src/EventFrame.h
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/Resources.h
trunk/jazz/src/TrackFrame.cpp
Modified: trunk/jazz/src/EventFrame.cpp
===================================================================
--- trunk/jazz/src/EventFrame.cpp 2009-01-20 15:03:32 UTC (rev 695)
+++ trunk/jazz/src/EventFrame.cpp 2009-01-21 06:04:36 UTC (rev 696)
@@ -47,7 +47,6 @@
mEventsHeight(0),
SnapSel(0),
MouseAction(0),
- PlayClock(-1),
mpSettingsDialog(0),
MixerForm(0),
mpToolBar(0),
@@ -56,6 +55,8 @@
mpFilter = new JZFilter(Song);
}
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
JZEventFrame::~JZEventFrame()
{
delete SnapSel;
@@ -81,104 +82,45 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::OnUpdateEditShift(wxUpdateUIEvent& Event)
+void JZEventFrame::SnapSelStart(wxMouseEvent& MouseEvent)
{
- if (mpEventWindow)
- {
- Event.Enable(mpEventWindow->AreEventsSelected());
- }
- else
- {
- Event.Enable(false);
- }
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::OnEditShift(wxCommandEvent& Event)
+void JZEventFrame::SnapSelStop(wxMouseEvent& MouseEvent)
{
- if (mpEventWindow)
- {
- mpEventWindow->Shift(16);
- }
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-bool JZEventFrame::OnCharHook(wxKeyEvent& e)
-{
- return OnKeyEvent(e);
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//int JZEventFrame::y2Line(int y, bool Up)
-//{
-// if (Up)
-// {
-// y += mTrackHeight;
-// }
-// y -= mTopInfoHeight;
-// return y / mTrackHeight;
-//}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//int JZEventFrame::Line2y(int Line)
-//{
-// return Line * mTrackHeight + mTopInfoHeight;
-//}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-void JZEventFrame::Redraw()
-{
-// wxDC* dc=new wxClientDC(this);
-// wxPaintEvent e;
-// cout<<"FIXME JZEventFrame::Redraw"<<endl;
-// mpEventWindow->OnDraw(*dc); //this will in turn call the eventwin onpaintsub
-// // the problem is that onpaint no longer takes arguments, and is supposed
-// // to be called from the framework only, so it should be split.
-// delete dc;
-
-// if (mpEventWindow)
-// {
-// mpEventWindow->Refresh();
-// }
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-bool JZEventFrame::OnKeyEvent(wxKeyEvent &e)
-{
- return false;
-}
-
-//-----------------------------------------------------------------------------
// seems to handle the "selection" rectangle. normally called from the base
// class onmouseevent handler
//-----------------------------------------------------------------------------
-int JZEventFrame::OnMouseEvent(wxMouseEvent &e)
+int JZEventFrame::OnMouseEvent(wxMouseEvent& MouseEvent)
{
- // cout <<"JZEventFrame::OnMouseEvent"<<endl;
+// cout << "JZEventFrame::OnMouseEvent" << endl;
if (!MouseAction)
{
// create SnapSel?
int x;
int y;
- e.GetPosition(&x, &y);
- if (mEventsX < x && x < mEventsX + mEventsWidth && mEventsY < y && y < mEventsY + mEventsHeight)
+ MouseEvent.GetPosition(&x, &y);
+ if (
+ mEventsX < x &&
+ x < mEventsX + mEventsWidth &&
+ mEventsY < y &&
+ y < mEventsY + mEventsHeight)
{
- if (e.LeftDown())
+ if (MouseEvent.LeftDown())
{
{
- SnapSelStart(e);
+ SnapSelStart(MouseEvent);
if (SnapSel->IsSelected())
{
Refresh(); //redraw the whole window instead(inefficient, we should rather invalidate a rect)
}
- SnapSel->Event(e);
+ SnapSel->Event(MouseEvent);
MouseAction = SnapSel;
}
}
@@ -188,13 +130,13 @@
{
// MouseAction active
- if (MouseAction->Event(e))
+ if (MouseAction->Event(MouseEvent))
{
// MouseAction finished
if (MouseAction == SnapSel)
{
- SnapSelStop(e);
+ SnapSelStop(MouseEvent);
Redraw(); //ineficcient, invalidate rect first instead
MouseAction = 0;
return 1;
@@ -208,36 +150,74 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+bool JZEventFrame::OnKeyEvent(wxKeyEvent& KeyEvent)
+{
+ return false;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
bool JZEventFrame::OnClose()
{
- return FALSE;
+ return false;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::OnMenuCommand(int)
+void JZEventFrame::Redraw()
{
+// wxDC* dc=new wxClientDC(this);
+// wxPaintEvent PaintEvent;
+// cout<<"FIXME JZEventFrame::Redraw"<<endl;
+// mpEventWindow->OnDraw(*dc); //this will in turn call the eventwin onpaintsub
+// // the problem is that onpaint no longer takes arguments, and is supposed
+// // to be called from the framework only, so it should be split.
+// delete dc;
+
+// if (mpEventWindow)
+// {
+// mpEventWindow->Refresh();
+// }
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::SnapSelStart(wxMouseEvent& MouseEvent)
+bool JZEventFrame::OnCharHook(wxKeyEvent& KeyEvent)
{
+ return OnKeyEvent(KeyEvent);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::SnapSelStop(wxMouseEvent& MouseEvent)
+void JZEventFrame::OnUpdateEditShift(wxUpdateUIEvent& Event)
{
+ if (mpEventWindow)
+ {
+ Event.Enable(mpEventWindow->AreEventsSelected());
+ }
+ else
+ {
+ Event.Enable(false);
+ }
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::MenQuantize()
+void JZEventFrame::OnEditShift(wxCommandEvent& Event)
{
+ if (mpEventWindow)
+ {
+ mpEventWindow->Shift(16);
+ }
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZEventFrame::OnQuantize(wxCommandEvent& Event)
+{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
- return;
+ return;
}
// wxDialogBox *panel = new wxDialogBox(this, "Quantize", FALSE );
Modified: trunk/jazz/src/EventFrame.h
===================================================================
--- trunk/jazz/src/EventFrame.h 2009-01-20 15:03:32 UTC (rev 695)
+++ trunk/jazz/src/EventFrame.h 2009-01-21 06:04:36 UTC (rev 696)
@@ -57,50 +57,49 @@
virtual ~JZEventFrame();
- JZSong* Song;
-
- JZFilter* mpFilter;
-
virtual void SetEventWindow(JZEventWindow* pEventWindow);
- int mTopInfoHeight;
-
- int mEventsX, mEventsY, mEventsWidth, mEventsHeight;
-
- // Mouse handling
- JZSnapSelection* SnapSel;
- tMouseAction* MouseAction;
virtual void SnapSelStart(wxMouseEvent &e);
virtual void SnapSelStop(wxMouseEvent &e);
- int PlayClock;
-
// Events
virtual int OnMouseEvent(wxMouseEvent& Event);
virtual bool OnKeyEvent(wxKeyEvent& Event); // true = processed by eventwin
- virtual void OnMenuCommand(int id);
virtual bool OnClose();
// Redraw - nach Aenderungen von Parametern, kein GUI-Event
virtual void Redraw();
+
+
+
+ JZSong* Song;
+
+ JZFilter* mpFilter;
+
+ int mTopInfoHeight;
+
+ int mEventsX, mEventsY, mEventsWidth, mEventsHeight;
+
+ // Mouse handling
+ JZSnapSelection* SnapSel;
+ tMouseAction* MouseAction;
+
// Settings-Dialog
wxDialog* mpSettingsDialog;
- void SettingsDialog(int piano);
// Mixer-Dialog
wxDialog* MixerForm;
private:
+ bool OnCharHook(wxKeyEvent& Event);
+
void OnUpdateEditShift(wxUpdateUIEvent& Event);
void OnEditShift(wxCommandEvent& Event);
- bool OnCharHook(wxKeyEvent& Event);
+ void OnQuantize(wxCommandEvent& Event);
- void OnChar(wxKeyEvent& Event);
-
- void MenQuantize();
void MenSetChannel();
void MenTranspose();
void MenDelete();
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-01-20 15:03:32 UTC (rev 695)
+++ trunk/jazz/src/EventWindow.cpp 2009-01-21 06:04:36 UTC (rev 696)
@@ -147,6 +147,19 @@
}
//-----------------------------------------------------------------------------
+// Quantize selected events.
+//-----------------------------------------------------------------------------
+//void JZEventWindow::Quantize()
+//{
+// if (AreEventsSelected())
+// {
+// tCmdQuantize QuantizeCommand(mpFilter, SnapClocks(), 0, 0);
+// QuantizeCommand.Execute(1);
+// JZProjectManager::Instance()->UpdateAllViews();
+// }
+//}
+
+//-----------------------------------------------------------------------------
// Description:
// Only consider the event portion of the window when computing the virtual
// size. Do not consider the static information of the left or top portion of
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2009-01-20 15:03:32 UTC (rev 695)
+++ trunk/jazz/src/EventWindow.h 2009-01-21 06:04:36 UTC (rev 696)
@@ -55,6 +55,8 @@
void Shift(int Units);
+// void Quantize();
+
void LineText(
wxDC& Dc,
int x,
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2009-01-20 15:03:32 UTC (rev 695)
+++ trunk/jazz/src/PianoFrame.cpp 2009-01-21 06:04:36 UTC (rev 696)
@@ -54,14 +54,11 @@
#define ACT_SETTINGS 5
#define MEN_FILTER 6
-#define MEN_SNAP 7
#define MEN_METERCH 8
#define ACT_HELP_MOUSE 9
-#define MEN_QUANTIZE 12
#define MEN_SETCHAN 14
#define MEN_TRANSP 15
-#define MEN_VELOC 16
#define MEN_LERI 18
#define MEN_UPDN 19
#define MEN_LENGTH 20
@@ -81,8 +78,6 @@
#define MEN_RESET 36
#define MEN_VIS_ALL_TRK 37
#define MEN_SEARCHREP 38
-#define MEN_SHIFTL 39
-#define MEN_SHIFTR 40
#define ACT_CLOSE 41
#define MEN_CTRL_TEMPO 42
@@ -110,10 +105,10 @@
{ ID_SNAP_16D, TRUE, note163_xpm, "snap 1/24"},
{ JZToolBar::eToolBarSeparator },
{ wxID_CUT, FALSE, cut_xpm, "cut selection"},
- { wxID_DELETE, FALSE, delete_xpm, "delete selection"},
- { MEN_QUANTIZE, FALSE, quantize_xpm, "quantize selection"},
- { MEN_SHIFTL, FALSE, shiftl_xpm, "shift selection left"},
- { MEN_SHIFTR, FALSE, shiftr_xpm, "shift selection right"},
+ { wxID_DELETE, FALSE, delete_xpm, "delete selection"},
+ { ID_QUANTIZE, FALSE, quantize_xpm, "quantize selection"},
+ { ID_SHIFT_LEFT, FALSE, shiftl_xpm, "shift selection left"},
+ { ID_SHIFT_RIGHT, FALSE, shiftr_xpm, "shift selection right"},
{ MEN_VIS_ALL_TRK, TRUE, evnts_xpm, "show events from all tracks"},
{ JZToolBar::eToolBarSeparator },
{ wxID_ZOOM_IN, FALSE, zoomin_xpm, "zoom in"},
@@ -174,11 +169,11 @@
EVT_MENU(wxID_CUT, JZPianoFrame::OnCut)
EVT_MENU(wxID_COPY, JZPianoFrame::OnCopy)
EVT_MENU(ID_SHIFT, JZPianoFrame::OnShift)
- EVT_MENU(MEN_SHIFTL, JZPianoFrame::OnShiftLeft)
- EVT_MENU(MEN_SHIFTR, JZPianoFrame::OnShiftRight)
+ EVT_MENU(ID_SHIFT_LEFT, JZPianoFrame::OnShiftLeft)
+ EVT_MENU(ID_SHIFT_RIGHT, JZPianoFrame::OnShiftRight)
EVT_MENU(MEN_LERI, JZPianoFrame::OnExchangeLeftRight)
EVT_MENU(MEN_UPDN, JZPianoFrame::OnExchangeUpDown)
- EVT_MENU(MEN_QUANTIZE, JZPianoFrame::OnQuantize)
+ EVT_MENU(ID_QUANTIZE, JZPianoFrame::OnQuantize)
EVT_MENU(wxID_UNDO, JZPianoFrame::OnUndo)
EVT_MENU(wxID_REDO, JZPianoFrame::OnRedo)
EVT_MENU(MEN_CTRL_PITCH, JZPianoFrame::OnCtrlPitch)
@@ -195,7 +190,7 @@
// EVT_MENU(MEN_SEARCHREP, JZPianoFrame::MenSearchReplace)
// EVT_MENU(MEN_TRANSP, JZPianoFrame::MenTranspose)
// EVT_MENU(MEN_SETCHAN, JZPianoFrame::MenSetChannel)
- EVT_MENU(MEN_VELOC, JZPianoFrame::OnActivateVelocityDialog)
+ EVT_MENU(ID_VELOCITY, JZPianoFrame::OnActivateVelocityDialog)
// EVT_MENU(MEN_LENGTH, JZPianoFrame::MenLength)
EVT_MENU(MEN_MIDIDELAY, JZPianoFrame::OnActivateMidiDelayDialog)
EVT_MENU(MEN_SEQLENGTH, JZPianoFrame::OnActivateSequenceLengthDialog)
@@ -203,7 +198,7 @@
// EVT_MENU(MEN_CONVERT_TO_MODULATION, JZPianoFrame::MenConvertToModulation)
EVT_MENU(ACT_SETTINGS, JZPianoFrame::OnActivateSettingsDialog)
EVT_MENU(MEN_FILTER, JZPianoFrame::OnFilter)
- EVT_MENU(MEN_SNAP, JZPianoFrame::OnSnapDlg)
+ EVT_MENU(ID_SNAP, JZPianoFrame::OnSnapDlg)
// These are all "Patrick Approved"
EVT_CLOSE(JZPianoFrame::ActCloseEvent)
@@ -336,10 +331,10 @@
edit_menu->Append(wxID_COPY, "&Copy");
edit_menu->Append(wxID_CUT, "&Cut");
edit_menu->Append(ID_SHIFT, "&Shift...");
- edit_menu->Append(MEN_QUANTIZE, "&Quantize...");
+ edit_menu->Append(ID_QUANTIZE, "&Quantize...");
edit_menu->Append(MEN_SETCHAN, "&Set MIDI Channel...");
edit_menu->Append(MEN_TRANSP, "&Transpose...");
- edit_menu->Append(MEN_VELOC, "&Velocity...");
+ edit_menu->Append(ID_VELOCITY, "&Velocity...");
edit_menu->Append(MEN_LENGTH, "&Length...");
edit_menu->Append(MEN_SEQLENGTH, "&Sequence Length...");
@@ -355,7 +350,7 @@
setting_menu->Append(MEN_FILTER, "&Filter...");
setting_menu->Append(ACT_SETTINGS, "&Window...");
setting_menu->Append(MEN_VISIBLE, "&Events...");
- setting_menu->Append(MEN_SNAP, "&Snap...");
+ setting_menu->Append(ID_SNAP, "&Snap...");
setting_menu->Append(MEN_METERCH, "&Meterchange...");
wxMenu *misc_menu = new wxMenu("",wxMENU_TEAROFF);
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2009-01-20 15:03:32 UTC (rev 695)
+++ trunk/jazz/src/Resources.h 2009-01-21 06:04:36 UTC (rev 696)
@@ -49,13 +49,15 @@
#define ID_SHIFT wxID_HIGHEST + 32
#define ID_SHIFT_LEFT wxID_HIGHEST + 33
#define ID_SHIFT_RIGHT wxID_HIGHEST + 34
-#define ID_SNAP_8 wxID_HIGHEST + 35
-#define ID_SNAP_8D wxID_HIGHEST + 36
-#define ID_SNAP_16 wxID_HIGHEST + 37
-#define ID_SNAP_16D wxID_HIGHEST + 38
-#define ID_MIXER wxID_HIGHEST + 39
-#define ID_PIANOWIN wxID_HIGHEST + 40
-#define ID_METRONOME_TOGGLE wxID_HIGHEST + 41
+#define ID_SNAP wxID_HIGHEST + 35
+#define ID_SNAP_8 wxID_HIGHEST + 36
+#define ID_SNAP_8D wxID_HIGHEST + 37
+#define ID_SNAP_16 wxID_HIGHEST + 38
+#define ID_SNAP_16D wxID_HIGHEST + 39
+#define ID_MIXER wxID_HIGHEST + 40
+#define ID_PIANOWIN wxID_HIGHEST + 41
+#define ID_METRONOME_TOGGLE wxID_HIGHEST + 42
+#define ID_VELOCITY wxID_HIGHEST + 43
#define ID_PLAY wxID_HIGHEST + 50
#define ID_PLAY_LOOP wxID_HIGHEST + 51
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2009-01-20 15:03:32 UTC (rev 695)
+++ trunk/jazz/src/TrackFrame.cpp 2009-01-21 06:04:36 UTC (rev 696)
@@ -238,10 +238,10 @@
mpEditMenu->AppendSeparator();
-// mpEditMenu->Append(MEN_QUANTIZE, "&Quantize...");
+// mpEditMenu->Append(ID_QUANTIZE, "&Quantize...");
// mpEditMenu->Append(MEN_SETCHAN, "&Set MIDI Channel...");
// mpEditMenu->Append(MEN_TRANSP, "&Transpose...");
-// mpEditMenu->Append(MEN_VELOC, "&Velocity...");
+// mpEditMenu->Append(ID_VELOCITY, "&Velocity...");
// mpEditMenu->Append(MEN_LENGTH, "&Length...");
mpEditMenu->Append(ID_SHIFT, "Shi&ft...");
// mpEditMenu->Append(MEN_CLEANUP, "C&leanup...");
@@ -293,7 +293,7 @@
mpFileMenu->AppendSeparator();
parts_menu = new wxMenu;
- parts_menu->Append(MEN_MIXER, "&Mixer...");
+ parts_menu->Append(ID_MIXER, "&Mixer...");
parts_menu->Append(MEN_MASTER, "Mas&ter...");
parts_menu->Append(MEN_SOUND, "&Sound...");
parts_menu->Append(MEN_VIBRATO, "&Vibrato...");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
