diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
index f9c13ff..a34245d 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Test/TestAction.cs
@@ -53,7 +53,8 @@ namespace Mesnac.Action.ChemicalWeighing.Test
liss = db2105Helper.ReadReadyM6;
liss = db2105Helper.ReadReadyM7;
liss = db2105Helper.ReadReadyM8;
-
+
+
var yw= Db3000Helper.ReadModel();
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/LSCREWBIG.cs b/Controls/Mesnac.Controls.ChemicalWeighing/LSCREWBIG.cs
index 3a2ff9d..9a714e1 100644
--- a/Controls/Mesnac.Controls.ChemicalWeighing/LSCREWBIG.cs
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/LSCREWBIG.cs
@@ -9,23 +9,11 @@ namespace Mesnac.Controls.ChemicalWeighing
///
/// 螺旋给料器左(小)
///
- [ToolboxBitmap(typeof(LSCREWBIG), "Resources.LSCREW_BIG01.png")]//新添加的代码
+ [ToolboxBitmap(typeof(LSCREWBIG), "Resources.LSCREW_BIG01.png")] //新添加的代码
public partial class LSCREWBIG : ChemicalWeighingControl
{
- bool bNewPic = false;
- string _statusName;
-
- public string StatusName
- {
- get
- {
- return _statusName;
- }
- set
- {
- _statusName = value;
- }
- }
+ private object _data = new object();
+
public enum Statuses
{
ylNormal = 0, ylMove = 1 //, ylAlarm = 2
@@ -38,101 +26,59 @@ namespace Mesnac.Controls.ChemicalWeighing
InitializeComponent();
Init();
ReloadStream();
+
}
- protected override void Init()
+ protected sealed override void Init()
{
base.Init();
_imageStream = null;
- sImages = new string[3];
+ sImages = new string[2];
sImages[0] = "Mesnac.Controls.ChemicalWeighing.Resources.LSCREW_BIG01.png";
sImages[1] = "Mesnac.Controls.ChemicalWeighing.Resources.LSCREW_BIGMOVE.gif";
-
_status = Statuses.ylNormal;
}
private void ReloadStream()
{
- //CloseStream();
+
int nIndex = (int)_status;
_imageStream = _assembly.GetManifestResourceStream(sImages[nIndex]);
+ if (_imageStream != null)
+ {
+ Image img = Image.FromStream(_imageStream);
+ pictureBox1.Image = img;
+ pictureBox1.Refresh();
+ }
}
public Statuses Status
{
- get
- {
- return _status;
- }
+ get => _status;
set
{
- if (bFirstCreated == true)
- {
- bFirstCreated = false;
- }
+
if (_status != value)
{
- if (this.DesignMode == true)
+ lock (_data)
{
- bNewPic = true;
+ _status = value;
+ ReloadStream();
+
}
}
- if ((int)value <= 0)
- {
- _status = (Statuses)0;
- }
- else if ((int)value >= 1)
- {
- _status = (Statuses)1;
- }
- else
- {
- _status = value;
- }
-
- ReloadStream();
- Reload();
- }
- }
- private void Reload()
- {
- if ( _imageStream != null )
- {
- Image img = Image.FromStream( _imageStream );
- if ( bNewPic == true )
- {
- //this.Size = img.Size;
- bNewPic = false;
- }
- pictureBox1.Image = img;
- pictureBox1.Refresh();
- }
- }
- protected override void OnPaint(PaintEventArgs e)
- {
- if (_imageStream != null)
- {
- Graphics g = e.Graphics;
- Image img = Image.FromStream(_imageStream);
- if (bNewPic == true)
- {
- //this.Size = img.Size;
- bNewPic = false;
- }
- g.DrawImage(img, 0, 0, this.Width, this.Height);
+
+
}
}
+
private void PressureSwitch_Load(object sender, EventArgs e)
{
- if (bFirstCreated == true && this.DesignMode == true)
- {
- bNewPic = true;
- bFirstCreated = false;
- Reload();
- }
+
}
}
+
}
diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/RSCREWBIG.cs b/Controls/Mesnac.Controls.ChemicalWeighing/RSCREWBIG.cs
index e28e95d..b83c5bd 100644
--- a/Controls/Mesnac.Controls.ChemicalWeighing/RSCREWBIG.cs
+++ b/Controls/Mesnac.Controls.ChemicalWeighing/RSCREWBIG.cs
@@ -7,9 +7,9 @@ using System.Windows.Forms;
namespace Mesnac.Controls.ChemicalWeighing
{
///
- /// ң
+ /// 震动给料器右(大)
///
- [ToolboxBitmap(typeof(RSCREWBIG), "Resources.RSCREW_BIGA.png")]//ӵĴ
+ [ToolboxBitmap(typeof(RSCREWBIG), "Resources.RSCREW_BIGA.png")]//新添加的代码
public partial class RSCREWBIG : ChemicalWeighingControl
{
@@ -30,7 +30,7 @@ namespace Mesnac.Controls.ChemicalWeighing
}
- protected override void Init()
+ protected sealed override void Init()
{
base.Init();
_imageStream = null;
@@ -57,10 +57,7 @@ namespace Mesnac.Controls.ChemicalWeighing
public Statuses Status
{
- get
- {
- return _status;
- }
+ get => _status;
set
{