Prechádzať zdrojové kódy

remove some useless commented code

gsp 1 rok pred
rodič
commit
2b075d0764

+ 1 - 12
OTSCPP/OTSImagePro/OTSImageProcess.cpp

@@ -16,21 +16,10 @@ namespace OTSIMGPROC
 {
 	using namespace cv;
 	using namespace std;
-	
-	// Re-magnification
-	const int nImage_Size = 3;
 
-	//make matrix filled with 255 
 	const int nBlackColor = 255;
 
-	//make binary processing parameter 128 
-	const int nProcessParam = 100;
-
-	//picture size
-	const int nPictureSize = 128;
-
-	// added to filtered pixels
-	const double delta = 0;
+	
 
 	
 

+ 3 - 5
OTSIncAMeasureApp/1-OTSMeasure/Measure/3-MeasureFlow/CSmplMsrResult.cs

@@ -1,10 +1,8 @@
-using OTSCLRINTERFACE;
+
 using OTSDataType;
-using OTSModelSharp.ServiceCenter;
-using System;
-using System.Collections.Generic;
+
 using System.IO;
-using System.Windows.Forms;
+
 using System.Xml;
 
 namespace OTSModelSharp

+ 1 - 85
OTSIncAMeasureApp/1-OTSMeasure/Measure/DBDataTransition/MergedParticles/MergeParticleDB.cs

@@ -90,91 +90,7 @@ namespace OTSModelSharp
 		return true;
 	}
 
-     //public   bool GetAllFieldsRecord(ref List<COTSField> allFlds)
-     //   {
-     //       var allRecords = this.GetQueryOfAllRecord();
-     //       Dictionary<int,COTSField> mapFld = new Dictionary<int,COTSField>();
-     //       for (int i = 0; i < allRecords.Rows.Count; i++)
-     //       {
-     //           int curFldId = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_FIELD_ID][0];             
-                
-     //           if (!mapFld.Keys.Contains(curFldId))
-     //           {
-     //              COTSField fld = new COTSField();
-
-                   
-     //               fld.SetId((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_FIELD_ID][0]);
-     //               System.Drawing.Point fldPos = new System.Drawing.Point();
-                    
-     //               fldPos.X = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_FldPosX][0];
-     //               fldPos.Y = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_FldPosY][0];
-     //               fld.SetOTSPosition(fldPos);
-     //               List< COTSParticleClr> ps = fld.GetListAnalysisParticles();
-     //               COTSParticleClr p = new COTSParticleClr();
-                   
-     //               p.SetParticleId((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_PARTICLE_ID][0]);
-     //               p.SetClassifyId((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_INCA_ID][0]);
-     //               int top = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_RECT_TOP][0];
-     //               int left = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_RECT_LEFT][0];
-     //               int width = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_RECT_WIDTH][0];
-     //               int height = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_RECT_HEIGHT][0];
-
-     //               Rectangle r = new Rectangle(left, top, width,  height);
-     //               p.SetParticleRect(r);
-                   
-     //               p.SetAveGray(Convert.ToByte(allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_AVE_GRAY][0]));
-     //               p.SetActualArea((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_AREA][0]);
-     //               p.SetAnalysisId((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_XRAY_ID][0]);
-     //               //p.SetDMax((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DMAX][0]);
-     //               //p.SetDMin((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DMIN][0]);
-     //               //p.SetDPerp((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DPERP][0]);
-     //               //p.SetDInscr((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DINSCR][0]);
-     //               //p.SetDMean((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DMEAN][0]);
-     //               //p.SetDElong((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DELONG][0]);
-     //               //p.SetPerimeter((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_PERIMETER][0]);
-     //               //p.SetOrientation((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_ORIENTATION][0]);
-     //               //p.TypeName(allRecords.Rows[(int)CMergeParticleTable.ColumnID.S_NAME][0].ToString());
-     //               //p.TypeColor(allRecords.Rows[(int)CMergeParticleTable.ColumnID.S_COLOR][0].ToString());
-     //               ps.Add(p);
-     //               allFlds.Add(fld);
-     //               mapFld[curFldId] = fld;
-     //           }
-     //           else
-     //           {
-     //              COTSField  fld = mapFld[curFldId];
-     //               List< COTSParticleClr>  ps = fld.GetListAnalysisParticles();
-     //               COTSParticleClr p = new COTSParticleClr();
-     //               p.SetFieldId(fld.GetId());
-
-     //               p.SetParticleId((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_PARTICLE_ID][0]);
-     //               p.SetClassifyId((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_INCA_ID][0]);
-     //               int top = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_RECT_TOP][0];
-     //               int left = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_RECT_LEFT][0];
-     //               int width = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_RECT_WIDTH][0];
-     //               int height = (int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_RECT_HEIGHT][0];
-     //               Rectangle r = new Rectangle(left, top,  width,  height);
-     //               p.SetParticleRect(r);
-                   
-     //               p.SetAveGray(Convert.ToByte(allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_AVE_GRAY][0]));
-     //               p.SetActualArea((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_AREA][0]);
-     //               p.SetAnalysisId((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.N_XRAY_ID][0]);
-     //               //p.SetDMax((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DMAX][0]);
-     //               //p.SetDMin((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DMIN][0]);
-     //               //p.SetDPerp((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DPERP][0]);
-     //               //p.SetDInscr((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DINSCR][0]);
-     //               //p.SetDMean((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DMEAN][0]);
-     //               //p.SetDElong((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_DELONG][0]);
-     //               //p.SetPerimeter((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_PERIMETER][0]);
-     //               //p.SetOrientation((int)allRecords.Rows[(int)CMergeParticleTable.ColumnID.F_ORIENTATION][0]);
-     //               //p.TypeName(allRecords.Rows[(int)CMergeParticleTable.ColumnID.S_NAME][0].ToString());
-     //               //p.TypeColor(allRecords.Rows[(int)CMergeParticleTable.ColumnID.S_COLOR][0].ToString());
-     //               ps.Add(p);
-     //           }
-     //           allRecords.NewRow();
-     //       };
-     //       allRecords.Clear();
-     //       return true;
-     //   }
+   
 
       public   DataTable GetQueryOfAllRecord()
         {