[longomatch] Rename more categories to EventType and plays to Event
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Rename more categories to EventType and plays to Event
- Date: Wed, 24 Sep 2014 20:24:04 +0000 (UTC)
commit e45803c72ba6c444a3220adc05cee371e442160a
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Fri Sep 5 17:44:23 2014 +0200
Rename more categories to EventType and plays to Event
LongoMatch.Core/Common/EventsBroker.cs | 62 +++++-----
.../Common/{PlaysFilter.cs => EventsFilter.cs} | 10 +-
LongoMatch.Core/Handlers/Handlers.cs | 133 ++++++++------------
LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs | 2 +-
LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs | 2 +-
LongoMatch.Core/Interfaces/ISubCategory.cs | 36 ------
LongoMatch.Core/Interfaces/ITag.cs | 29 -----
LongoMatch.Core/LongoMatch.Core.mdp | 2 +-
LongoMatch.Core/Makefile.am | 2 +-
LongoMatch.Core/Stats/ProjectStats.cs | 4 +-
LongoMatch.Drawing/Widgets/CategoriesLabels.cs | 4 +-
LongoMatch.Drawing/Widgets/DashboardCanvas.cs | 6 +-
LongoMatch.Drawing/Widgets/PlaysTimeline.cs | 6 +-
LongoMatch.Drawing/Widgets/PositionTagger.cs | 2 +-
LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs | 2 +-
LongoMatch.GUI/Gui/Component/AnalysisComponent.cs | 2 +-
LongoMatch.GUI/Gui/Component/CodingWidget.cs | 8 +-
LongoMatch.GUI/Gui/Component/DashboardWidget.cs | 2 +-
LongoMatch.GUI/Gui/Component/NotesWidget.cs | 4 +-
.../Gui/Component/PlayersListTreeWidget.cs | 2 +-
.../Gui/Component/PlaysListTreeWidget.cs | 6 +-
.../Gui/Component/PlaysPositionViewer.cs | 4 +-
.../Gui/Component/PlaysSelectionWidget.cs | 4 +-
.../Gui/Component/Stats/PlayersViewer.cs | 4 +-
LongoMatch.GUI/Gui/Component/Timeline.cs | 2 +-
LongoMatch.GUI/Gui/GUIToolkit.cs | 2 +-
LongoMatch.GUI/Gui/MainWindow.cs | 2 +-
LongoMatch.GUI/Gui/Menu/PlaysMenu.cs | 6 +-
.../Gui/TreeView/CategoriesFilterTreeView.cs | 4 +-
LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs | 4 +-
LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs | 6 +-
.../Gui/TreeView/PlayersFilterTreeView.cs | 2 +-
LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs | 2 +-
LongoMatch.Services/Services/EventsManager.cs | 14 +-
LongoMatch.Services/Services/HotKeysManager.cs | 2 +-
LongoMatch.Services/Services/PlaylistManager.cs | 8 +-
LongoMatch.Services/Services/ProjectsManager.cs | 4 +-
Tests/Core/TestPlaysFilter.cs | 30 +++---
38 files changed, 166 insertions(+), 260 deletions(-)
---
diff --git a/LongoMatch.Core/Common/EventsBroker.cs b/LongoMatch.Core/Common/EventsBroker.cs
index 3e89e1c..06d3196 100644
--- a/LongoMatch.Core/Common/EventsBroker.cs
+++ b/LongoMatch.Core/Common/EventsBroker.cs
@@ -28,16 +28,16 @@ namespace LongoMatch.Core.Common
public class EventsBroker
{
- public event NewTagHandler NewTagEvent;
- public event NewPlayHandler NewPlayEvent;
- public event PlaysDeletedHandler PlaysDeleted;
- public event LoadPlayHandler LoadPlayEvent;
- public event PlayLoadedHandler PlayLoadedEvent;
- public event PlayCategoryChangedHandler PlayCategoryChanged;
+ public event NewEventHandler NewTagEvent;
+ public event NewTimelineEventHandler NewTimelineEventEvent;
+ public event DeleteEventsHandler EventsDeletedEvent;
+ public event LoadEventHandler LoadEventEvent;
+ public event EventLoadedHandler EventLoadedEvent;
+ public event MoveEventHandler MoveToEventTypeEvent;
public event TimeNodeChangedHandler TimeNodeChanged;
public event SnapshotSeriesHandler SnapshotSeries;
- public event TagPlayHandler TagPlay;
- public event DuplicatePlaysHandler DuplicatePlays;
+ public event TagEventHandler TagEventEvent;
+ public event DuplicateEventsHandler DuplicateEventsEvent;
public event TeamsTagsChangedHandler TeamTagsChanged;
/* Playlist */
@@ -68,7 +68,7 @@ namespace LongoMatch.Core.Common
public event QuitApplicationHandler QuitApplicationEvent;
public event ManageJobsHandler ManageJobsEvent;
public event ManageTeamsHandler ManageTeamsEvent;
- public event ManageCategoriesHandler ManageCategoriesEvent;
+ public event ManageDashboardsHandler ManageCategoriesEvent;
public event ManageProjects ManageProjectsEvent;
public event ManageDatabases ManageDatabasesEvent;
public event EditPreferences EditPreferencesEvent;
@@ -94,27 +94,27 @@ namespace LongoMatch.Core.Common
NewTagEvent (eventType, players, tags, start, stop, score, card);
}
- public void EmitNewPlay (TimelineEvent play) {
- if (NewPlayEvent != null)
- NewPlayEvent (play);
+ public void EmitNewEvent (TimelineEvent evt) {
+ if (NewTimelineEventEvent != null)
+ NewTimelineEventEvent (evt);
}
- public void EmitPlaysDeleted(List<TimelineEvent> plays)
+ public void EmitEventsDeleted(List<TimelineEvent> events)
{
- if (PlaysDeleted != null)
- PlaysDeleted(plays);
+ if (EventsDeletedEvent != null)
+ EventsDeletedEvent(events);
}
- public void EmitLoadPlay (TimelineEvent play)
+ public void EmitLoadEvent (TimelineEvent evt)
{
- if (LoadPlayEvent != null)
- LoadPlayEvent (play);
+ if (LoadEventEvent != null)
+ LoadEventEvent (evt);
}
- public void EmitPlayLoaded (TimelineEvent play)
+ public void EmitEventLoaded (TimelineEvent play)
{
- if (PlayLoadedEvent != null)
- PlayLoadedEvent (play);
+ if (EventLoadedEvent != null)
+ EventLoadedEvent (play);
}
public void EmitSnapshotSeries(TimelineEvent play)
@@ -153,21 +153,21 @@ namespace LongoMatch.Core.Common
TimeNodeChanged(tn, val);
}
- public virtual void EmitPlayCategoryChanged(TimelineEvent play, EventType cat)
+ public virtual void EmitMoveToEventType(TimelineEvent evnt, EventType eventType)
{
- if(PlayCategoryChanged != null)
- PlayCategoryChanged(play, cat);
+ if(MoveToEventTypeEvent != null)
+ MoveToEventTypeEvent(evnt, eventType);
}
- public void EmitTagPlay(TimelineEvent play) {
- if (TagPlay != null)
- TagPlay (play);
+ public void EmitTagEvent(TimelineEvent evt) {
+ if (TagEventEvent != null)
+ TagEventEvent (evt);
}
- public void EmitDuplicatePlay (List<TimelineEvent> plays)
+ public void EmitDuplicateEvent (List<TimelineEvent> events)
{
- if (DuplicatePlays != null)
- DuplicatePlays (plays);
+ if (DuplicateEventsEvent != null)
+ DuplicateEventsEvent (events);
}
public void EmitKeyPressed(object sender, int key, int modifier) {
@@ -280,7 +280,7 @@ namespace LongoMatch.Core.Common
}
public void EmitOpenedProjectChanged (Project project, ProjectType projectType,
- PlaysFilter filter, IAnalysisWindow analysisWindow)
+ EventsFilter filter, IAnalysisWindow analysisWindow)
{
if (OpenedProjectChanged != null) {
OpenedProjectChanged (project, projectType, filter, analysisWindow);
diff --git a/LongoMatch.Core/Common/PlaysFilter.cs b/LongoMatch.Core/Common/EventsFilter.cs
similarity index 95%
rename from LongoMatch.Core/Common/PlaysFilter.cs
rename to LongoMatch.Core/Common/EventsFilter.cs
index 362ed94..051f83f 100644
--- a/LongoMatch.Core/Common/PlaysFilter.cs
+++ b/LongoMatch.Core/Common/EventsFilter.cs
@@ -24,7 +24,7 @@ using LongoMatch.Core.Store;
namespace LongoMatch.Core.Common
{
- public class PlaysFilter
+ public class EventsFilter
{
public event FilterUpdatedHandler FilterUpdated;
@@ -33,7 +33,7 @@ namespace LongoMatch.Core.Common
List<Player> playersFilter;
Project project;
- public PlaysFilter (Project project)
+ public EventsFilter (Project project)
{
this.project = project;
eventsFilter = new Dictionary<EventType, List<Tag>>();
@@ -57,7 +57,7 @@ namespace LongoMatch.Core.Common
protected set;
}
- public void ClearCategoriesFilter (bool update=true) {
+ public void ClearEventTypesFilter (bool update=true) {
eventsFilter.Clear();
if (update)
Update ();
@@ -70,7 +70,7 @@ namespace LongoMatch.Core.Common
}
public void ClearAll (bool update=true) {
- ClearCategoriesFilter(false);
+ ClearEventTypesFilter(false);
ClearPlayersFilter(false);
if (update)
Update ();
@@ -98,7 +98,7 @@ namespace LongoMatch.Core.Common
Update();
}
- public void FilterCategoryTag (EventType evType, Tag tag, bool visible) {
+ public void FilterEventTag (EventType evType, Tag tag, bool visible) {
List<Tag> tags;
if (visible) {
diff --git a/LongoMatch.Core/Handlers/Handlers.cs b/LongoMatch.Core/Handlers/Handlers.cs
index 7c02ac3..642e824 100644
--- a/LongoMatch.Core/Handlers/Handlers.cs
+++ b/LongoMatch.Core/Handlers/Handlers.cs
@@ -17,7 +17,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
//
//
-
using System;
using System.Collections.Generic;
using LongoMatch.Core.Common;
@@ -30,130 +29,102 @@ using LongoMatch.Core.Store.Templates;
namespace LongoMatch.Core.Handlers
{
-
- /*Tagging Events*/
- /* A Play needs to be loaded */
- public delegate void LoadPlayHandler(TimelineEvent play);
- /* A Play was loaded */
- public delegate void PlayLoadedHandler(TimelineEvent play);
+ /* An events needs to be loaded */
+ public delegate void LoadEventHandler (TimelineEvent evt);
+ /* An event was loaded */
+ public delegate void EventLoadedHandler (TimelineEvent evt);
/* A new play needs to be create for a specific category at the current play time */
- public delegate void NewTagHandler (EventType eventType, List<Player> players,
- List<Tag> tags, Time start, Time stop, Score score,
- PenaltyCard card);
+ public delegate void NewEventHandler (EventType eventType,List<Player> players,
+ List<Tag> tags,Time start,Time stop,Score score,
+ PenaltyCard card);
/* Add a new play to the current project */
- public delegate void NewPlayHandler (TimelineEvent play);
- //A play was edited
- public delegate void TimeNodeChangedHandler(TimeNode tNode, object val);
- public delegate void CategoryChangedHandler(EventType cat);
-
+ public delegate void NewTimelineEventHandler (TimelineEvent evt);
+ /* An event was edited */
+ public delegate void TimeNodeChangedHandler (TimeNode tNode,object val);
+ /* Edit EventType properties */
+ public delegate void EditEventTypeHandler (EventType cat);
/* A list of plays needs to be deleted */
- public delegate void PlaysDeletedHandler(List<TimelineEvent> plays);
+ public delegate void DeleteEventsHandler (List<TimelineEvent> events);
/* Tag a play */
- public delegate void TagPlayHandler(TimelineEvent play);
+ public delegate void TagEventHandler (TimelineEvent evt);
/* Change the Play's category */
- public delegate void PlayCategoryChangedHandler(TimelineEvent play, EventType cat);
- /* DUplicate play */
- public delegate void DuplicatePlaysHandler (List<TimelineEvent> plays);
- /* Category Selected */
- public delegate void TaggersSelectedHandler (List<DashboardButton> taggerbuttons);
- public delegate void TaggerSelectedHandler (DashboardButton taggerbutton);
- public delegate void ShowButtonsTaggerMenuHandler (DashboardButton taggerbutton, Tag tag);
-
- /* Penalty Card */
- public delegate void PenaltyCardHandler (PenaltyCard card);
- /* Score */
- public delegate void ScoreHandler (Score score);
-
+ public delegate void MoveEventHandler (TimelineEvent play,EventType eventType);
+ /* Duplicate play */
+ public delegate void DuplicateEventsHandler (List<TimelineEvent> events);
+ /* Dashboard buttons selected */
+ public delegate void ButtonsSelectedHandlers (List<DashboardButton> taggerbuttons);
+ public delegate void ButtonSelectedHandler (DashboardButton taggerbutton);
+ /* Show dashborad menu */
+ public delegate void ShowButtonsTaggerMenuHandler (DashboardButton taggerbutton,Tag tag);
+ /* The players tagged in an event have changed */
public delegate void TeamsTagsChangedHandler ();
-
/* Project Events */
- public delegate void SaveProjectHandler(Project project, ProjectType projectType);
- public delegate void OpenedProjectChangedHandler(Project project, ProjectType projectType,
PlaysFilter filter,
+ public delegate void SaveProjectHandler (Project project,ProjectType projectType);
+ public delegate void OpenedProjectChangedHandler (Project project,ProjectType
projectType,EventsFilter filter,
IAnalysisWindow analysisWindow);
- public delegate void OpenProjectIDHandler(Guid project_id);
- public delegate void OpenProjectHandler();
- public delegate void CloseOpenendProjectHandler();
- public delegate void NewProjectHandler(Project project);
- public delegate void OpenNewProjectHandler(Project project, ProjectType projectType, CaptureSettings
captureSettings);
+ public delegate void OpenProjectIDHandler (Guid project_id);
+ public delegate void OpenProjectHandler ();
+ public delegate void CloseOpenendProjectHandler ();
+ public delegate void NewProjectHandler (Project project);
+ public delegate void OpenNewProjectHandler (Project project,ProjectType projectType,CaptureSettings
captureSettings);
public delegate void ImportProjectHandler ();
public delegate void ExportProjectHandler (Project project);
public delegate void QuitApplicationHandler ();
public delegate void CreateThumbnailsHandler (Project project);
-
/* GUI */
- public delegate void ManageJobsHandler();
- public delegate void ManageTeamsHandler();
- public delegate void ManageCategoriesHandler();
- public delegate void ManageProjects();
- public delegate void ManageDatabases();
- public delegate void EditPreferences();
-
-
+ public delegate void ManageJobsHandler ();
+ public delegate void ManageTeamsHandler ();
+ public delegate void ManageDashboardsHandler ();
+ public delegate void ManageProjects ();
+ public delegate void ManageDatabases ();
+ public delegate void EditPreferences ();
/*Playlist Events*/
/* Create a new playlist */
public delegate Playlist NewPlaylistHandler (Project project);
/* Add a new rendering job */
- public delegate void RenderPlaylistHandler(Playlist playlist);
+ public delegate void RenderPlaylistHandler (Playlist playlist);
/* A play list element is selected */
- public delegate void PlaylistElementSelectedHandler (Playlist playlist, IPlaylistElement element);
+ public delegate void PlaylistElementSelectedHandler (Playlist playlist,IPlaylistElement element);
/* Add a play to a playlist */
- public delegate void AddPlaylistElementHandler (Playlist playlist, List<IPlaylistElement> element);
+ public delegate void AddPlaylistElementHandler (Playlist playlist,List<IPlaylistElement> element);
/* Play next playlist element */
public delegate void NextPlaylistElementHandler (Playlist playlist);
/* Play previous playlist element */
public delegate void PreviousPlaylistElementHandler (Playlist playlist);
/* Playlists have been edited */
public delegate void PlaylistsChangedHandler (object sender);
-
/* Create snapshots for a play */
- public delegate void SnapshotSeriesHandler(TimelineEvent tNode);
-
+ public delegate void SnapshotSeriesHandler (TimelineEvent tNode);
/* Convert a video file */
- public delegate void ConvertVideoFilesHandler (List<MediaFile> inputFiles, EncodingSettings
encSettings);
-
+ public delegate void ConvertVideoFilesHandler (List<MediaFile> inputFiles,EncodingSettings
encSettings);
/* A date was selected */
- public delegate void DateSelectedHandler(DateTime selectedDate);
-
+ public delegate void DateSelectedHandler (DateTime selectedDate);
/* A new version of the software exists */
- public delegate void NewVersionHandler(Version version, string URL);
-
- /* Edit Category */
- public delegate void CategoryHandler(DashboardButton button);
- public delegate void CategoriesHandler(List<DashboardButton> buttonsList);
-
+ public delegate void NewVersionHandler (Version version,string URL);
/* Edit player properties */
- public delegate void PlayerPropertiesHandler(Player player);
- public delegate void PlayersPropertiesHandler(List<Player> players);
-
+ public delegate void PlayerPropertiesHandler (Player player);
+ public delegate void PlayersPropertiesHandler (List<Player> players);
/* Players selection */
- public delegate void PlayersSubstitutionHandler (Player p1, Player p2, TeamTemplate team);
+ public delegate void PlayersSubstitutionHandler (Player p1,Player p2,TeamTemplate team);
public delegate void PlayersSelectionChangedHandler (List<Player> players);
-
/* A list of projects have been selected */
- public delegate void ProjectsSelectedHandler(List<ProjectDescription> projects);
- public delegate void ProjectSelectedHandler(ProjectDescription project);
-
- public delegate void KeyHandler (object sender, int key, int modifier);
-
- /* The plays filter was updated */
+ public delegate void ProjectsSelectedHandler (List<ProjectDescription> projects);
+ public delegate void ProjectSelectedHandler (ProjectDescription project);
+ public delegate void KeyHandler (object sender,int key,int modifier);
+ /* The plays filter was updated */
public delegate void FilterUpdatedHandler ();
-
public delegate void DetachPlayerHandler ();
-
/* Show project stats */
- public delegate void ShowProjectStats(Project project);
-
+ public delegate void ShowProjectStats (Project project);
public delegate void ShowFullScreenHandler (bool fullscreen);
public delegate void PlaylistVisibiltyHandler (bool visible);
public delegate void AnalysisWidgetsVisibilityHandler (bool visible);
public delegate void AnalysisModeChangedHandler (VideoAnalysisMode mode);
public delegate void TagSubcategoriesChangedHandler (bool tagsubcategories);
-
- public delegate void ShowTimelineMenuHandler (List<TimelineEvent> plays, EventType cat, Time time);
+ public delegate void ShowTimelineMenuHandler (List<TimelineEvent> plays,EventType cat,Time time);
public delegate void ShowTaggerMenuHandler (List<TimelineEvent> plays);
public delegate void ShowDrawToolMenuHandler (IBlackboardObject drawable);
public delegate void ConfigureDrawingObjectHandler (IBlackboardObject drawable);
public delegate void DrawableChangedHandler (IBlackboardObject drawable);
-
public delegate void BackEventHandle ();
}
diff --git a/LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs
b/LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs
index 9c2f499..193373c 100644
--- a/LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IAnalysisWindow.cs
@@ -27,7 +27,7 @@ namespace LongoMatch.Core.Interfaces.GUI
{
public interface IAnalysisWindow
{
- void SetProject(Project project, ProjectType projectType, CaptureSettings props, PlaysFilter
filter);
+ void SetProject(Project project, ProjectType projectType, CaptureSettings props, EventsFilter
filter);
void CloseOpenedProject ();
void AddPlay(TimelineEvent play);
void UpdateCategories ();
diff --git a/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs b/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
index ea828f1..29e4874 100644
--- a/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
+++ b/LongoMatch.Core/Interfaces/GUI/IGUIToolkit.cs
@@ -61,7 +61,7 @@ namespace LongoMatch.Core.Interfaces.GUI
void ExportFrameSeries(Project openenedProject, TimelineEvent play, string snapshotDir);
void OpenProject (Project project, ProjectType projectType,
- CaptureSettings props, PlaysFilter filter,
+ CaptureSettings props, EventsFilter filter,
out IAnalysisWindow analysisWindow);
void CloseProject ();
diff --git a/LongoMatch.Core/LongoMatch.Core.mdp b/LongoMatch.Core/LongoMatch.Core.mdp
index bc8ad56..8527449 100644
--- a/LongoMatch.Core/LongoMatch.Core.mdp
+++ b/LongoMatch.Core/LongoMatch.Core.mdp
@@ -78,7 +78,7 @@
<File subtype="Code" buildaction="Compile" name="Stats/PercentualStat.cs" />
<File subtype="Code" buildaction="Compile" name="Stats/Stat.cs" />
<File subtype="Code" buildaction="Compile" name="Stats/PlayersStats.cs" />
- <File subtype="Code" buildaction="Compile" name="Common/PlaysFilter.cs" />
+ <File subtype="Code" buildaction="Compile" name="Common/EventsFilter.cs" />
<File subtype="Code" buildaction="Compile" name="Interfaces/Multimedia/IRemuxer.cs" />
<File subtype="Code" buildaction="Compile" name="Interfaces/Multimedia/IVideoConverter.cs" />
<File subtype="Code" buildaction="Compile" name="Common/SysInfo.cs" />
diff --git a/LongoMatch.Core/Makefile.am b/LongoMatch.Core/Makefile.am
index 1b2fdbe..b3173d3 100644
--- a/LongoMatch.Core/Makefile.am
+++ b/LongoMatch.Core/Makefile.am
@@ -15,13 +15,13 @@ SOURCES = Common/Area.cs \
Common/EncodingSettings.cs \
Common/Enums.cs \
Common/EventsBroker.cs \
+ Common/EventsFilter.cs \
Common/Exceptions.cs \
Common/ExtensionMethods.cs \
Common/Gettext.cs \
Common/Image.cs \
Common/Job.cs \
Common/Log.cs \
- Common/PlaysFilter.cs \
Common/Serializer.cs \
Common/SysInfo.cs \
Common/VideoStandards.cs \
diff --git a/LongoMatch.Core/Stats/ProjectStats.cs b/LongoMatch.Core/Stats/ProjectStats.cs
index 350ab3e..962adf5 100644
--- a/LongoMatch.Core/Stats/ProjectStats.cs
+++ b/LongoMatch.Core/Stats/ProjectStats.cs
@@ -29,7 +29,7 @@ namespace LongoMatch.Core.Stats
public class ProjectStats: IDisposable
{
List<CategoryStats> catStats;
- PlaysFilter filter;
+ EventsFilter filter;
Project project;
public ProjectStats (Project project)
@@ -111,7 +111,7 @@ namespace LongoMatch.Core.Stats
}
}
- public PlaysFilter Filter {
+ public EventsFilter Filter {
set {
filter = value;
UpdateStats ();
diff --git a/LongoMatch.Drawing/Widgets/CategoriesLabels.cs b/LongoMatch.Drawing/Widgets/CategoriesLabels.cs
index f34bfd9..5eefcbf 100644
--- a/LongoMatch.Drawing/Widgets/CategoriesLabels.cs
+++ b/LongoMatch.Drawing/Widgets/CategoriesLabels.cs
@@ -28,7 +28,7 @@ namespace LongoMatch.Drawing.Widgets
public class CategoriesLabels: Canvas
{
Project project;
- PlaysFilter filter;
+ EventsFilter filter;
Dictionary<EventType, CategoryLabel> eventsLabels;
public CategoriesLabels (IWidget widget): base (widget)
@@ -45,7 +45,7 @@ namespace LongoMatch.Drawing.Widgets
}
}
- public void LoadProject (Project project, PlaysFilter filter)
+ public void LoadProject (Project project, EventsFilter filter)
{
ClearObjects ();
this.project = project;
diff --git a/LongoMatch.Drawing/Widgets/DashboardCanvas.cs b/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
index 24e3d9a..e08d57e 100644
--- a/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
+++ b/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
@@ -32,10 +32,10 @@ namespace LongoMatch.Drawing.Widgets
public class DashboardCanvas: SelectionCanvas
{
- public event TaggersSelectedHandler TaggersSelectedEvent;
- public event TaggerSelectedHandler AddNewTagEvent;
+ public event ButtonsSelectedHandlers TaggersSelectedEvent;
+ public event ButtonSelectedHandler AddNewTagEvent;
public event ShowButtonsTaggerMenuHandler ShowMenuEvent;
- public event NewTagHandler NewTagEvent;
+ public event NewEventHandler NewTagEvent;
LongoMatch.Core.Store.Templates.Dashboard template;
TagMode tagMode;
diff --git a/LongoMatch.Drawing/Widgets/PlaysTimeline.cs b/LongoMatch.Drawing/Widgets/PlaysTimeline.cs
index 62cb497..a50c328 100644
--- a/LongoMatch.Drawing/Widgets/PlaysTimeline.cs
+++ b/LongoMatch.Drawing/Widgets/PlaysTimeline.cs
@@ -33,7 +33,7 @@ namespace LongoMatch.Drawing.Widgets
public event ShowTimelineMenuHandler ShowMenuEvent;
Project project;
- PlaysFilter playsFilter;
+ EventsFilter playsFilter;
double secondsPerPixel;
Time duration;
Dictionary<EventType, CategoryTimeline> eventsTimelines;
@@ -54,7 +54,7 @@ namespace LongoMatch.Drawing.Widgets
base.Dispose (disposing);
}
- public void LoadProject (Project project, PlaysFilter filter)
+ public void LoadProject (Project project, EventsFilter filter)
{
int height;
@@ -171,7 +171,7 @@ namespace LongoMatch.Drawing.Widgets
{
if (selections.Count > 0) {
PlayObject po = selections.Last ().Drawable as PlayObject;
- Config.EventsBroker.EmitLoadPlay (po.Play);
+ Config.EventsBroker.EmitLoadEvent (po.Play);
}
}
diff --git a/LongoMatch.Drawing/Widgets/PositionTagger.cs b/LongoMatch.Drawing/Widgets/PositionTagger.cs
index 4846e5b..c688fba 100644
--- a/LongoMatch.Drawing/Widgets/PositionTagger.cs
+++ b/LongoMatch.Drawing/Widgets/PositionTagger.cs
@@ -118,7 +118,7 @@ namespace LongoMatch.Drawing.Widgets
TimelineEvent p = (selections.Last ().Drawable as PositionObject).Play;
playSelected = p;
if (EmitSignals) {
- Config.EventsBroker.EmitLoadPlay (p);
+ Config.EventsBroker.EmitLoadEvent (p);
}
}
}
diff --git a/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs b/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
index 49f298a..59a7517 100644
--- a/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
+++ b/LongoMatch.GUI.Multimedia/Gui/PlayerBin.cs
@@ -301,7 +301,7 @@ namespace LongoMatch.Gui
//timescale.Sensitive = true;
loadedPlay = null;
ImageLoaded = false;
- Config.EventsBroker.EmitLoadPlay (null);
+ Config.EventsBroker.EmitLoadEvent (null);
}
public void SetSensitive ()
diff --git a/LongoMatch.GUI/Gui/Component/AnalysisComponent.cs
b/LongoMatch.GUI/Gui/Component/AnalysisComponent.cs
index e68ebf3..38797d9 100644
--- a/LongoMatch.GUI/Gui/Component/AnalysisComponent.cs
+++ b/LongoMatch.GUI/Gui/Component/AnalysisComponent.cs
@@ -119,7 +119,7 @@ namespace LongoMatch.Gui.Component
ClearWidgets();
}
- public void SetProject(Project project, ProjectType projectType, CaptureSettings props,
PlaysFilter filter)
+ public void SetProject(Project project, ProjectType projectType, CaptureSettings props,
EventsFilter filter)
{
openedProject = project;
this.projectType = projectType;
diff --git a/LongoMatch.GUI/Gui/Component/CodingWidget.cs b/LongoMatch.GUI/Gui/Component/CodingWidget.cs
index 9d443d4..3a98e58 100644
--- a/LongoMatch.GUI/Gui/Component/CodingWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/CodingWidget.cs
@@ -71,7 +71,7 @@ namespace LongoMatch.Gui.Component
Config.EventsBroker.PlayerTick += HandleTick;
Config.EventsBroker.CapturerTick += HandleCapturerTick;
- Config.EventsBroker.PlayLoadedEvent += HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent += HandlePlayLoaded;
LongoMatch.Gui.Helpers.Misc.DisableFocus (this);
buttonswidget.Mode = TagMode.Free;
@@ -94,7 +94,7 @@ namespace LongoMatch.Gui.Component
}
Config.EventsBroker.PlayerTick -= HandleTick;
Config.EventsBroker.CapturerTick -= HandleCapturerTick;
- Config.EventsBroker.PlayLoadedEvent -= HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent -= HandlePlayLoaded;
buttonswidget.Destroy ();
timeline.Destroy ();
playspositionviewer1.Destroy ();
@@ -102,7 +102,7 @@ namespace LongoMatch.Gui.Component
base.OnDestroyed ();
}
- public void SetProject (Project project, ProjectType projectType, PlaysFilter filter)
+ public void SetProject (Project project, ProjectType projectType, EventsFilter filter)
{
this.projectType = projectType;
this.project = project;
@@ -255,7 +255,7 @@ namespace LongoMatch.Gui.Component
Config.GUIToolkit.EditPlay (play, project, false, true, false, false);
}
teamtagger.ResetSelection ();
- Config.EventsBroker.EmitNewPlay (play);
+ Config.EventsBroker.EmitNewEvent (play);
}
}
diff --git a/LongoMatch.GUI/Gui/Component/DashboardWidget.cs b/LongoMatch.GUI/Gui/Component/DashboardWidget.cs
index 34846f3..38abd13 100644
--- a/LongoMatch.GUI/Gui/Component/DashboardWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/DashboardWidget.cs
@@ -39,7 +39,7 @@ namespace LongoMatch.Gui.Component
[System.ComponentModel.ToolboxItem(true)]
public partial class DashboardWidget : Gtk.Bin
{
- public event NewTagHandler NewTagEvent;
+ public event NewEventHandler NewTagEvent;
TagMode tagMode;
DashboardCanvas tagger;
diff --git a/LongoMatch.GUI/Gui/Component/NotesWidget.cs b/LongoMatch.GUI/Gui/Component/NotesWidget.cs
index d2f4602..aedaf65 100644
--- a/LongoMatch.GUI/Gui/Component/NotesWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/NotesWidget.cs
@@ -38,12 +38,12 @@ namespace LongoMatch.Gui.Component
this.Build();
this.buf = textview1.Buffer;
buf.Changed += new EventHandler(OnEdition);
- Config.EventsBroker.PlayLoadedEvent += HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent += HandlePlayLoaded;
}
protected override void OnDestroyed ()
{
- Config.EventsBroker.PlayLoadedEvent -= HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent -= HandlePlayLoaded;
base.OnDestroyed ();
}
diff --git a/LongoMatch.GUI/Gui/Component/PlayersListTreeWidget.cs
b/LongoMatch.GUI/Gui/Component/PlayersListTreeWidget.cs
index 975523f..5bac965 100644
--- a/LongoMatch.GUI/Gui/Component/PlayersListTreeWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/PlayersListTreeWidget.cs
@@ -51,7 +51,7 @@ namespace LongoMatch.Gui.Component
}
}
- public PlaysFilter Filter {
+ public EventsFilter Filter {
set{
playerstreeview.Filter = value;
}
diff --git a/LongoMatch.GUI/Gui/Component/PlaysListTreeWidget.cs
b/LongoMatch.GUI/Gui/Component/PlaysListTreeWidget.cs
index c053db7..88dd4e9 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysListTreeWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysListTreeWidget.cs
@@ -44,16 +44,16 @@ namespace LongoMatch.Gui.Component
treeview.EditProperties += OnEditProperties;
treeview.NewRenderingJob += OnNewRenderingJob;
itersDic = new Dictionary<EventType, TreeIter> ();
- Config.EventsBroker.PlayLoadedEvent += HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent += HandlePlayLoaded;
}
protected override void OnDestroyed ()
{
- Config.EventsBroker.PlayLoadedEvent -= HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent -= HandlePlayLoaded;
base.OnDestroyed ();
}
- public PlaysFilter Filter {
+ public EventsFilter Filter {
set{
treeview.Filter = value;
}
diff --git a/LongoMatch.GUI/Gui/Component/PlaysPositionViewer.cs
b/LongoMatch.GUI/Gui/Component/PlaysPositionViewer.cs
index 3df4591..0c69d07 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysPositionViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysPositionViewer.cs
@@ -39,7 +39,7 @@ namespace LongoMatch.Gui.Component
field.Tagger.ShowMenuEvent += HandleShowMenuEvent;
hfield.Tagger.ShowMenuEvent += HandleShowMenuEvent;
goal.Tagger.ShowMenuEvent += HandleShowMenuEvent;
- Config.EventsBroker.PlayLoadedEvent += HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent += HandlePlayLoaded;
menu = new PlaysMenu ();
}
@@ -95,7 +95,7 @@ namespace LongoMatch.Gui.Component
field.Destroy ();
hfield.Destroy ();
goal.Destroy ();
- Config.EventsBroker.PlayLoadedEvent -= HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent -= HandlePlayLoaded;
base.OnDestroyed ();
}
}
diff --git a/LongoMatch.GUI/Gui/Component/PlaysSelectionWidget.cs
b/LongoMatch.GUI/Gui/Component/PlaysSelectionWidget.cs
index 346c0db..80082a1 100644
--- a/LongoMatch.GUI/Gui/Component/PlaysSelectionWidget.cs
+++ b/LongoMatch.GUI/Gui/Component/PlaysSelectionWidget.cs
@@ -34,7 +34,7 @@ namespace LongoMatch.Gui.Component
{
Project project;
- PlaysFilter filter;
+ EventsFilter filter;
PlayersFilterTreeView playersfilter;
CategoriesFilterTreeView categoriesfilter;
Pixbuf listIco, listActiveIco;
@@ -75,7 +75,7 @@ namespace LongoMatch.Gui.Component
#region Plubic Methods
- public void SetProject(Project project, PlaysFilter filter) {
+ public void SetProject(Project project, EventsFilter filter) {
this.project = project;
this.filter = filter;
playsList.Filter = filter;
diff --git a/LongoMatch.GUI/Gui/Component/Stats/PlayersViewer.cs
b/LongoMatch.GUI/Gui/Component/Stats/PlayersViewer.cs
index 03e1c5c..95838a8 100644
--- a/LongoMatch.GUI/Gui/Component/Stats/PlayersViewer.cs
+++ b/LongoMatch.GUI/Gui/Component/Stats/PlayersViewer.cs
@@ -31,7 +31,7 @@ namespace LongoMatch.Gui.Component.Stats
{
TreeStore store;
ProjectStats pstats;
- PlaysFilter filter;
+ EventsFilter filter;
Player current;
public PlayersViewer ()
@@ -51,7 +51,7 @@ namespace LongoMatch.Gui.Component.Stats
store.Clear();
pstats = stats;
- filter = new PlaysFilter (project);
+ filter = new EventsFilter (project);
pstats.Filter = filter;
categoriesviewer.LoadStats (pstats, project);
AddTeam (project.LocalTeamTemplate, project.Dashboard);
diff --git a/LongoMatch.GUI/Gui/Component/Timeline.cs b/LongoMatch.GUI/Gui/Component/Timeline.cs
index 67bafdf..08fb8fd 100644
--- a/LongoMatch.GUI/Gui/Component/Timeline.cs
+++ b/LongoMatch.GUI/Gui/Component/Timeline.cs
@@ -88,7 +88,7 @@ namespace LongoMatch.Gui.Component
}
}
- public void SetProject (Project project, PlaysFilter filter) {
+ public void SetProject (Project project, EventsFilter filter) {
this.project = project;
timeline.LoadProject (project, filter);
labels.LoadProject (project, filter);
diff --git a/LongoMatch.GUI/Gui/GUIToolkit.cs b/LongoMatch.GUI/Gui/GUIToolkit.cs
index e52087b..3491562 100644
--- a/LongoMatch.GUI/Gui/GUIToolkit.cs
+++ b/LongoMatch.GUI/Gui/GUIToolkit.cs
@@ -333,7 +333,7 @@ namespace LongoMatch.Gui
}
public void OpenProject (Project project, ProjectType projectType,
- CaptureSettings props, PlaysFilter filter,
+ CaptureSettings props, EventsFilter filter,
out IAnalysisWindow analysisWindow)
{
Log.Information ("Open project");
diff --git a/LongoMatch.GUI/Gui/MainWindow.cs b/LongoMatch.GUI/Gui/MainWindow.cs
index 1583d8b..71b0be8 100644
--- a/LongoMatch.GUI/Gui/MainWindow.cs
+++ b/LongoMatch.GUI/Gui/MainWindow.cs
@@ -105,7 +105,7 @@ namespace LongoMatch.Gui
(parent.Submenu as Menu).Append(item);
}
- public IAnalysisWindow SetProject(Project project, ProjectType projectType, CaptureSettings
props, PlaysFilter filter)
+ public IAnalysisWindow SetProject(Project project, ProjectType projectType, CaptureSettings
props, EventsFilter filter)
{
ExportProjectAction1.Sensitive = true;
diff --git a/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs b/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
index cece4c8..fbcab43 100644
--- a/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
+++ b/LongoMatch.GUI/Gui/Menu/PlaysMenu.cs
@@ -104,7 +104,7 @@ namespace LongoMatch.Gui.Menus
var item = new MenuItem (c.Name);
catMenu.Append (item);
item.Activated += (sender, e) => {
- Config.EventsBroker.EmitPlayCategoryChanged (plays [0], c);
+ Config.EventsBroker.EmitMoveToEventType (plays [0], c);
};
}
catMenu.ShowAll ();
@@ -183,11 +183,11 @@ namespace LongoMatch.Gui.Menus
Add (moveCat);
del = new MenuItem ("");
- del.Activated += (sender, e) => Config.EventsBroker.EmitPlaysDeleted (plays);
+ del.Activated += (sender, e) => Config.EventsBroker.EmitEventsDeleted (plays);
Add (del);
duplicate = new MenuItem ("");
- duplicate.Activated += (sender, e) => Config.EventsBroker.EmitDuplicatePlay (plays);
+ duplicate.Activated += (sender, e) => Config.EventsBroker.EmitDuplicateEvent (plays);
Add (duplicate);
drawings = new MenuItem (Catalog.GetString ("Drawings"));
diff --git a/LongoMatch.GUI/Gui/TreeView/CategoriesFilterTreeView.cs
b/LongoMatch.GUI/Gui/TreeView/CategoriesFilterTreeView.cs
index 33a8c21..6a60e72 100644
--- a/LongoMatch.GUI/Gui/TreeView/CategoriesFilterTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/CategoriesFilterTreeView.cs
@@ -40,7 +40,7 @@ namespace LongoMatch.Gui.Component
HeadersVisible = false;
}
- public override void SetFilter (PlaysFilter filter, Project project) {
+ public override void SetFilter (EventsFilter filter, Project project) {
this.project = project;
this.categories = project.Dashboard;
base.SetFilter(filter, project);
@@ -72,7 +72,7 @@ namespace LongoMatch.Gui.Component
if (o is Tag) {
EventType evType = store.GetValue (parent, 0) as EventType;
- filter.FilterCategoryTag (evType, o as Tag, active);
+ filter.FilterEventTag (evType, o as Tag, active);
} else {
/* don't do anything here and let the children do the filtering */
}
diff --git a/LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs b/LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs
index 45e6041..1300f01 100644
--- a/LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/FilterBaseView.cs
@@ -33,7 +33,7 @@ namespace LongoMatch.Gui.Component
protected Project project;
protected string firstColumnName = "";
protected TreeStore store;
- protected PlaysFilter filter;
+ protected EventsFilter filter;
public FilterTreeViewBase ()
{
@@ -41,7 +41,7 @@ namespace LongoMatch.Gui.Component
CreateMenu();
}
- public virtual void SetFilter (PlaysFilter filter, Project project) {
+ public virtual void SetFilter (EventsFilter filter, Project project) {
this.project = project;
this.filter = filter;
FillTree();
diff --git a/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs b/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
index a0f72b8..b669338 100644
--- a/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
+++ b/LongoMatch.GUI/Gui/TreeView/ListTreeViewBase.cs
@@ -44,7 +44,7 @@ namespace LongoMatch.Gui.Component
protected PlaysMenu playsMenu;
TreeModelFilter modelFilter;
- PlaysFilter filter;
+ EventsFilter filter;
public event EventHandler NewRenderingJob;
@@ -70,7 +70,7 @@ namespace LongoMatch.Gui.Component
set;
}
- public PlaysFilter Filter {
+ public EventsFilter Filter {
set {
filter = value;
filter.FilterUpdated += OnFilterUpdated;
@@ -147,7 +147,7 @@ namespace LongoMatch.Gui.Component
if(!(item is TimelineEvent))
return;
- Config.EventsBroker.EmitLoadPlay (item as TimelineEvent);
+ Config.EventsBroker.EmitLoadEvent (item as TimelineEvent);
}
void HandleEditPlayEvent (object sender, EventArgs e)
diff --git a/LongoMatch.GUI/Gui/TreeView/PlayersFilterTreeView.cs
b/LongoMatch.GUI/Gui/TreeView/PlayersFilterTreeView.cs
index 0ea170d..d5a6f19 100644
--- a/LongoMatch.GUI/Gui/TreeView/PlayersFilterTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/PlayersFilterTreeView.cs
@@ -42,7 +42,7 @@ namespace LongoMatch.Gui.Component
HeadersVisible = false;
}
- public override void SetFilter (PlaysFilter filter, Project project) {
+ public override void SetFilter (EventsFilter filter, Project project) {
this.local = project.LocalTeamTemplate;
this.visitor = project.VisitorTeamTemplate;
localTeam.Name = local.TeamName;
diff --git a/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs b/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
index c9e4c39..e39c1d1 100644
--- a/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
+++ b/LongoMatch.GUI/Gui/TreeView/PlaysTreeView.cs
@@ -34,7 +34,7 @@ namespace LongoMatch.Gui.Component
public class PlaysTreeView : ListTreeViewBase
{
- public event CategoryChangedHandler EditProperties;
+ public event EditEventTypeHandler EditProperties;
//Categories menu
Menu categoriesMenu;
diff --git a/LongoMatch.Services/Services/EventsManager.cs b/LongoMatch.Services/Services/EventsManager.cs
index d6f78fa..bb4ad8c 100644
--- a/LongoMatch.Services/Services/EventsManager.cs
+++ b/LongoMatch.Services/Services/EventsManager.cs
@@ -37,7 +37,7 @@ namespace LongoMatch.Services
/* current project in use */
Project openedProject;
ProjectType projectType;
- PlaysFilter filter;
+ EventsFilter filter;
IGUIToolkit guiToolkit;
IAnalysisWindow analysisWindow;
IPlayerBin player;
@@ -53,7 +53,7 @@ namespace LongoMatch.Services
}
void HandleOpenedProjectChanged (Project project, ProjectType projectType,
- PlaysFilter filter, IAnalysisWindow analysisWindow)
+ EventsFilter filter, IAnalysisWindow analysisWindow)
{
this.openedProject = project;
this.projectType = projectType;
@@ -86,12 +86,12 @@ namespace LongoMatch.Services
private void ConnectSignals ()
{
Config.EventsBroker.NewTagEvent += OnNewTag;
- Config.EventsBroker.NewPlayEvent += HandleNewPlay;
- Config.EventsBroker.PlaysDeleted += OnPlaysDeleted;
- Config.EventsBroker.PlayCategoryChanged += OnPlayCategoryChanged;
- Config.EventsBroker.DuplicatePlays += OnDuplicatePlays;
+ Config.EventsBroker.NewTimelineEventEvent += HandleNewPlay;
+ Config.EventsBroker.EventsDeletedEvent += OnPlaysDeleted;
+ Config.EventsBroker.MoveToEventTypeEvent += OnPlayCategoryChanged;
+ Config.EventsBroker.DuplicateEventsEvent += OnDuplicatePlays;
Config.EventsBroker.SnapshotSeries += OnSnapshotSeries;
- Config.EventsBroker.PlayLoadedEvent += HandlePlayLoaded;
+ Config.EventsBroker.EventLoadedEvent += HandlePlayLoaded;
Config.EventsBroker.ShowProjectStatsEvent += HandleShowProjectStatsEvent;
Config.EventsBroker.TagSubcategoriesChangedEvent +=
HandleTagSubcategoriesChangedEvent;
diff --git a/LongoMatch.Services/Services/HotKeysManager.cs b/LongoMatch.Services/Services/HotKeysManager.cs
index ed99225..9d3c4a5 100644
--- a/LongoMatch.Services/Services/HotKeysManager.cs
+++ b/LongoMatch.Services/Services/HotKeysManager.cs
@@ -43,7 +43,7 @@ namespace LongoMatch.Services
}
void HandleOpenedProjectChanged (Project project, ProjectType projectType,
- PlaysFilter filter, IAnalysisWindow analysisWindow)
+ EventsFilter filter, IAnalysisWindow analysisWindow)
{
if (project == null) {
ignoreKeys = true;
diff --git a/LongoMatch.Services/Services/PlaylistManager.cs b/LongoMatch.Services/Services/PlaylistManager.cs
index 3e1e3be..1b09b3b 100644
--- a/LongoMatch.Services/Services/PlaylistManager.cs
+++ b/LongoMatch.Services/Services/PlaylistManager.cs
@@ -36,7 +36,7 @@ namespace LongoMatch.Services
IPlaylistElement loadedElement;
Playlist loadedPlaylist;
TimelineEvent loadedPlay;
- PlaysFilter filter;
+ EventsFilter filter;
public PlaylistManager (IGUIToolkit guiToolkit, IRenderingJobsManager videoRenderer)
{
@@ -53,7 +53,7 @@ namespace LongoMatch.Services
Config.EventsBroker.OpenedProjectChanged += HandleOpenedProjectChanged;
Config.EventsBroker.PreviousPlaylistElementEvent += HandlePrev;
Config.EventsBroker.NextPlaylistElementEvent += HandleNext;
- Config.EventsBroker.LoadPlayEvent += HandleLoadPlayEvent;
+ Config.EventsBroker.LoadEventEvent += HandleLoadPlayEvent;
Config.EventsBroker.PlaylistElementSelectedEvent += HandlePlaylistElementSelected;
Config.EventsBroker.PlaybackRateChanged += HandlePlaybackRateChanged;
Config.EventsBroker.TimeNodeChanged += HandlePlayChanged;
@@ -101,7 +101,7 @@ namespace LongoMatch.Services
}
void HandleOpenedProjectChanged (Project project, ProjectType projectType,
- PlaysFilter filter, IAnalysisWindow analysisWindow)
+ EventsFilter filter, IAnalysisWindow analysisWindow)
{
openedProject = project;
if (project != null) {
@@ -125,7 +125,7 @@ namespace LongoMatch.Services
if (play != null) {
LoadPlay (play, play.Start, true);
}
- Config.EventsBroker.EmitPlayLoaded (play);
+ Config.EventsBroker.EmitEventLoaded (play);
}
void HandleNext (Playlist playlist)
diff --git a/LongoMatch.Services/Services/ProjectsManager.cs b/LongoMatch.Services/Services/ProjectsManager.cs
index 306f601..9cdbb55 100644
--- a/LongoMatch.Services/Services/ProjectsManager.cs
+++ b/LongoMatch.Services/Services/ProjectsManager.cs
@@ -68,7 +68,7 @@ namespace LongoMatch.Services
get;
}
- public PlaysFilter PlaysFilter {
+ public EventsFilter PlaysFilter {
get;
set;
}
@@ -169,7 +169,7 @@ namespace LongoMatch.Services
Log.Debug ("Loading project " + project.ID + " " + projectType);
- PlaysFilter = new PlaysFilter (project);
+ PlaysFilter = new EventsFilter (project);
guiToolkit.OpenProject (project, projectType, props, PlaysFilter,
out analysisWindow);
Player = analysisWindow.Player;
diff --git a/Tests/Core/TestPlaysFilter.cs b/Tests/Core/TestPlaysFilter.cs
index 297e73e..a987056 100644
--- a/Tests/Core/TestPlaysFilter.cs
+++ b/Tests/Core/TestPlaysFilter.cs
@@ -58,7 +58,7 @@ namespace Tests.Core
public void TestEmptyFilter ()
{
Project p = CreateProject ();
- PlaysFilter filter = new PlaysFilter (p);
+ EventsFilter filter = new EventsFilter (p);
Assert.AreEqual (17, filter.VisibleCategories.Count);
Assert.AreEqual (10, filter.VisiblePlayers.Count);
@@ -69,7 +69,7 @@ namespace Tests.Core
public void TestFilterCategory ()
{
Project p = CreateProject ();
- PlaysFilter filter = new PlaysFilter (p);
+ EventsFilter filter = new EventsFilter (p);
filter.FilterEventType (p.Dashboard.CategoriesList[0], true);
Assert.AreEqual (1, filter.VisibleCategories.Count);
@@ -104,40 +104,40 @@ namespace Tests.Core
public void TestFilterCategoryTags ()
{
Project p = CreateProject ();
- PlaysFilter filter = new PlaysFilter (p);
+ EventsFilter filter = new EventsFilter (p);
Assert.AreEqual (3, filter.VisiblePlays.Count);
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[0],
p.Dashboard.CategoriesList[0].Tags[0], true);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[0],
p.Dashboard.CategoriesList[0].Tags[0], true);
Assert.AreEqual (1, filter.VisibleCategories.Count);
Assert.AreEqual (0, filter.VisiblePlays.Count);
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[1],
p.Dashboard.CategoriesList[1].Tags[0], true);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[1],
p.Dashboard.CategoriesList[1].Tags[0], true);
Assert.AreEqual (2, filter.VisibleCategories.Count);
Assert.AreEqual (1, filter.VisiblePlays.Count);
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[2],
p.Dashboard.CategoriesList[2].Tags[0], true);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[2],
p.Dashboard.CategoriesList[2].Tags[0], true);
Assert.AreEqual (3, filter.VisibleCategories.Count);
Assert.AreEqual (1, filter.VisiblePlays.Count);
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[2],
p.Dashboard.CategoriesList[2].Tags[1], true);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[2],
p.Dashboard.CategoriesList[2].Tags[1], true);
Assert.AreEqual (2, filter.VisiblePlays.Count);
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[0],
p.Dashboard.CategoriesList[0].Tags[0], false);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[0],
p.Dashboard.CategoriesList[0].Tags[0], false);
Assert.AreEqual (3, filter.VisiblePlays.Count);
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[1],
p.Dashboard.CategoriesList[1].Tags[0], false);
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[1],
p.Dashboard.CategoriesList[1].Tags[1], true);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[1],
p.Dashboard.CategoriesList[1].Tags[0], false);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[1],
p.Dashboard.CategoriesList[1].Tags[1], true);
Assert.AreEqual (2, filter.VisiblePlays.Count);
Assert.AreEqual (p.Timeline[0], filter.VisiblePlays[0]);
Assert.AreEqual (p.Timeline[2], filter.VisiblePlays[1]);
/* One tag filtered now, but not the one of this play */
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[2],
p.Dashboard.CategoriesList[2].Tags[1], false);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[2],
p.Dashboard.CategoriesList[2].Tags[1], false);
Assert.AreEqual (1, filter.VisiblePlays.Count);
Assert.AreEqual (p.Timeline[0], filter.VisiblePlays[0]);
/* No more tags filtered, if the category matches we are ok */
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[2],
p.Dashboard.CategoriesList[2].Tags[0], false);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[2],
p.Dashboard.CategoriesList[2].Tags[0], false);
Assert.AreEqual (2, filter.VisiblePlays.Count);
Assert.AreEqual (p.Timeline[0], filter.VisiblePlays[0]);
Assert.AreEqual (p.Timeline[2], filter.VisiblePlays[1]);
@@ -150,7 +150,7 @@ namespace Tests.Core
public void TestFilterPlayers ()
{
Project p = CreateProject ();
- PlaysFilter filter = new PlaysFilter (p);
+ EventsFilter filter = new EventsFilter (p);
Assert.AreEqual (10, filter.VisiblePlayers.Count);
Assert.AreEqual (3, filter.VisiblePlays.Count);
@@ -175,7 +175,7 @@ namespace Tests.Core
public void TestClearFilters ()
{
Project p = CreateProject ();
- PlaysFilter filter = new PlaysFilter (p);
+ EventsFilter filter = new EventsFilter (p);
filter.FilterPlayer (p.LocalTeamTemplate.List[0], true);
Assert.AreEqual (1, filter.VisiblePlays.Count);
@@ -191,7 +191,7 @@ namespace Tests.Core
Assert.AreEqual (3, filter.VisiblePlays.Count);
Assert.AreEqual (17, filter.VisibleCategories.Count);
- filter.FilterCategoryTag (p.Dashboard.CategoriesList[0],
p.Dashboard.CategoriesList[0].Tags[0], true);
+ filter.FilterEventTag (p.Dashboard.CategoriesList[0],
p.Dashboard.CategoriesList[0].Tags[0], true);
Assert.AreEqual (0, filter.VisiblePlays.Count);
Assert.AreEqual (1, filter.VisibleCategories.Count);
filter.ClearAll ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
