Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -828,6 +828,7 @@
 	  <Control name="DataSourceType" text="数据源类型" />
 	  <Control name="InclusionAreaRatio" text="颗粒面积比" />
 	  <Control name="IncaAreascale" text="颗粒面积比" />
+	  
     </Controls>
  </Form>
  <Form>

OTS.sln

@@ -467,6 +467,12 @@ Global
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|x64.Build.0 = Debug|x64
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Debug|x86.Build.0 = Debug|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.LithiumCleanness|Any CPU.ActiveCfg = LithiumCleanness|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.LithiumCleanness|Any CPU.Build.0 = LithiumCleanness|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.LithiumCleanness|x64.ActiveCfg = LithiumCleanness|x64
+		{3B7695AA-8231-45AC-B493-84390A945D02}.LithiumCleanness|x64.Build.0 = LithiumCleanness|x64
+		{3B7695AA-8231-45AC-B493-84390A945D02}.LithiumCleanness|x86.ActiveCfg = LithiumCleanness|Any CPU
+		{3B7695AA-8231-45AC-B493-84390A945D02}.LithiumCleanness|x86.Build.0 = LithiumCleanness|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford50|Any CPU.ActiveCfg = Release_oxford50|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford50|Any CPU.Build.0 = Release_oxford50|Any CPU
 		{3B7695AA-8231-45AC-B493-84390A945D02}.Release_oxford50|x64.ActiveCfg = Release_oxford50|x64

OTSIncAMeasureApp/2-OTSMeasureParamManage/COTSMeasureParam.cs

@@ -165,7 +165,7 @@ namespace OTSMeasureApp
         {
             SpecialRanges = new CSpecialGrayRangeParam();
            
-            if (!SpecialRanges.LoadParam());
+            if (!SpecialRanges.LoadParam())
             {
                 return false;
             }

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -39,14 +39,6 @@ namespace OTSIncAReportGraph.Controls
         //进行选择的矩形范围
        public RectangleF Rect ;
 
-    }
-    public struct ParticleSegmentation
-    {
-        public Point StartPoint;
-        public bool IsParticleSegmentation;
-        public Point EndPoint;
-        public Particle ParticleData;
-
     }
     public enum RightButtonMenu
     { 
@@ -91,7 +83,6 @@ namespace OTSIncAReportGraph.Controls
         double ls_d_cz_height;
         #region 变量定义
         private SelectTool m_SelectTool;
-        private ParticleSegmentation m_ParticleSegmentation;
         //缩放的基数,临时变量
         private float m_Zoom_Base = 0;
 
@@ -668,12 +659,6 @@ namespace OTSIncAReportGraph.Controls
                 }
             }
             #endregion
-            #region //判断是否使用颗粒分割，是的话，那么这里就开始绘制------------------------
-            if (m_ParticleSegmentation.IsParticleSegmentation)
-            {
-                e.Graphics.DrawLine(new Pen(Color.Red), m_ParticleSegmentation.StartPoint.X, m_ParticleSegmentation.StartPoint.Y, m_ParticleSegmentation.EndPoint.X, m_ParticleSegmentation.EndPoint.Y);
-            }
-            #endregion
             #region 绘制网格线，帧图边框部份
             if (true == m_is_showgrid)
             {
@@ -882,10 +867,6 @@ namespace OTSIncAReportGraph.Controls
                   
                     m_SelectTool.StartPoint = e.Location;
                 }
-                else if (m_ParticleSegmentation.IsParticleSegmentation)
-                {
-                    m_ParticleSegmentation.StartPoint= e.Location;
-                }
                 else
                 {
                     bool ifClickOnParticle=false;
@@ -969,13 +950,7 @@ namespace OTSIncAReportGraph.Controls
                     }
                 }
             }
-            else if(m_ParticleSegmentation.IsParticleSegmentation)
-            {
-                if (e.Button == MouseButtons.Left)
-                {
-                    m_ParticleSegmentation.EndPoint = e.Location;
-                }
-            }
+            
             else
             {
                 if (m_isDrag)
@@ -1158,25 +1133,6 @@ namespace OTSIncAReportGraph.Controls
                     m_SelectTool.IsSelecting = false;
 
                 }
-                else if(m_ParticleSegmentation.IsParticleSegmentation)
-                {
-                    m_ParticleSegmentation.EndPoint = e.Location;
-                    GraphicsPath ls_gpath = new GraphicsPath();
-                    //ls_gpath.AddLine(m_ParticleSegmentation.StartPoint.X, m_ParticleSegmentation.StartPoint.Y, m_ParticleSegmentation.EndPoint.X, m_ParticleSegmentation.EndPoint.Y);
-                    //m_ParticleSegmentation.IsParticleSegmentation = false;
-                    DialogResult res = MessageBox.Show("Is it ok?");
-                    if (res == DialogResult.OK)
-                    {
-                        foreach (BaseObject item in m_list_allDPart)
-                        {
-                            DisplayParticle dp = (DisplayParticle)item;
-                            if (ReportFun.WhetherInRange(dp, e.Location))
-                            {
-                                List<Segment> segments = dp.objParticleData.SegmentList;
-                            }
-                        }
-                    }
-                }
                 else
                 {
                     if (m_isDrag)
@@ -1253,7 +1209,6 @@ namespace OTSIncAReportGraph.Controls
 
                         CMenuStrip.Items[(int)RightButtonMenu.ParticleSegmentation].Visible = true;
                         DisplayParticle dp = (DisplayParticle)item;
-                        m_ParticleSegmentation.ParticleData = dp.objParticleData;
                     }
                     if (((DisplayParticle)item).IsSelect)
                     {
@@ -1811,15 +1766,6 @@ namespace OTSIncAReportGraph.Controls
         {
             control_Ruler1.Visible = b_show;
         }
-        /// <summary>
-        /// 颗粒分割
-        /// </summary>
-        public void Particle_Segmentation()
-        {
-            m_ParticleSegmentation.IsParticleSegmentation = true;
-            m_ParticleSegmentation.StartPoint = new Point();
-            m_ParticleSegmentation.EndPoint = new Point();
-        }
 
         /// <summary>
         /// 是否进行矩形多选操作
@@ -2132,16 +2078,5 @@ namespace OTSIncAReportGraph.Controls
             }
            
         }
-        int GetsIntersectionOfTheIntercepts(Point P1,Point P2,int y)
-        {
-            int x = (y - P1.Y * P2.X + P1.X * P2.Y) / (P2.Y - P1.Y);
-            return x;
-        }
-
-        private void ParticleSegmentation_Click(object sender, EventArgs e)
-        {
-            Particle_Segmentation();
-        }
-      
     }
 }

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.designer.cs

@@ -35,7 +35,6 @@
             this.toolStripMenuItem_copyimage = new System.Windows.Forms.ToolStripMenuItem();
             this.ExportoriginalspliceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripMenuItemDelete_Particle = new System.Windows.Forms.ToolStripMenuItem();
-            this.ParticleSegmentation = new System.Windows.Forms.ToolStripMenuItem();
             this.CMenuStrip.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -47,8 +46,7 @@
             this.ToolStripMenuItem_movesempoint,
             this.toolStripMenuItem_copyimage,
             this.ExportoriginalspliceToolStripMenuItem,
-            this.ToolStripMenuItemDelete_Particle,
-            this.ParticleSegmentation});
+            this.ToolStripMenuItemDelete_Particle});
             this.CMenuStrip.Name = "contextMenuStrip1";
             this.CMenuStrip.Size = new System.Drawing.Size(219, 154);
             // 
@@ -90,17 +88,7 @@
             this.ToolStripMenuItemDelete_Particle.Size = new System.Drawing.Size(218, 30);
             this.ToolStripMenuItemDelete_Particle.Text = "Delete particles";
             this.ToolStripMenuItemDelete_Particle.Click += new System.EventHandler(this.ToolStripMenuItemDelete_Particle_Click);
-            // 
-            // ParticleSegmentation
-            // 
-
-
-
-
-            this.ParticleSegmentation.Name = "ParticleSegmentation";
-            this.ParticleSegmentation.Size = new System.Drawing.Size(253, 30);
-            this.ParticleSegmentation.Text = "分割颗粒";
-            this.ParticleSegmentation.Click += new System.EventHandler(this.ParticleSegmentation_Click);
+           
             // 
             // Control_DrawDistrbutionImageAndBSE
             // 
@@ -125,6 +113,5 @@
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_copyimage;
         private System.Windows.Forms.ToolStripMenuItem ExportoriginalspliceToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemDelete_Particle;
-        private System.Windows.Forms.ToolStripMenuItem ParticleSegmentation;
     }
 }

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -429,6 +429,24 @@ namespace OTSIncAReportGrids
             }
             return dtNew;
         }
+        /// <summary>
+        /// DataRow转换为DataTable
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <param name="strWhere">筛选的条件</param>
+        /// <returns></returns>
+        public DataTable SreeenDataTable(DataTable dt, string strWhere)
+        {
+            if (dt.Rows.Count <= 0) return dt;        //当数据为空时返回
+            DataTable dtNew = dt.Clone();         //复制数据源的表结构
+            DataRow[] dr = dt.Select(strWhere);  //strWhere条件筛选出需要的数据！
+            for (int i = 0; i < dr.Length; i++)
+            {
+                dtNew.Rows.Add(dr[i].ItemArray);  // 将DataRow添加到DataTable中
+            }
+            return dtNew;
+        }
+
         /// <summary>
         /// 传入单颗颗粒的particle类对象,返回从field中抠取出的bitmap对象,抠取单颗颗粒
         /// </summary>

OTSIncAReportApp/1-UI/OTSRibbon/OTSRibbonFun.cs

@@ -41,7 +41,6 @@ namespace OTSIncAReportApp.OTSRibbon
             m_ReportApp.rbFrame.Enabled = bRibState;            //帧图边框，ribbon中
             m_ReportApp.rbStaff.Enabled = bRibState;            //标尺，ribbon中
             m_ReportApp.rbRenew.Enabled = bRibState;            //恢复,ribbon中
-            m_ReportApp.rbParticleSegmentation.Enabled = bRibState;            //颗粒分割,ribbon中
         }
 
         /// <summary>

OTSIncAReportApp/1-UI/frmReportApp.Designer.cs

@@ -56,6 +56,7 @@
             this.dpbOpen = new System.Windows.Forms.RibbonOrbMenuItem();
             this.dpbExport = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbonOrbMenuItem_Extremum = new System.Windows.Forms.RibbonOrbMenuItem();
+            this.Backup = new System.Windows.Forms.RibbonOrbMenuItem();
             this.ribbonOrbOptionButton1 = new System.Windows.Forms.RibbonOrbOptionButton();
             this.ribbonOrbRecentItem1 = new System.Windows.Forms.RibbonOrbRecentItem();
             this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
@@ -68,7 +69,6 @@
             this.rbCircular = new System.Windows.Forms.RibbonButton();
             this.rbRectangle = new System.Windows.Forms.RibbonButton();
             this.rbCancel = new System.Windows.Forms.RibbonButton();
-            this.rbParticleSegmentation = new System.Windows.Forms.RibbonButton();
             this.rbMenu = new System.Windows.Forms.RibbonTab();
             this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
             this.rbFrame = new System.Windows.Forms.RibbonButton();
@@ -86,7 +86,6 @@
             this.ribbonOrbMenuItem7 = new System.Windows.Forms.RibbonOrbMenuItem();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.ribbonButton3 = new System.Windows.Forms.RibbonButton();
-            this.Backup = new System.Windows.Forms.RibbonOrbMenuItem();
             ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -159,7 +158,6 @@
             this.rbOpen.DropDownArrowSize = new System.Drawing.Size(5, 3);
             this.rbOpen.DropDownItems.Add(this.ribbonButton1);
             this.rbOpen.Image = global::OTSIncAReportApp.Properties.Resources.open321;
-            this.rbOpen.SmallImage = ((System.Drawing.Image)(resources.GetObject("rbOpen.SmallImage")));
             this.rbOpen.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
             this.rbOpen.Tag = "rbOpen";
             this.rbOpen.Text = "打开";
@@ -186,7 +184,7 @@
             // 
             this.ribbon1.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.ribbon1.Location = new System.Drawing.Point(0, 0);
-            this.ribbon1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.ribbon1.Margin = new System.Windows.Forms.Padding(5, 2, 5, 2);
             this.ribbon1.Minimized = false;
             this.ribbon1.Name = "ribbon1";
             // 
@@ -214,7 +212,7 @@
             this.ribbon1.QuickAcessToolbar.ToolTip = null;
             this.ribbon1.QuickAcessToolbar.ToolTipImage = null;
             this.ribbon1.QuickAcessToolbar.ToolTipTitle = null;
-            this.ribbon1.Size = new System.Drawing.Size(1701, 130);
+            this.ribbon1.Size = new System.Drawing.Size(2268, 130);
             this.ribbon1.TabIndex = 0;
             this.ribbon1.Tabs.Add(this.ribbonTab1);
             this.ribbon1.Tabs.Add(this.rbMenu);
@@ -266,6 +264,21 @@
             this.ribbonOrbMenuItem_Extremum.ToolTipTitle = null;
             this.ribbonOrbMenuItem_Extremum.Click += new System.EventHandler(this.ribbonOrbMenuItem_Extremum_Click);
             // 
+            // Backup
+            // 
+            this.Backup.AltKey = null;
+            this.Backup.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
+            this.Backup.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.Backup.Image = ((System.Drawing.Image)(resources.GetObject("Backup.Image")));
+            this.Backup.SmallImage = ((System.Drawing.Image)(resources.GetObject("Backup.SmallImage")));
+            this.Backup.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.Backup.Tag = null;
+            this.Backup.Text = "Backup Database";
+            this.Backup.ToolTip = null;
+            this.Backup.ToolTipImage = null;
+            this.Backup.ToolTipTitle = null;
+            this.Backup.Click += new System.EventHandler(this.Backup_Click);
+            // 
             // ribbonOrbOptionButton1
             // 
             this.ribbonOrbOptionButton1.AltKey = null;
@@ -358,7 +371,6 @@
             this.rbChoiceTools.Items.Add(this.rbCircular);
             this.rbChoiceTools.Items.Add(this.rbRectangle);
             this.rbChoiceTools.Items.Add(this.rbCancel);
-            this.rbChoiceTools.Items.Add(this.rbParticleSegmentation);
             this.rbChoiceTools.Tag = null;
             this.rbChoiceTools.Text = "选择工具";
             // 
@@ -424,21 +436,6 @@
             // 
             // rbMenu
             // 
-            this.rbParticleSegmentation.AltKey = null;
-            this.rbParticleSegmentation.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
-            this.rbParticleSegmentation.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.rbParticleSegmentation.Image = global::OTSIncAReportApp.Properties.Resources.cut;
-            this.rbParticleSegmentation.SmallImage = global::OTSIncAReportApp.Properties.Resources.cut16;
-            this.rbParticleSegmentation.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.rbParticleSegmentation.Tag = "rbParticleSegmentation";
-            this.rbParticleSegmentation.Text = "颗粒分割";
-            this.rbParticleSegmentation.ToolTip = "rbParticleSegmentation";
-            this.rbParticleSegmentation.ToolTipImage = null;
-            this.rbParticleSegmentation.ToolTipTitle = null;
-            this.rbParticleSegmentation.Click += new System.EventHandler(this.rbParticleSegmentation_Click);
-            // 
-            // rbMenu
-            // 
             this.rbMenu.Panels.Add(this.ribbonPanel2);
             this.rbMenu.Panels.Add(this.ribbonPanelOthers);
             this.rbMenu.Tag = null;
@@ -554,11 +551,11 @@
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RSGrayVal,
             this.mouseMatter});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 835);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 1051);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(12, 0, 3, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(16, 0, 4, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1701, 30);
+            this.statusStrip1.Size = new System.Drawing.Size(2268, 30);
             this.statusStrip1.TabIndex = 4;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -582,9 +579,9 @@
             this.DockWindowPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DockWindowPanel.DockBackColor = System.Drawing.SystemColors.Control;
             this.DockWindowPanel.Location = new System.Drawing.Point(0, 130);
-            this.DockWindowPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.DockWindowPanel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
             this.DockWindowPanel.Name = "DockWindowPanel";
-            this.DockWindowPanel.Size = new System.Drawing.Size(1701, 705);
+            this.DockWindowPanel.Size = new System.Drawing.Size(2268, 921);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -673,32 +670,17 @@
             this.ribbonButton3.ToolTipImage = null;
             this.ribbonButton3.ToolTipTitle = null;
             // 
-            // Backup
-            // 
-            this.Backup.AltKey = null;
-            this.Backup.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Left;
-            this.Backup.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.Backup.Image = ((System.Drawing.Image)(resources.GetObject("Backup.Image")));
-            this.Backup.SmallImage = ((System.Drawing.Image)(resources.GetObject("Backup.SmallImage")));
-            this.Backup.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.Backup.Tag = null;
-            this.Backup.Text = "Backup Database";
-            this.Backup.ToolTip = null;
-            this.Backup.ToolTipImage = null;
-            this.Backup.ToolTipTitle = null;
-            this.Backup.Click += new System.EventHandler(this.Backup_Click);
-            // 
             // frmReportApp
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1701, 865);
+            this.ClientSize = new System.Drawing.Size(2268, 1081);
             this.Controls.Add(this.DockWindowPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.ribbon1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
-            this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.Margin = new System.Windows.Forms.Padding(5, 2, 5, 2);
             this.Name = "frmReportApp";
             this.Text = "OTSReportApp";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -742,7 +724,6 @@
         public System.Windows.Forms.RibbonButton rbCircular;
         public System.Windows.Forms.RibbonButton rbRectangle;
         public System.Windows.Forms.RibbonButton rbCancel;
-        public System.Windows.Forms.RibbonButton rbParticleSegmentation;
         public System.Windows.Forms.RibbonPanel rbChoiceTools;
         //public System.Windows.Forms.RibbonOrbMenuItem dpbNew;
         public System.Windows.Forms.RibbonOrbMenuItem dpbOpen;

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -1156,31 +1156,6 @@ namespace OTSIncAReportApp
                 MessageBox.Show("Backup failed");
             }
         }
-        private void rbParticleSegmentation_Click(object sender, EventArgs e)
-        {
-            int tabIndex = (int)(m_conditionChoose.tabIndex);
-
-            switch (tabIndex)
-            {
-                case (int)DisplayPicutureType.AnalyzeImg:
-
-                    int imgDisType = m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTS_REPORT_PROP_GRID_ITEMS.IMAGE_DISPLAY_TYPE);
-                    if (imgDisType == 0)
-                    {
-                        if (im_Control_DrawDistrbutionImageAndBSE != null)
-                        {
-                            //分布图
-                            im_Control_DrawDistrbutionImageAndBSE.Particle_Segmentation();
-                        }
-                    }
-                    break;
-                case (int)DisplayPicutureType.AnalyzeDataTable:
-                    break;
-                case (int)DisplayPicutureType.AnalyzeDataChart:
-                    break;
-                default:
-                    break;
-            }
-        }    }
+    }
 }
 

OTSIncAReportApp/2-CommonFunction/CommonClass/Language.cs

@@ -43,7 +43,7 @@ namespace OTSIncAReportApp.SysMgrTools
         //读取默认语言 
         public static string ReadDefaultLanguage()
         {
-            string xmlName = System.Windows.Forms.Application.StartupPath + @"/Resources/XMLData/LanguageDefine.xml";
+            string xmlName = System.Windows.Forms.Application.StartupPath + @"\Resources\XMLData\LanguageDefine.xml";
             XmlReader reader = XmlReader.Create(xmlName);
             XmlDocument doc = new XmlDocument();
             doc.Load(reader);

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1412,7 +1412,7 @@
   <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\OTSCommon\OTSCommon.csproj">
-      <Project>{3B7695AA-8231-45AC-B493-84390A945D02}</Project>
+      <Project>{3b7695aa-8231-45ac-b493-84390a945d02}</Project>
       <Name>OTSCommon</Name>
     </ProjectReference>
     <ProjectReference Include="..\OTSCPP\OTSClrInterface\OTSClrInterface.vcxproj">