Menu
▾
▴
acmcontester-developers
|
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.
|
|
From: <br...@us...> - 2009-02-04 17:28:49
|
Revision: 489
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=489&view=rev
Author: brus07
Date: 2009-02-04 17:28:44 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
Change timer because old timer not work.
(timer for show connect status)
Modified Paths:
--------------
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.Designer.cs
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.resx
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.Designer.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.Designer.cs 2009-02-04 16:57:31 UTC (rev 488)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.Designer.cs 2009-02-04 17:28:44 UTC (rev 489)
@@ -28,7 +28,6 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabPage1 = new System.Windows.Forms.TabPage();
@@ -38,7 +37,6 @@
this.button2 = new System.Windows.Forms.Button();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
- this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.portTextBox = new System.Windows.Forms.TextBox();
@@ -133,11 +131,6 @@
this.toolStripStatusLabel1.Size = new System.Drawing.Size(37, 17);
this.toolStripStatusLabel1.Text = "xx0xx";
//
- // timer1
- //
- this.timer1.Enabled = true;
- this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
- //
// label1
//
this.label1.AutoSize = true;
@@ -198,7 +191,6 @@
private System.Windows.Forms.Button button2;
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
- private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs 2009-02-04 16:57:31 UTC (rev 488)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs 2009-02-04 17:28:44 UTC (rev 489)
@@ -5,11 +5,14 @@
using System.Data;
using System.Text;
using System.Windows.Forms;
+using System.Threading;
namespace AcmContester.Plugins.TesterPlugins.SocketClientGatePlugin
{
public partial class SocketClientGatePluginUserControl : UserControl
{
+ System.Threading.Timer tim;
+
public SocketClientGatePluginUserControl()
{
InitializeComponent();
@@ -60,16 +63,19 @@
SocketClientGate gate = SocketClientGate.GetInstance();
gate.CreateClient(textBox2.Text, Int32.Parse(portTextBox.Text));
gate.Connect();
+
+ tim = new System.Threading.Timer(new TimerCallback(timer1_Tick));
+ tim.Change(0, 100);
}
private void button2_Click(object sender, EventArgs e)
{
SocketClientGate.GetInstance().Disconnect();
+ tim.Change(0, 0);
}
- private void timer1_Tick(object sender, EventArgs e)
+ private void timer1_Tick(object state)
{
- MessageBox.Show("!");
if (SocketClientGate.GetInstance().IsConnected() == true)
toolStripStatusLabel1.Text = "CONNECTED";
else
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.resx
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.resx 2009-02-04 16:57:31 UTC (rev 488)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.resx 2009-02-04 17:28:44 UTC (rev 489)
@@ -120,7 +120,4 @@
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>127, 17</value>
- </metadata>
</root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2009-02-06 20:56:49
|
Revision: 494
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=494&view=rev
Author: brus07
Date: 2009-02-06 20:56:45 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Bug fix with Connected status.
When try to send to Server when not Connected, show MessageBox.
Modified Paths:
--------------
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGate.cs
ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGate.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGate.cs 2009-02-06 19:41:24 UTC (rev 493)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGate.cs 2009-02-06 20:56:45 UTC (rev 494)
@@ -111,7 +111,11 @@
if (client == null)
return true;
-
+ if (IsConnected() == false)
+ {
+ System.Windows.Forms.MessageBox.Show("Client is not Connected to Server", "Error", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+ return false;
+ }
return client.Send(message);
}
@@ -135,6 +139,17 @@
}
public bool IsConnected()
{
+ if (client.IsConnected() == true)
+ {
+ try
+ {
+ client.Send(new SystemMessage("."));
+ }
+ catch (Exception)
+ {
+ return false;
+ }
+ }
return client.IsConnected();
}
}
Modified: ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs 2009-02-06 19:41:24 UTC (rev 493)
+++ ACMServer/trunk/ACMServer/Plugins/TesterPlugins/SocketClientGatePlugin/SocketClientGatePluginUserControl.cs 2009-02-06 20:56:45 UTC (rev 494)
@@ -23,6 +23,10 @@
SocketClientGate gate = SocketClientGate.GetInstance();
gate.onAddLogText += AddText;
+ gate.CreateClient(textBox2.Text, Int32.Parse(portTextBox.Text));
+
+ tim = new System.Threading.Timer(new TimerCallback(timer1_Tick));
+ tim.Change(0, 1000);
}
LogDataGridView.LogDataGridView view = new LogDataGridView.LogDataGridView();
@@ -64,8 +68,7 @@
gate.CreateClient(textBox2.Text, Int32.Parse(portTextBox.Text));
gate.Connect();
- tim = new System.Threading.Timer(new TimerCallback(timer1_Tick));
- tim.Change(0, 100);
+ tim.Change(0, 1000);
}
private void button2_Click(object sender, EventArgs e)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X