From 2222d979cc723ee2f3bad92ffe4991d074b2403a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 23 May 2012 02:37:38 +0100
Subject: refactor: rename ConsoleTable -> ConsoleDisplayTable for clarity
---
OpenSim/Framework/Console/ConsoleDisplayTable.cs | 139 +++++++++++++++++++++++
1 file changed, 139 insertions(+)
create mode 100644 OpenSim/Framework/Console/ConsoleDisplayTable.cs
(limited to 'OpenSim/Framework/Console/ConsoleDisplayTable.cs')
diff --git a/OpenSim/Framework/Console/ConsoleDisplayTable.cs b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
new file mode 100644
index 0000000..49d5a17
--- /dev/null
+++ b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OpenSim.Framework.Console
+{
+ ///
+ /// Used to generated a formatted table for the console.
+ ///
+ ///
+ /// Currently subject to change. If you use this, be prepared to change your code when this class changes.
+ ///
+ public class ConsoleDisplayTable
+ {
+ ///
+ /// Default number of spaces between table columns.
+ ///
+ public const int DefaultTableSpacing = 2;
+
+ ///
+ /// Table columns.
+ ///
+ public List Columns { get; private set; }
+
+ ///
+ /// Table rows
+ ///
+ public List Rows { get; private set; }
+
+ ///
+ /// Number of spaces to indent the table.
+ ///
+ public int Indent { get; set; }
+
+ ///
+ /// Spacing between table columns
+ ///
+ public int TableSpacing { get; set; }
+
+ public ConsoleDisplayTable()
+ {
+ TableSpacing = DefaultTableSpacing;
+ Columns = new List();
+ Rows = new List();
+ }
+
+ public override string ToString()
+ {
+ StringBuilder sb = new StringBuilder();
+ AddToStringBuilder(sb);
+ return sb.ToString();
+ }
+
+ public void AddToStringBuilder(StringBuilder sb)
+ {
+ string formatString = GetFormatString();
+// System.Console.WriteLine("FORMAT STRING [{0}]", formatString);
+
+ // columns
+ sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray());
+
+ // rows
+ foreach (ConsoleTableRow row in Rows)
+ sb.AppendFormat(formatString, row.Cells.ToArray());
+ }
+
+ ///
+ /// Gets the format string for the table.
+ ///
+ private string GetFormatString()
+ {
+ StringBuilder formatSb = new StringBuilder();
+
+ formatSb.Append(' ', Indent);
+
+ for (int i = 0; i < Columns.Count; i++)
+ {
+ formatSb.Append(' ', TableSpacing);
+
+ // Can only do left formatting for now
+ formatSb.AppendFormat("{{{0},-{1}}}", i, Columns[i].Width);
+ }
+
+ formatSb.Append('\n');
+
+ return formatSb.ToString();
+ }
+ }
+
+ public struct ConsoleTableColumn
+ {
+ public string Header { get; set; }
+ public int Width { get; set; }
+
+ public ConsoleTableColumn(string header, int width) : this()
+ {
+ Header = header;
+ Width = width;
+ }
+ }
+
+ public struct ConsoleTableRow
+ {
+ public List Cells { get; private set; }
+
+ public ConsoleTableRow(List cells) : this()
+ {
+ Cells = cells;
+ }
+ }
+}
\ No newline at end of file
--
cgit v1.1
From 8f88c17df969b1fd3e4a93747201e9436c9a1fcd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 23 May 2012 03:23:37 +0100
Subject: refactor: Rename ConsoleTableRow and ConsoleTableColumn to
ConsoleDisplayTableRow and ConsoleDisplayTableColumn
---
OpenSim/Framework/Console/ConsoleDisplayTable.cs | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Framework/Console/ConsoleDisplayTable.cs')
diff --git a/OpenSim/Framework/Console/ConsoleDisplayTable.cs b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
index 49d5a17..e9d1628 100644
--- a/OpenSim/Framework/Console/ConsoleDisplayTable.cs
+++ b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
@@ -48,12 +48,12 @@ namespace OpenSim.Framework.Console
///
/// Table columns.
///
- public List Columns { get; private set; }
+ public List Columns { get; private set; }
///
/// Table rows
///
- public List Rows { get; private set; }
+ public List Rows { get; private set; }
///
/// Number of spaces to indent the table.
@@ -68,8 +68,8 @@ namespace OpenSim.Framework.Console
public ConsoleDisplayTable()
{
TableSpacing = DefaultTableSpacing;
- Columns = new List();
- Rows = new List();
+ Columns = new List();
+ Rows = new List();
}
public override string ToString()
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Console
sb.AppendFormat(formatString, Columns.ConvertAll(c => c.Header).ToArray());
// rows
- foreach (ConsoleTableRow row in Rows)
+ foreach (ConsoleDisplayTableRow row in Rows)
sb.AppendFormat(formatString, row.Cells.ToArray());
}
@@ -115,23 +115,23 @@ namespace OpenSim.Framework.Console
}
}
- public struct ConsoleTableColumn
+ public struct ConsoleDisplayTableColumn
{
public string Header { get; set; }
public int Width { get; set; }
- public ConsoleTableColumn(string header, int width) : this()
+ public ConsoleDisplayTableColumn(string header, int width) : this()
{
Header = header;
Width = width;
}
}
- public struct ConsoleTableRow
+ public struct ConsoleDisplayTableRow
{
public List Cells { get; private set; }
- public ConsoleTableRow(List cells) : this()
+ public ConsoleDisplayTableRow(List cells) : this()
{
Cells = cells;
}
--
cgit v1.1
From 1f22b29ca3d172624087185a4e9056a931f19703 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 26 Jun 2012 00:40:46 +0100
Subject: Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.
Use these for new "show regions" command rather than old cumbersome stuff.
---
OpenSim/Framework/Console/ConsoleDisplayTable.cs | 15 +++++++++++++++
1 file changed, 15 insertions(+)
(limited to 'OpenSim/Framework/Console/ConsoleDisplayTable.cs')
diff --git a/OpenSim/Framework/Console/ConsoleDisplayTable.cs b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
index e9d1628..c620dfe 100644
--- a/OpenSim/Framework/Console/ConsoleDisplayTable.cs
+++ b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
@@ -79,6 +79,16 @@ namespace OpenSim.Framework.Console
return sb.ToString();
}
+ public void AddColumn(string name, int width)
+ {
+ Columns.Add(new ConsoleDisplayTableColumn(name, width));
+ }
+
+ public void AddRow(params string[] cells)
+ {
+ Rows.Add(new ConsoleDisplayTableRow(cells));
+ }
+
public void AddToStringBuilder(StringBuilder sb)
{
string formatString = GetFormatString();
@@ -135,5 +145,10 @@ namespace OpenSim.Framework.Console
{
Cells = cells;
}
+
+ public ConsoleDisplayTableRow(params string[] cells) : this()
+ {
+ Cells = new List(cells);
+ }
}
}
\ No newline at end of file
--
cgit v1.1
From addab1244ecc586b0a6fc8560b94c871567b78da Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 2 Jan 2013 21:38:00 +0000
Subject: Add "show animations" console command for debug purposes.
This shows the current animation sequence and default anims for avatars.
---
OpenSim/Framework/Console/ConsoleDisplayTable.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Framework/Console/ConsoleDisplayTable.cs')
diff --git a/OpenSim/Framework/Console/ConsoleDisplayTable.cs b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
index c620dfe..c6f2272 100644
--- a/OpenSim/Framework/Console/ConsoleDisplayTable.cs
+++ b/OpenSim/Framework/Console/ConsoleDisplayTable.cs
@@ -139,16 +139,16 @@ namespace OpenSim.Framework.Console
public struct ConsoleDisplayTableRow
{
- public List Cells { get; private set; }
+ public List