Browse Source

修改导出execl的行高和列宽

CXS 3 năm trước cách đây
mục cha
commit
d6ed986dac

+ 0 - 36
ClassificationEngine/Win32/include/IClassifyEngine.h

@@ -1,36 +0,0 @@
-#pragma once
-#include <string>
-#include "OTSParticle.h"
-#include "PosXrayInfo.h"
-#include <PosXray.h>
-namespace OTSClassifyEngine
-{
-
-using std::string;
-using namespace OTSDATA;
-//define interface
-class __declspec(dllexport) IClassifyEngine
-{
-public:
-	IClassifyEngine()  //³ÉÔ±Áбí³õʼ»¯²ÎÊý
-	{};
-	virtual ~IClassifyEngine() {};
-	virtual bool Init() = 0;//
-	//virtual bool ClassifyByXrayInfo(COTSParticlePtr particle, CPosXrayInfoPtr xrayInfo) = 0;//
-	virtual bool Classify(COTSParticlePtr particle, CPosXrayPtr xray) = 0;//
-
-	virtual bool Classify(COTSParticlePtr particle,int SteelTech, CPosXrayPtr xray) = 0;//
-	virtual bool IfNeedMaxEDS(COTSParticlePtr particle, CPosXrayPtr xray, double& MaxEDSTime) = 0;
-
-};
-
-
-
-typedef  std::shared_ptr<IClassifyEngine> __declspec(dllexport) CLEEnginePtr;
-
-__declspec(dllexport) CLEEnginePtr GetInclutionEngine();//will be initialized at the first time.and it's a singleton object.
-__declspec(dllexport) CLEEnginePtr GetParticleEngine(std::string libName);//will be initialized at the first time.and it's a singleton object.
-__declspec(dllexport) CLEEnginePtr GetCurveCompareEngine(std::string libName);//will be initialized at the first time.and it's a singleton object.
-}
-
-

+ 3 - 1
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -1830,13 +1830,14 @@ namespace OTSIncAReportGrids
 
                 //设置颗粒名列宽
                 sheet.SetColumnWidth(1, 30 * 256);//夹杂物名列宽
-                sheet.SetColumnWidth(2, 3 * 256);//图像列宽
+                sheet.SetColumnWidth(2, 7 * 256);//图像列宽
 
                 IRow row;
                 ICell cell;
 
                 //插入表头
                 row = sheet.CreateRow(1);//从第15行添加一行
+                row.Height = 30 * 20;
                 for (int i_cell = 0; i_cell < dgV_ParticlesDevidePage.Columns.Count; i_cell++)
                 {
                     cell = row.CreateCell(i_cell);
@@ -1850,6 +1851,7 @@ namespace OTSIncAReportGrids
                 for (int i_row = 0; i_row < dgV_ParticlesDevidePage.Rows.Count; i_row++)
                 {
                     row = sheet.CreateRow(2 + i_row);
+                    row.Height = 45 * 20;
                     for (int i_cell = 0; i_cell < dgV_ParticlesDevidePage.Columns.Count; i_cell++)
                     {
                         cell = row.CreateCell(i_cell);