|
|
@@ -26,6 +26,15 @@ using OINA.Extender.Processing.Quant;
|
|
|
using System.ComponentModel;
|
|
|
using OINA.Extender.Data.Ed;
|
|
|
using System.Threading;
|
|
|
+
|
|
|
+using System.Collections.Specialized;
|
|
|
+using System.Globalization;
|
|
|
+using System.Runtime.Serialization;
|
|
|
+using OINA.Extender.Controls;
|
|
|
+using OINA.Extender.Controls.Common;
|
|
|
+using OINA.Extender.Controls.Image;
|
|
|
+using OINA.Extender.Controls.Spectrum;
|
|
|
+
|
|
|
namespace Extender
|
|
|
{
|
|
|
enum OxfordCommand
|
|
|
@@ -109,11 +118,11 @@ namespace Extender
|
|
|
|
|
|
public struct PointXrayParam
|
|
|
{
|
|
|
- public double dMilliSecondsTime;
|
|
|
- public int x;
|
|
|
- public int y;
|
|
|
- public long[] XrayData;
|
|
|
- public Dictionary<string, double> listElement;
|
|
|
+ public double dMilliSecondsTime;
|
|
|
+ public int x;
|
|
|
+ public int y;
|
|
|
+ public long[] XrayData;
|
|
|
+ public Dictionary<string, double> listElement;
|
|
|
|
|
|
}
|
|
|
public struct AreaXrayParam
|
|
|
@@ -160,7 +169,7 @@ namespace Extender
|
|
|
{
|
|
|
if (myExtender != null)
|
|
|
{
|
|
|
- myExtender.CloseExtender();
|
|
|
+ myExtender.CloseExtender();
|
|
|
currentCommand.commandType = OxfordCommand.Exit;
|
|
|
startEvent.Set();
|
|
|
}
|
|
|
@@ -506,13 +515,17 @@ namespace Extender
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ public Boolean SaveXrayImageandExcel(string sPath)
|
|
|
+ {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
}
|
|
|
public class Extender : IExtenderControl
|
|
|
- {
|
|
|
-
|
|
|
-
|
|
|
- //构造函数
|
|
|
- public Extender()
|
|
|
+ {
|
|
|
+
|
|
|
+ //构造函数
|
|
|
+ public Extender()
|
|
|
{
|
|
|
InitMicroscopeController();
|
|
|
InitImageAcquisition();
|
|
|
@@ -527,6 +540,7 @@ namespace Extender
|
|
|
CloaseXrayAcquistion();
|
|
|
}
|
|
|
|
|
|
+ private IEdSpectrum edSpectrum;
|
|
|
#region 电镜控制、样品台
|
|
|
//控制电镜
|
|
|
private IMicroscopeController microscopeController = null;
|
|
|
@@ -1509,7 +1523,7 @@ namespace Extender
|
|
|
edSpectrumAcquisitionController.EndMultipleAcquisition();
|
|
|
}
|
|
|
|
|
|
- IEdSpectrum edSpectrum = e.Value;
|
|
|
+ edSpectrum = e.Value;
|
|
|
|
|
|
if (!ReadXrayData(edSpectrum, out m_XrayData, XRayChannelLength))
|
|
|
{
|
|
|
@@ -1762,5 +1776,13 @@ namespace Extender
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
+ public Boolean SaveXrayImageandExcel(string sPath)
|
|
|
+ {
|
|
|
+
|
|
|
+ SpectrumView control_Spectrumview = new SpectrumView(edSpectrum);
|
|
|
+ control_Spectrumview.ExportTiff(sPath);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|