ENH: Change API to support ArraySDK2.12 (#19)

Author: aylward

app/AcquireIntersonArrayBMode.cxx

@@ -122,19 +122,20 @@ int main( int argc, char * argv[] )
   hwControls.DisableHardButton();
 
   ContainerType container;
-  container.AbortScan();
   container.SetRFData( false );
 
   const int height = hwControls.GetLinesPerArray();
   const int width = container.MAX_SAMPLES;
   const int depth = 100;
+  const int depthCfm = 50;
   if( hwControls.ValidDepth( depth ) == depth )
     {
     ContainerType::ScanConverterError converterErrorIdle =
       container.IdleInitScanConverter( depth, width, height, probeId,
-        steering, false, false, 0 );
+        steering, depthCfm, false, false, 0, false );
     ContainerType::ScanConverterError converterError =
-      container.HardInitScanConverter( depth, width, height, steering );
+      container.HardInitScanConverter( depth, width, height, steering,
+        depthCfm );
     if( converterError != ContainerType::SUCCESS )
       {
       std::cerr << "Error during hard scan converter initialization: "
@@ -203,7 +204,6 @@ int main( int argc, char * argv[] )
   hwControls.StopAcquisition();
   container.StopReadScan();
   Sleep( 100 ); // "time to stop"
-  container.DisposeScan();
 
   typedef itk::ImageFileWriter< ImageType > WriterType;
   WriterType::Pointer writer = WriterType::New();

app/AcquireIntersonArrayRF.cxx

@@ -130,14 +130,15 @@ int main( int argc, char * argv[] )
   const double ns = ContainerType::MAX_RFSAMPLES; // number of samples
   const double fs = 30000; // [kHz]=[samples/ms] - sampling frequency
   const double depth = sos * ( ns - 1 ) / ( 2 * fs );
+  const double depthCfm = depth/2;
   std::cout << "Depth: " << depth << "mm" << std::endl;
 
-  container.AbortScan();
   container.SetRFData( true );
 
   container.IdleInitScanConverter( depth, width_samples, height_lines, probeId,
-      steering, false, false, 0 );
-  container.HardInitScanConverter( depth, width_samples, height_lines, steering );
+      steering, depthCfm, false, false, 0, false );
+  container.HardInitScanConverter( depth, width_samples, height_lines, steering,
+      depthCfm );
 
   ImageType::Pointer image = ImageType::New();
   typedef ImageType::RegionType RegionType;
@@ -188,7 +189,6 @@ int main( int argc, char * argv[] )
   hwControls.StopAcquisition();
   container.StopReadScan();
   Sleep( 100 ); // "time to stop"
-  container.DisposeScan();
 
   typedef itk::ImageFileWriter< ImageType > WriterType;
   WriterType::Pointer writer = WriterType::New();

include/IntersonArrayCxxImagingContainer.h

@@ -81,11 +81,11 @@ class IntersonArrayCxx_EXPORT Container
   };
 
   ScanConverterError HardInitScanConverter( int depth, int widthScan,
-    int heightScan, int steering );
+    int heightScan, int steering, int depthCfm );
 
   ScanConverterError IdleInitScanConverter( int depth, int width,
-    int height, short idleId, int idleSteering, bool idleDoubler,
-    bool idleCompound, int idleCompoundAngle );
+    int height, short idleId, int idleSteering, int depthCfm, bool idleDoubler,
+    bool idleCompound, int idleCompoundAngle, bool idleCfm );
 
   //
   // Begin Capture Methods
@@ -100,10 +100,6 @@ class IntersonArrayCxx_EXPORT Container
 
   bool GetScanOn() const;
 
-  void AbortScan();
-
-  void DisposeScan();
-
   void StartReadScan();
 
   void StartRFReadScan();

src/IntersonArrayCxxImagingContainer.cxx

@@ -243,23 +243,23 @@ class ContainerImpl
   }
 
   Container::ScanConverterError HardInitScanConverter( int depth,
-    int widthScan, int heightScan, int steering )
+    int widthScan, int heightScan, int steering, int depthCfm )
   {
 
     return static_cast< Container::ScanConverterError >(
       WrappedScanConverter->HardInitScanConverter( depth, widthScan,
-        heightScan, steering, WrappedCapture.get(),
+        heightScan, steering, depthCfm, WrappedCapture.get(),
         WrappedImageBuilding.get() ) );
   }
 
   Container::ScanConverterError IdleInitScanConverter( int depth,
-    int widthScan, int heightScan, short idleId, int idleSteering,
-    bool idleDoubler, bool idleCompound, int idleCompoundAngle )
+    int widthScan, int heightScan, short idleId, int idleSteering, int depthCfm,
+    bool idleDoubler, bool idleCompound, int idleCompoundAngle, bool idleCfm )
   {
     return static_cast< Container::ScanConverterError >(
       WrappedScanConverter->IdleInitScanConverter( depth, widthScan,
-        heightScan, idleId, idleSteering, idleDoubler, idleCompound,
-        idleCompoundAngle, WrappedImageBuilding.get() ) );
+        heightScan, idleId, idleSteering, depthCfm, idleDoubler, idleCompound,
+        idleCompoundAngle, idleCfm, WrappedImageBuilding.get() ) );
   }
 
   // 
@@ -302,16 +302,6 @@ class ContainerImpl
     return WrappedCapture->ScanOn;
   }
 
-  void AbortScan()
-  {
-    WrappedCapture->AbortScan();
-  }
-
-  void DisposeScan()
-  {
-    WrappedCapture->DisposeScan();
-  }
-
   void StartReadScan()
   {
     WrappedCapture->StartReadScan( (ArrayType ^)Buffer );
@@ -460,21 +450,22 @@ ::GetZeroOfYScale() const
 Container::ScanConverterError
 Container
 ::HardInitScanConverter( int depth, int widthScan, int heightScan,
-  int steering )
+  int steering, int depthCfm )
 {
   return Impl->HardInitScanConverter( depth, widthScan, heightScan,
-    steering );
+    steering, depthCfm );
 }
 
 
 Container::ScanConverterError
 Container
 ::IdleInitScanConverter( int depth, int width, int height, short idleId,
-  int idleSteering, bool idleDoubler, bool idleCompound,
-  int idleCompoundAngle )
+  int idleSteering, int depthCfm, bool idleDoubler, bool idleCompound,
+  int idleCompoundAngle, bool idleCfm )
 {
   return Impl->IdleInitScanConverter( depth, width, height, idleId,
-    idleSteering, idleDoubler, idleCompound, idleCompoundAngle );
+    idleSteering, depthCfm, idleDoubler, idleCompound, idleCompoundAngle,
+    idleCfm );
 }
 
 //
@@ -518,22 +509,6 @@ ::GetScanOn() const
 }
 
 
-void
-Container
-::AbortScan()
-{
-  Impl->AbortScan();
-}
-
-
-void
-Container
-::DisposeScan()
-{
-  Impl->DisposeScan();
-}
-
-
 void
 Container
 ::StartReadScan()

test/IntersonArrayCxxControlsHWControlsTest.cxx

@@ -38,16 +38,18 @@ int main( int argc, char * argv[] )
     FoundProbesType;
   FoundProbesType foundProbes;
   hwControls.FindAllProbes( foundProbes );
+  std::cout << "Number of probes = " << foundProbes.size() << std::endl;
+  if( foundProbes.empty() )
+    {
+    std::cerr << "No probes found. Please connect a probe for tests."
+      << std::endl;
+    return EXIT_FAILURE;
+    }
   std::cout << "Found Probes: " << std::endl;
   for( size_t ii = 0; ii < foundProbes.size(); ++ii )
     {
     std::cout << "    " << foundProbes[ii] << std::endl;
     }
-  if( foundProbes.empty() )
-    {
-    std::cerr << "Could not find the probe." << std::endl;
-    return EXIT_FAILURE;
-    }
 
   hwControls.FindMyProbe( 0 );
   const short probeId = hwControls.GetProbeID();

test/IntersonArrayCxxImagingContainerTest.cxx

@@ -65,25 +65,25 @@ int main( int argc, char * argv[] )
   const int height = 512; 
 
   int steering = 0;
+  int depthCfm = 50;
   ContainerType::ScanConverterError converterError =
     container.IdleInitScanConverter( depth, width, height, probeId,
-    steering, false, false, 0 );
+    steering, depthCfm, false, false, 0, false );
   if( converterError != ContainerType::SUCCESS )
     {
     std::cerr << "Error during idle scan converter initialization: "
               << converterError << std::endl;
     return EXIT_FAILURE;
     }
   converterError = container.HardInitScanConverter( depth, width,
-    height, steering );
+    height, steering, depthCfm );
   if( converterError != ContainerType::SUCCESS )
     {
     std::cerr << "Error during hard scan converter initialization: "
               << converterError << std::endl;
     return EXIT_FAILURE;
     }
 
-  container.AbortScan();
   std::cout << "\nStarting BMode scanning..." << std::endl;
   container.StartReadScan();
   Sleep( 100 ); // "time to start"
@@ -99,7 +99,6 @@ int main( int argc, char * argv[] )
   hwControls.StopAcquisition();
   container.StopReadScan();
   Sleep( 100 ); // "time to stop"
-  container.DisposeScan();
 
   return EXIT_SUCCESS;
 }