|
From: <br...@us...> - 2008-11-04 18:20:54
|
Revision: 429
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=429&view=rev
Author: brus07
Date: 2008-11-04 18:20:49 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
Added LogDataGridView to SocketClientGatePlugin and fix bug with logging (was all message logging twice).
Modified Paths:
--------------
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePlugin.cs
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePlugin.csproj
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.Designer.cs
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePlugin.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePlugin.cs 2008-11-04 17:14:31 UTC (rev 428)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePlugin.cs 2008-11-04 18:20:49 UTC (rev 429)
@@ -12,15 +12,8 @@
{
socketClientGate.onDataArrived += DataArrived;
base.Control = new SocketClientGatePluginUserControl();
-
- socketClientGate.onAddLogText += new SocketClientGate.AddLogTextDelegate(socketClientGate_onAddLogText);
}
- void socketClientGate_onAddLogText(string type, string text)
- {
- ((SocketClientGatePluginUserControl)base.Control).AddText(type, text);
- }
-
public override void Send(SystemMessage message)
{
if (message.IsType("ApplicationSystem") && message.Message == "stop")
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePlugin.csproj
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePlugin.csproj 2008-11-04 17:14:31 UTC (rev 428)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePlugin.csproj 2008-11-04 18:20:49 UTC (rev 429)
@@ -28,6 +28,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="LogDataGridView, Version=1.1.3198.29045, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\Resource\LogDataGridView.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.Designer.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.Designer.cs 2008-11-04 17:14:31 UTC (rev 428)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.Designer.cs 2008-11-04 18:20:49 UTC (rev 429)
@@ -38,6 +38,7 @@
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.statusStrip1.SuspendLayout();
@@ -48,6 +49,7 @@
this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Location = new System.Drawing.Point(3, 61);
this.tabControl1.Name = "tabControl1";
@@ -123,6 +125,16 @@
this.timer1.Enabled = true;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
+ // tabPage2
+ //
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(230, 135);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "tabPage2";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
// SocketClientGatePluginUserControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -155,5 +167,6 @@
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.TabPage tabPage2;
}
}
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs 2008-11-04 17:14:31 UTC (rev 428)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs 2008-11-04 18:20:49 UTC (rev 429)
@@ -13,6 +13,7 @@
public SocketClientGatePluginUserControl()
{
InitializeComponent();
+ initGridSe();
string ip = System.Net.Dns.GetHostAddresses(System.Net.Dns.GetHostName())[0].ToString();
textBox2.Text = ip;
@@ -21,6 +22,13 @@
gate.onAddLogText += AddText;
}
+ LogDataGridView.LogDataGridView view = new LogDataGridView.LogDataGridView();
+ private void initGridSe()
+ {
+ view.Dock = DockStyle.Fill;
+ tabPage2.Controls.Add(view);
+ }
+
delegate void AddTextCallback(string text);
private void AddTextToTextLog(string text)
{
@@ -44,7 +52,7 @@
public void AddText(string type, string text)
{
AddTextToTextLog(type + ": " + text);
- //view.AddRow(new LogDataGridView.SystemMessage(text, type));
+ view.AddRow(new LogDataGridView.SystemMessage(text, type));
}
private void button1_Click(object sender, EventArgs e)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|