Merge branch 'Release2.3' into GSP

OTSCPP/OTSControl/OTSControl.vcxproj

@@ -115,7 +115,7 @@
     <IntDir>$(SolutionDir)\Obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <OutDir>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\</OutDir>
     <IncludePath>$(SolutionDir)\OTSCPP\OTSControl;$(SolutionDir)OTSCPP\OTSData;$(SolutionDir)OTSCPP\Tools;$(SolutionDir)OTSCPP\OTSLog;$(IncludePath)</IncludePath>
-    <ReferencePath>$(SolutionDir)OTSCPP\OpenDll\OxfordApiDll;$(ReferencePath)</ReferencePath>
+    <ReferencePath>$(SolutionDir)OTSCPP\OpenDll\OxfordApi50Dll;$(ReferencePath)</ReferencePath>
     <LibraryPath>$(SolutionDir)\Bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_oxford50|x64'">
@@ -404,7 +404,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="OINA.Extender">
-      <HintPath>..\..\..\..\OTS2_0\OTS\OTS\OTSCPP\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
+      <HintPath>..\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

OTSCPP/OTSImagePro/OTSImageProcess.cpp

@@ -1365,18 +1365,23 @@ namespace OTSIMGPROC
 					}
 					COTSParticleList roiParts;
 					
-					GetOneParticleFromROI(rectMax.x, rectMax.y, rectMax.width, rectMax.height, imageROI.data, roiParts);
-					if (roiParts.size()>0)
+					if (GetOneParticleFromROI(rectMax.x, rectMax.y, rectMax.width, rectMax.height, imageROI.data, roiParts))
 					{
-						COTSParticlePtr roiPart = roiParts[0];//we will find only one part in the roi.
-						roiPart->SetXRayPos(CPoint(center_x, center_y));
-						CRect r = CRect(x, y, x + w, y + h);
-						roiPart->SetParticleRect(r);
-						roiPart->SetActualArea(actualArea);
-						roiPart->SetPixelArea(area);
-						listParticleOut.push_back(roiPart);
+						if (roiParts.size() > 0)
+						{
+							COTSParticlePtr roiPart = roiParts[0];//we will find only one part in the roi.
+							roiPart->SetXRayPos(CPoint(center_x, center_y));
+							CRect r = CRect(x, y, x + w, y + h);
+							roiPart->SetParticleRect(r);
+							roiPart->SetActualArea(actualArea);
+							roiPart->SetPixelArea(area);
+							listParticleOut.push_back(roiPart);
+						}
+
+
 					}
 					
+					
 				  }
 
 			}

OpenDll/OxfordApi50Dll/OINA.Extender.Service.exe.config

@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.serviceModel>
+    <diagnostics>
+      <messageLogging logMalformedMessages="false" logMessagesAtServiceLevel="false" logMessagesAtTransportLevel="false"/>
+    </diagnostics>
+    <bindings>
+      <netTcpBinding>
+        <binding name="unsecuredTcpBinding" hostNameComparisonMode="StrongWildcard" portSharingEnabled="false" maxReceivedMessageSize="1048576" maxBufferSize="1048576" maxBufferPoolSize="1048576" receiveTimeout="infinite">
+          <security mode="None">
+            <transport clientCredentialType="None" protectionLevel="None"/>
+            <message clientCredentialType="None"/>
+          </security>
+        </binding>
+      </netTcpBinding>
+    </bindings>
+    <behaviors>
+      <serviceBehaviors>
+        <behavior name="metadataSupport">
+          <serviceThrottling maxConcurrentCalls="1000" maxConcurrentSessions="1000" maxConcurrentInstances="1000"/>
+          <serviceMetadata/>
+        </behavior>
+      </serviceBehaviors>
+    </behaviors>
+    <services>
+      <service behaviorConfiguration="metadataSupport" name="OINA.Extender.Server.ExtenderControlServer">
+        <endpoint address="net.tcp://localhost:8733/Remote/Server" binding="netTcpBinding" bindingConfiguration="unsecuredTcpBinding" name="RemoteControlServer" contract="OINA.Extender.Server.Interfaces.IExtenderControl"/>
+        <endpoint address="net.tcp://localhost:8733/Remote/Server/mex" binding="mexTcpBinding" name="RemoteControlServerMex" contract="IMetadataExchange"/>
+      </service>
+    </services>
+  </system.serviceModel>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+  </startup>
+  <appSettings>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+  </appSettings>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>