[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/commands/plugins/TraversoCommands ...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src/commands/plugins/TraversoCommands ... |
|
Date: |
Mon, 21 Jan 2008 16:26:09 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 08/01/21 16:26:09
Modified files:
src/commands/plugins/TraversoCommands: CMakeLists.txt
TraversoCommands.cpp
TraversoCommands.h
Log message:
zooming work
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h?cvsroot=traverso&r1=1.7&r2=1.8
Patches:
Index: CMakeLists.txt
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CMakeLists.txt 6 Nov 2007 18:25:16 -0000 1.2
+++ CMakeLists.txt 21 Jan 2008 16:26:09 -0000 1.3
@@ -1,7 +1,7 @@
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/common
${CMAKE_SOURCE_DIR}/src/core
-${CMAKE_SOURCE_DIR}/src/traverso/songcanvas
+${CMAKE_SOURCE_DIR}/src/sheetcanvas
${CMAKE_SOURCE_DIR}/src/commands
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/src/plugins/native
Index: TraversoCommands.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- TraversoCommands.cpp 2 Jan 2008 03:03:38 -0000 1.19
+++ TraversoCommands.cpp 21 Jan 2008 16:26:09 -0000 1.20
@@ -22,7 +22,7 @@
#include "TraversoCommands.h"
#include <libtraversocore.h>
-#include <libtraversosongcanvas.h>
+#include <libtraversosheetcanvas.h>
#include <commands.h>
@@ -53,6 +53,13 @@
m_dict.insert("ArmTracks", ArmTracksCommand);
m_dict.insert("MultiMove", MultiMoveCommand);
m_dict.insert("MultiMoveSingle", MultiMoveCommand);
+ m_dict.insert("VZoomIn", ZoomCommand);
+ m_dict.insert("VZoomOut", ZoomCommand);
+ m_dict.insert("HZoomIn", ZoomCommand);
+ m_dict.insert("HZoomOut", ZoomCommand);
+ m_dict.insert("HJogZoom", ZoomCommand);
+ m_dict.insert("VJogZoom", ZoomCommand);
+ m_dict.insert("JogZoom", ZoomCommand);
}
Command* TraversoCommands::create(QObject* obj, const QString& command,
QVariantList arguments)
@@ -61,27 +68,27 @@
case GainCommand:
{
ContextItem* item = qobject_cast<ContextItem*>(obj);
- SongView* songview = 0;
+ SheetView* sheetview = 0;
if (item->metaObject()->className() ==
QString("TrackPanelGain")) {
item = item->get_context();
- } else if (item->metaObject()->className() ==
QString("SongPanelGain")) {
+ } else if (item->metaObject()->className() ==
QString("SheetPanelGain")) {
item = item->get_context();
} else if (AudioClipView* view =
qobject_cast<AudioClipView*>(item)) {
- songview = view->get_songview();
+ sheetview = view->get_sheetview();
item = view->get_context();
} else if (TrackView* view =
qobject_cast<TrackView*>(item)) {
- songview = view->get_songview();
+ sheetview = view->get_sheetview();
item = view->get_context();
- } else if (SongView* view =
qobject_cast<SongView*>(item)) {
- songview = view;
+ } else if (SheetView* view =
qobject_cast<SheetView*>(item)) {
+ sheetview = view;
item = view->get_context();
}
- // ugly hack to avoid assigning a songview when the
+ // ugly hack to avoid assigning a sheetview when the
// mouse cursor is above the trackpanel....
if (cpointer().scene_x() < 0) {
- songview = 0;
+ sheetview = 0;
}
if (!item) {
@@ -89,7 +96,7 @@
"GainCommand only works with
ContextItem objects!!");
return 0;
}
- return new Gain(item, songview, arguments);
+ return new Gain(item, sheetview, arguments);
}
case TrackPanCommand:
@@ -132,13 +139,13 @@
case AddNewTrackCommand:
{
- Song* song = qobject_cast<Song*>(obj);
- if (!song) {
- PERROR("TraversoCommands: Supplied QObject was
not a Song! "
- "AddNewTrackCommand needs a Song as
argument");
+ Sheet* sheet = qobject_cast<Sheet*>(obj);
+ if (!sheet) {
+ PERROR("TraversoCommands: Supplied QObject was
not a Sheet! "
+ "AddNewTrackCommand needs a Sheet as
argument");
return 0;
}
- return song->add_track(new Track(song, "Unnamed",
Track::INITIAL_HEIGHT));
+ return sheet->add_track(new Track(sheet, "Unnamed",
Track::INITIAL_HEIGHT));
}
case RemoveClipCommand:
@@ -160,7 +167,7 @@
"RemoveTrackCommand needs a Track as
argument");
return 0;
}
- return track->get_song()->remove_track(track);
+ return track->get_sheet()->remove_track(track);
}
case AudioClipExternalProcessingCommand:
@@ -227,13 +234,13 @@
if (anchorAudio) {
return new MoveClip(view,
"anchored_left_edge_move");
} else {
- return new MoveEdge(view,
view->get_songview(), "set_left_edge");
+ return new MoveEdge(view,
view->get_sheetview(), "set_left_edge");
}
} else {
if (anchorAudio) {
return new MoveClip(view,
"anchored_right_edge_move");
} else {
- return new MoveEdge(view,
view->get_songview(), "set_right_edge");
+ return new MoveEdge(view,
view->get_sheetview(), "set_right_edge");
}
}
}
@@ -261,13 +268,13 @@
if (anchorAudio) {
return new MoveClip(view,
"anchored_left_edge_move");
} else {
- return new MoveEdge(view,
view->get_songview(), "set_left_edge");
+ return new MoveEdge(view,
view->get_sheetview(), "set_left_edge");
}
} else if (x > (view->boundingRect().width() -
edge_width)) {
if (anchorAudio) {
return new MoveClip(view,
"anchored_right_edge_move");
} else {
- return new MoveEdge(view,
view->get_songview(), "set_right_edge");
+ return new MoveEdge(view,
view->get_sheetview(), "set_right_edge");
}
}
return new MoveClip(view, "move");
@@ -286,10 +293,10 @@
case ArmTracksCommand:
{
- SongView* view = qobject_cast<SongView*>(obj);
+ SheetView* view = qobject_cast<SheetView*>(obj);
if (!view) {
- PERROR("TraversoCommands: Supplied QObject was
not an SongView! "
- "ArmTracksCommand needs an
SongView as argument");
+ PERROR("TraversoCommands: Supplied QObject was
not an SheetView! "
+ "ArmTracksCommand needs an
SheetView as argument");
return 0;
}
return new ArmTracks(view);
@@ -297,7 +304,7 @@
case MultiMoveCommand:
{
- SongView* view = qobject_cast<SongView*>(obj);
+ SheetView* view = qobject_cast<SheetView*>(obj);
bool allTracks = true;
if (arguments.size()) {
@@ -305,12 +312,22 @@
}
if (!view) {
- PERROR("TraversoCommands: Supplied QObject was
not a SongView! "
- "MultiMoveCommand needs a SongView as
argument");
+ PERROR("TraversoCommands: Supplied QObject was
not a SheetView! "
+ "MultiMoveCommand needs a SheetView as
argument");
return 0;
}
return new MultiMove(view, allTracks);
}
+ case ZoomCommand:
+ {
+ SheetView* view = qobject_cast<SheetView*>(obj);
+ if (!view) {
+ PERROR("TraversoCommands: Supplied QObject was
not an SheetView! "
+ "ArmTracksCommand needs an
SheetView as argument");
+ return 0;
+ }
+ return new Zoom(view, arguments);
+ }
}
return 0;
Index: TraversoCommands.h
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/TraversoCommands.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- TraversoCommands.h 2 Jan 2008 03:03:38 -0000 1.7
+++ TraversoCommands.h 21 Jan 2008 16:26:09 -0000 1.8
@@ -49,6 +49,13 @@
Q_CLASSINFO("ArmTracks", tr("Arm Tracks"))
Q_CLASSINFO("MultiMove", tr("Fold Sheet"))
Q_CLASSINFO("MultiMoveSingle", tr("Fold Track"))
+ Q_CLASSINFO("VZoomIn", tr("Vertical In"))
+ Q_CLASSINFO("HZoomOut", tr("Horizontal Out"))
+ Q_CLASSINFO("HZoomIn", tr("Horizontal In"))
+ Q_CLASSINFO("VZoomOut", tr("Vertical Out"))
+ Q_CLASSINFO("Zoom", tr("Omnidirectional"))
+ Q_CLASSINFO("HJogZoom", tr("Horizontal"))
+ Q_CLASSINFO("VJogZoom", tr("Vertical"))
public:
TraversoCommands();
@@ -70,7 +77,8 @@
MoveClipOrEdgeCommand,
SplitClipCommand,
ArmTracksCommand,
- MultiMoveCommand
+ MultiMoveCommand,
+ ZoomCommand,
};
};