Correct image scaling

Author: HastingsGreer

include/IntersonArrayCxxImagingContainer.h

@@ -80,6 +80,7 @@ class IntersonArrayCxx_EXPORT Container
     OTHER_ERROR
   };
 
+  //widthScan and heightScan are the size of the final converted image
   ScanConverterError HardInitScanConverter( int depth, int widthScan,
     int heightScan, int steering, int depthCfm );
 
@@ -118,6 +119,8 @@ class IntersonArrayCxx_EXPORT Container
 
   void SetHWControls(IntersonArrayCxx::Controls::HWControls * controls);
 
+  //Converts an array of b-mode transducer responses into an undistorted
+  //2-D image of size widthScan, heightScan.
   void Build2D(PixelType * bmode_bytedata, PixelType * image_out);
 
 private:

src/IntersonArrayCxxImagingContainer.cxx

@@ -246,7 +246,8 @@ class ContainerImpl
   Container::ScanConverterError HardInitScanConverter( int depth,
     int widthScan, int heightScan, int steering, int depthCfm )
   {
-    
+    this->widthScan = widthScan;
+    this->heightScan = heightScan;
     return static_cast< Container::ScanConverterError >(
       WrappedScanConverter->HardInitScanConverter( depth, widthScan,
         heightScan, steering, depthCfm, WrappedCapture.get(),
@@ -337,8 +338,6 @@ class ContainerImpl
     ContainerImpl::ArrayType^ bmode_bytedata_array =
       gcnew ArrayType( Container::NBOFLINES, Container::MAX_SAMPLES );
 
-    int IMAGE_SIZE = 512; // This should be a parameter, however I am working on setting Image Scaling first
-
     for ( int ii = 0; ii < Container::NBOFLINES; ++ii )
       {
       for ( int jj = 0; jj < Container::MAX_SAMPLES; ++jj )
@@ -349,18 +348,18 @@ class ContainerImpl
       }
 
     System::Drawing::Bitmap^ image =
-      gcnew System::Drawing::Bitmap(IMAGE_SIZE, IMAGE_SIZE, System::Drawing::Imaging::PixelFormat::Format8bppIndexed);
+      gcnew System::Drawing::Bitmap(widthScan, heightScan, System::Drawing::Imaging::PixelFormat::Format8bppIndexed);
     WrappedImageBuilding->Build2D(image, bmode_bytedata_array, bmode_bytedata_array, WrappedScanConverter.get());
-    System::Drawing::Imaging::BitmapData^ bmpData = image->LockBits(System::Drawing::Rectangle(0, 0, IMAGE_SIZE, IMAGE_SIZE),
+    System::Drawing::Imaging::BitmapData^ bmpData = image->LockBits(System::Drawing::Rectangle(0, 0, widthScan, heightScan),
       System::Drawing::Imaging::ImageLockMode::ReadOnly,
       System::Drawing::Imaging::PixelFormat::Format8bppIndexed);
 
-    char* row = (char*) reinterpret_cast<char*>(bmpData->Scan0.ToPointer());
-    for ( int ii = 0; ii < IMAGE_SIZE; ++ii )
+    char* row = reinterpret_cast<char*>(bmpData->Scan0.ToPointer());
+    for ( int ii = 0; ii < widthScan; ++ii )
       {
-      for ( int jj = 0; jj < IMAGE_SIZE; ++jj )
+      for ( int jj = 0; jj < heightScan; ++jj )
         {
-          image_out[IMAGE_SIZE * ii + jj] = row[jj];
+          image_out[widthScan * jj + ii] = row[jj];
         }
       row += bmpData->Stride;
       }
@@ -372,6 +371,7 @@ class ContainerImpl
   //
 
 private:
+  int widthScan, heightScan;
   IntersonArrayCxx::Controls::HWControls * hwControls;
   msclr::auto_gcroot< IntersonArray::Imaging::ScanConverter ^ >
     WrappedScanConverter;