[longomatch] Move blackboard objects into their own namespace
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch] Move blackboard objects into their own namespace
- Date: Fri, 17 Apr 2015 16:21:54 +0000 (UTC)
commit 3d9bb07d1fce18e640e55dcc76ddb8d07a902756
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date: Fri Apr 10 17:57:10 2015 +0200
Move blackboard objects into their own namespace
.../{ => Blackboard}/CounterObject.cs | 16 ++++++++--------
.../CanvasObjects/{ => Blackboard}/CrossObject.cs | 12 ++++++------
.../{ => Blackboard}/EllipseObject.cs | 7 ++++---
.../CanvasObjects/{ => Blackboard}/LineObject.cs | 14 +++++++-------
.../{ => Blackboard}/QuadrilateralObject.cs | 12 ++++++------
.../{ => Blackboard}/RectangleObject.cs | 12 ++++++------
.../CanvasObjects/{ => Blackboard}/TextObject.cs | 14 +++++++-------
LongoMatch.Drawing/LongoMatch.Drawing.csproj | 17 +++++++++--------
LongoMatch.Drawing/Makefile.am | 14 +++++++-------
9 files changed, 60 insertions(+), 58 deletions(-)
---
diff --git a/LongoMatch.Drawing/CanvasObjects/CounterObject.cs
b/LongoMatch.Drawing/CanvasObjects/Blackboard/CounterObject.cs
similarity index 86%
rename from LongoMatch.Drawing/CanvasObjects/CounterObject.cs
rename to LongoMatch.Drawing/CanvasObjects/Blackboard/CounterObject.cs
index 7997546..31cad80 100644
--- a/LongoMatch.Drawing/CanvasObjects/CounterObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/Blackboard/CounterObject.cs
@@ -16,14 +16,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
//
using System;
-using LongoMatch.Core.Store.Drawables;
-using LongoMatch.Core.Interfaces.Drawing;
-using LongoMatch.Core.Interfaces;
using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
-namespace LongoMatch.Drawing.CanvasObjects
+namespace LongoMatch.Drawing.CanvasObjects.Blackboard
{
- public class CounterObject: CanvasDrawableObject<Counter>, ICanvasSelectableObject
+ public class CounterObject: CanvasDrawableObject<Counter>
{
public CounterObject ()
@@ -42,7 +41,8 @@ namespace LongoMatch.Drawing.CanvasObjects
darea = Drawable.Area;
if (!UpdateDrawArea (tk, area, darea)) {
return;
- };
+ }
+ ;
tk.Begin ();
tk.FillColor = Drawable.FillColor;
tk.StrokeColor = Drawable.StrokeColor;
@@ -50,9 +50,9 @@ namespace LongoMatch.Drawing.CanvasObjects
tk.DrawCircle (Drawable.Center, Drawable.Radius);
tk.StrokeColor = Drawable.TextColor;
tk.FontAlignment = FontAlignment.Center;
- tk.FontSize = (int) Drawable.AxisX;
+ tk.FontSize = (int)Drawable.AxisX;
tk.DrawText (darea.Start, darea.Width, darea.Height,
- Drawable.Count.ToString ());
+ Drawable.Count.ToString ());
DrawSelectionArea (tk);
tk.End ();
}
diff --git a/LongoMatch.Drawing/CanvasObjects/CrossObject.cs
b/LongoMatch.Drawing/CanvasObjects/Blackboard/CrossObject.cs
similarity index 89%
rename from LongoMatch.Drawing/CanvasObjects/CrossObject.cs
rename to LongoMatch.Drawing/CanvasObjects/Blackboard/CrossObject.cs
index 1848b45..9939184 100644
--- a/LongoMatch.Drawing/CanvasObjects/CrossObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/Blackboard/CrossObject.cs
@@ -16,14 +16,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
//
using System;
-using LongoMatch.Core.Store.Drawables;
-using LongoMatch.Core.Interfaces.Drawing;
-using LongoMatch.Core.Interfaces;
using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
-namespace LongoMatch.Drawing.CanvasObjects
+namespace LongoMatch.Drawing.CanvasObjects.Blackboard
{
- public class CrossObject: CanvasDrawableObject<Cross>, ICanvasSelectableObject
+ public class CrossObject: CanvasDrawableObject<Cross>
{
public CrossObject ()
{
@@ -38,7 +37,8 @@ namespace LongoMatch.Drawing.CanvasObjects
{
if (!UpdateDrawArea (tk, area, Drawable.Area)) {
return;
- };
+ }
+ ;
tk.Begin ();
tk.FillColor = Drawable.FillColor;
diff --git a/LongoMatch.Drawing/CanvasObjects/EllipseObject.cs
b/LongoMatch.Drawing/CanvasObjects/Blackboard/EllipseObject.cs
similarity index 91%
rename from LongoMatch.Drawing/CanvasObjects/EllipseObject.cs
rename to LongoMatch.Drawing/CanvasObjects/Blackboard/EllipseObject.cs
index 8f40f71..fa92346 100644
--- a/LongoMatch.Drawing/CanvasObjects/EllipseObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/Blackboard/EllipseObject.cs
@@ -21,9 +21,9 @@ using LongoMatch.Core.Store.Drawables;
using LongoMatch.Core.Common;
using LongoMatch.Core.Interfaces;
-namespace LongoMatch.Drawing.CanvasObjects
+namespace LongoMatch.Drawing.CanvasObjects.Blackboard
{
- public class EllipseObject: CanvasDrawableObject<Ellipse>, ICanvasSelectableObject
+ public class EllipseObject: CanvasDrawableObject<Ellipse>
{
public EllipseObject ()
@@ -39,7 +39,8 @@ namespace LongoMatch.Drawing.CanvasObjects
{
if (!UpdateDrawArea (tk, area, Drawable.Area)) {
return;
- };
+ }
+ ;
tk.Begin ();
tk.FillColor = Drawable.FillColor;
diff --git a/LongoMatch.Drawing/CanvasObjects/LineObject.cs
b/LongoMatch.Drawing/CanvasObjects/Blackboard/LineObject.cs
similarity index 88%
rename from LongoMatch.Drawing/CanvasObjects/LineObject.cs
rename to LongoMatch.Drawing/CanvasObjects/Blackboard/LineObject.cs
index 45a00c8..d4a6187 100644
--- a/LongoMatch.Drawing/CanvasObjects/LineObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/Blackboard/LineObject.cs
@@ -17,13 +17,12 @@
//
using System;
using LongoMatch.Core.Common;
-using LongoMatch.Core.Store.Drawables;
using LongoMatch.Core.Interfaces.Drawing;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Core.Store.Drawables;
-namespace LongoMatch.Drawing.CanvasObjects
+namespace LongoMatch.Drawing.CanvasObjects.Blackboard
{
- public class LineObject: CanvasDrawableObject<Line>, ICanvasSelectableObject
+ public class LineObject: CanvasDrawableObject<Line>
{
public LineObject ()
{
@@ -38,7 +37,8 @@ namespace LongoMatch.Drawing.CanvasObjects
{
if (!UpdateDrawArea (tk, area, Drawable.Area)) {
return;
- };
+ }
+ ;
tk.Begin ();
tk.FillColor = Drawable.FillColor;
@@ -48,14 +48,14 @@ namespace LongoMatch.Drawing.CanvasObjects
tk.DrawLine (Drawable.Start, Drawable.Stop);
tk.LineStyle = LineStyle.Normal;
if (Drawable.Type == LineType.Arrow ||
- Drawable.Type == LineType.DoubleArrow) {
+ Drawable.Type == LineType.DoubleArrow) {
tk.DrawArrow (Drawable.Start, Drawable.Stop, 5 * Drawable.LineWidth / 2, 0.3,
true);
}
if (Drawable.Type == LineType.DoubleArrow) {
tk.DrawArrow (Drawable.Stop, Drawable.Start, 5 * Drawable.LineWidth / 2, 0.3,
true);
}
if (Drawable.Type == LineType.Dot ||
- Drawable.Type == LineType.DoubleDot) {
+ Drawable.Type == LineType.DoubleDot) {
tk.DrawPoint (Drawable.Stop);
}
if (Drawable.Type == LineType.DoubleDot) {
diff --git a/LongoMatch.Drawing/CanvasObjects/QuadrilateralObject.cs
b/LongoMatch.Drawing/CanvasObjects/Blackboard/QuadrilateralObject.cs
similarity index 89%
rename from LongoMatch.Drawing/CanvasObjects/QuadrilateralObject.cs
rename to LongoMatch.Drawing/CanvasObjects/Blackboard/QuadrilateralObject.cs
index 044bc81..9207787 100644
--- a/LongoMatch.Drawing/CanvasObjects/QuadrilateralObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/Blackboard/QuadrilateralObject.cs
@@ -16,14 +16,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
//
using System;
+using LongoMatch.Core.Common;
using LongoMatch.Core.Interfaces.Drawing;
using LongoMatch.Core.Store.Drawables;
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
-namespace LongoMatch.Drawing.CanvasObjects
+namespace LongoMatch.Drawing.CanvasObjects.Blackboard
{
- public class QuadrilateralObject: CanvasDrawableObject<Quadrilateral>, ICanvasSelectableObject
+ public class QuadrilateralObject: CanvasDrawableObject<Quadrilateral>
{
public QuadrilateralObject ()
{
@@ -38,14 +37,15 @@ namespace LongoMatch.Drawing.CanvasObjects
{
if (!UpdateDrawArea (tk, area, Drawable.Area)) {
return;
- };
+ }
+ ;
tk.Begin ();
tk.FillColor = Drawable.FillColor;
tk.StrokeColor = Drawable.StrokeColor;
tk.LineWidth = Drawable.LineWidth;
tk.DrawArea (Drawable.TopLeft, Drawable.TopRight,
- Drawable.BottomRight, Drawable.BottomLeft);
+ Drawable.BottomRight, Drawable.BottomLeft);
tk.End ();
}
}
diff --git a/LongoMatch.Drawing/CanvasObjects/RectangleObject.cs
b/LongoMatch.Drawing/CanvasObjects/Blackboard/RectangleObject.cs
similarity index 89%
rename from LongoMatch.Drawing/CanvasObjects/RectangleObject.cs
rename to LongoMatch.Drawing/CanvasObjects/Blackboard/RectangleObject.cs
index 85f7244..c3fdd2e 100644
--- a/LongoMatch.Drawing/CanvasObjects/RectangleObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/Blackboard/RectangleObject.cs
@@ -16,14 +16,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
//
using System;
-using LongoMatch.Core.Store.Drawables;
-using LongoMatch.Core.Interfaces.Drawing;
-using LongoMatch.Core.Interfaces;
using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
-namespace LongoMatch.Drawing.CanvasObjects
+namespace LongoMatch.Drawing.CanvasObjects.Blackboard
{
- public class RectangleObject: CanvasDrawableObject<Rectangle>, ICanvasSelectableObject
+ public class RectangleObject: CanvasDrawableObject<Rectangle>
{
public RectangleObject ()
{
@@ -38,7 +37,8 @@ namespace LongoMatch.Drawing.CanvasObjects
{
if (!UpdateDrawArea (tk, area, Drawable.Area)) {
return;
- };
+ }
+ ;
tk.Begin ();
tk.FillColor = Drawable.FillColor;
diff --git a/LongoMatch.Drawing/CanvasObjects/TextObject.cs
b/LongoMatch.Drawing/CanvasObjects/Blackboard/TextObject.cs
similarity index 88%
rename from LongoMatch.Drawing/CanvasObjects/TextObject.cs
rename to LongoMatch.Drawing/CanvasObjects/Blackboard/TextObject.cs
index 9b07b71..d000a01 100644
--- a/LongoMatch.Drawing/CanvasObjects/TextObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/Blackboard/TextObject.cs
@@ -16,14 +16,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
//
using System;
-using LongoMatch.Core.Store.Drawables;
-using LongoMatch.Core.Interfaces.Drawing;
-using LongoMatch.Core.Interfaces;
using LongoMatch.Core.Common;
+using LongoMatch.Core.Interfaces.Drawing;
+using LongoMatch.Core.Store.Drawables;
-namespace LongoMatch.Drawing.CanvasObjects
+namespace LongoMatch.Drawing.CanvasObjects.Blackboard
{
- public class TextObject: CanvasDrawableObject<Text>, ICanvasSelectableObject
+ public class TextObject: CanvasDrawableObject<Text>
{
public TextObject ()
{
@@ -38,7 +37,8 @@ namespace LongoMatch.Drawing.CanvasObjects
{
if (!UpdateDrawArea (tk, area, Drawable.Area)) {
return;
- };
+ }
+ ;
tk.Begin ();
tk.FillColor = Drawable.FillColor;
@@ -49,7 +49,7 @@ namespace LongoMatch.Drawing.CanvasObjects
tk.FontSize = Drawable.TextSize;
tk.FontAlignment = FontAlignment.Center;
tk.DrawText (Drawable.TopLeft, Drawable.Width, Drawable.Height,
- Drawable.Value);
+ Drawable.Value);
DrawSelectionArea (tk);
tk.End ();
}
diff --git a/LongoMatch.Drawing/LongoMatch.Drawing.csproj b/LongoMatch.Drawing/LongoMatch.Drawing.csproj
index 7ee9ec4..7d60693 100644
--- a/LongoMatch.Drawing/LongoMatch.Drawing.csproj
+++ b/LongoMatch.Drawing/LongoMatch.Drawing.csproj
@@ -29,6 +29,7 @@
<Folder Include="CanvasObjects\" />
<Folder Include="Widgets\" />
<Folder Include="CanvasObjects\Dashboard\" />
+ <Folder Include="CanvasObjects\Blackboard\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Canvas.cs" />
@@ -44,14 +45,7 @@
<Compile Include="Widgets\TimersTimeline.cs" />
<Compile Include="Widgets\PositionTagger.cs" />
<Compile Include="CanvasObjects\PositionObject.cs" />
- <Compile Include="CanvasObjects\LineObject.cs" />
- <Compile Include="CanvasObjects\CrossObject.cs" />
- <Compile Include="CanvasObjects\RectangleObject.cs" />
- <Compile Include="CanvasObjects\QuadrilateralObject.cs" />
<Compile Include="Widgets\Blackboard.cs" />
- <Compile Include="CanvasObjects\EllipseObject.cs" />
- <Compile Include="CanvasObjects\TextObject.cs" />
- <Compile Include="CanvasObjects\CounterObject.cs" />
<Compile Include="Utils.cs" />
<Compile Include="CanvasObjects\BenchObject.cs" />
<Compile Include="CanvasObjects\FieldObject.cs" />
@@ -59,7 +53,6 @@
<Compile Include="PlayslistCellRenderer.cs" />
<Compile Include="Widgets\DashboardCanvas.cs" />
<Compile Include="CanvasObjects\ButtonObject.cs" />
- <Compile Include="CanvasObjects\LabelObject.cs" />
<Compile Include="Widgets\TimelineLabels.cs" />
<Compile Include="CanvasObjects\NeedleObject.cs" />
<Compile Include="CanvasObjects\CameraObject.cs" />
@@ -74,6 +67,14 @@
<Compile Include="CanvasObjects\Dashboard\ScoreObject.cs" />
<Compile Include="CanvasObjects\Dashboard\TagObject.cs" />
<Compile Include="CanvasObjects\Dashboard\TimerObject.cs" />
+ <Compile Include="CanvasObjects\Blackboard\CounterObject.cs" />
+ <Compile Include="CanvasObjects\Blackboard\CrossObject.cs" />
+ <Compile Include="CanvasObjects\Blackboard\EllipseObject.cs" />
+ <Compile Include="CanvasObjects\Blackboard\LineObject.cs" />
+ <Compile Include="CanvasObjects\Blackboard\QuadrilateralObject.cs" />
+ <Compile Include="CanvasObjects\Blackboard\RectangleObject.cs" />
+ <Compile Include="CanvasObjects\Blackboard\TextObject.cs" />
+ <Compile Include="CanvasObjects\LabelObject.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
diff --git a/LongoMatch.Drawing/Makefile.am b/LongoMatch.Drawing/Makefile.am
index 7a3094a..4a6496b 100644
--- a/LongoMatch.Drawing/Makefile.am
+++ b/LongoMatch.Drawing/Makefile.am
@@ -7,29 +7,29 @@ LINK = $(REF_DEP_LONGOMATCH_DRAWING)
SOURCES = ../AssemblyInfo/AssemblyInfo.cs \
Canvas.cs \
CanvasObjects/BenchObject.cs \
+ CanvasObjects/Blackboard/CounterObject.cs \
+ CanvasObjects/Blackboard/CrossObject.cs \
+ CanvasObjects/Blackboard/EllipseObject.cs \
+ CanvasObjects/Blackboard/LineObject.cs \
+ CanvasObjects/Blackboard/QuadrilateralObject.cs \
+ CanvasObjects/Blackboard/RectangleObject.cs \
+ CanvasObjects/Blackboard/TextObject.cs \
CanvasObjects/ButtonObject.cs \
CanvasObjects/CameraObject.cs \
CanvasObjects/CanvasObject.cs \
- CanvasObjects/CounterObject.cs \
- CanvasObjects/CrossObject.cs \
CanvasObjects/Dashboard/CardObject.cs \
CanvasObjects/Dashboard/CategoryObject.cs \
CanvasObjects/Dashboard/DashboardButtonObject.cs \
CanvasObjects/Dashboard/ScoreObject.cs \
CanvasObjects/Dashboard/TagObject.cs \
CanvasObjects/Dashboard/TimerObject.cs \
- CanvasObjects/EllipseObject.cs \
CanvasObjects/FieldObject.cs \
CanvasObjects/LabelObject.cs \
- CanvasObjects/LineObject.cs \
CanvasObjects/NeedleObject.cs \
CanvasObjects/PlayObject.cs \
CanvasObjects/PlayerObject.cs \
CanvasObjects/PlayersTaggerObject.cs \
CanvasObjects/PositionObject.cs \
- CanvasObjects/QuadrilateralObject.cs \
- CanvasObjects/RectangleObject.cs \
- CanvasObjects/TextObject.cs \
CanvasObjects/TimeNodeObject.cs \
CanvasObjects/TimelineObject.cs \
Constants.cs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]