Permalink
Browse files

Updated for unreleased version of SDK 6.0.0

Added link to previous SDK version in readme.
  • Loading branch information...
1 parent c592aa0 commit 26944c395ea999ddbd7f700b25b305a8b8a7f786 @ascendedguard committed Oct 31, 2011
View
@@ -9,11 +9,13 @@ The libaries must be compiled against the specific version of the SDK. You can d
**References:**
* Ultrasonix SDK: http://www.ultrasonix.com/sdk
-* Download SDK 5.7.1 (Current): http://www.ultrasonix.com/webfm_send/691
+* Download SDK 6.0.0 (Current): Not Yet Released
-**Notes:**
+**Previous Versions:**
-The current version of the Ultrasonix .NET SDK should be considered an Alpha version. It is, for the most part, untested at this point, and may still contain unimplemented sections of the SDK.
+* [SDK 5.7.1](https://github.com/ascendedguard/Ultrasonix-.NET-SDK/tree/SDK-5.7.1)
+
+**Notes:**
Issues and bugs with the wrapper itself should be reported on Github. Issues with the Ultrasonix SDK itself should be reported to Ultrasonix.
@@ -1,7 +1,7 @@
#pragma once
// Do not edit this file.
-// This file is automatically generated from ImagingModes.xml.
+// This file is automatically generated from modes.xml.
// Any changes will be lost.
//
enum imagingMode
@@ -21,24 +21,19 @@ enum imagingMode
DualColourMode = 9,
DualCompoundMode = 10,
CwMode = 11,
- RfMode = 12,
- ColorSplitMode = 13,
- F4DMode = 14,
- TriplexCwMode = 15,
- ColourMMode = 16,
- ElastoMode = 17,
- SDUVMode = 18,
- AnatomicalMMode = 19,
- ElastoComparativeMode = 20,
- FusionMode = 21,
- VecDopMode = 22,
- BiplaneMode = 23,
- ClinicalRfMode = 24,
- RfCompoundMode = 25,
- SHINEMode = 26,
- ColourRfMode = 27,
- FibroMode = 28,
- SURFMode = 29,
+ ColorSplitMode = 12,
+ F4DMode = 13,
+ TriplexCwMode = 14,
+ ColourMMode = 15,
+ ElastoMode = 16,
+ AnatomicalMMode = 17,
+ ElastoComparativeMode = 18,
+ FusionMode = 19,
+ VecDopMode = 20,
+ BiplaneMode = 21,
+ FibroMode = 22,
+ SURFMode = 23,
+ Reslice3DMode = 24,
EndMode // the last one
};
View
@@ -11,6 +11,7 @@
#include "porta_std_includes.h"
class URect;
+class UPoint;
class UCurve;
class UGainCurve;
enum EVariableType;
@@ -72,7 +73,7 @@ class portalinkage porta
int getCurrentProbeID() const;
int getProbeID(int connector) const;
bool activateProbeConnector(int connector);
- bool getProbeName(char* name, unsigned int sz, int id) const;
+ bool getProbeName(char* name, int sz, int id) const;
bool getProbeInfo(probeInfo& nfo);
// testing functions
@@ -103,15 +104,15 @@ class portalinkage porta
const unsigned char* getFrameAddress(int index, int frame);
unsigned char* getCineStart(unsigned int blockid);
void clearCine();
- int getFrameSize();
+ int getFrameSize(int displayIndex);
// preset functions
bool loadMasterPreset();
bool loadPreset(const char* path);
bool savePreset(const char* path, bool overwrite);
bool isMasterPreset() const;
bool isFactoryPreset() const;
- bool findMasterPreset(char* path, unsigned int sz, int probe) const;
+ bool findMasterPreset(char* path, int sz, int probe) const;
bool isMasterPreset(const char* path) const;
bool getPresetProbeID(const char* path, int& probeid1, int& probeid2, int& probeid3) const;
@@ -126,6 +127,8 @@ class portalinkage porta
bool setParam(const char* prm, const char* val) const;
bool getParam(const char* prm, int& val) const;
bool setParam(const char* prm, int val);
+ bool getParam(const char* prm, UPoint& val) const;
+ bool setParam(const char* prm, UPoint val);
bool getParam(const char* prm, URect& val) const;
bool setParam(const char* prm, URect val);
bool getParam(const char* prm, UCurve& val) const;
@@ -141,11 +144,11 @@ class portalinkage porta
// display setup functions
bool setDisplayDimensions(int index, int x, int y);
bool getDisplayDimensions(int index, int& x, int& y) const;
- bool setDisplayCompressionTablePtr(int index, unsigned char* comprTbl);
- bool getCompressionTable(unsigned char* comprTbl);
// processed data retrieval functions
+ bool getPrescanBDimensions(int index, int &w, int &h) const;
bool getBwImage(int index, unsigned char*& img, bool useChroma) const;
+ bool getBwImagePrescan(int index, unsigned char*& img) const;
bool getColorImage(int index, unsigned char*& img) const;
bool getColorData(int index, unsigned char*& img, bool velocity, bool prescan, bool copy) const;
bool getColorVV(int index, unsigned char*& img) const;
@@ -173,6 +176,4 @@ class portalinkage porta
double stepMotor(bool cw, int steps = 8);
void setMotorHomeParams(int framesOffCenter);
void setMotorActive(bool run);
- void setMotorHomeOnRun(bool enable);
- void setMotorPowerState(bool keepOnUntilDisconnect);
};
View
Binary file not shown.
@@ -228,7 +228,7 @@ class probeInfo
/// the Sonix clinical software shows the value in dB.
///
////////////////////////////////////////////////////////////////////////////////
-#define prmBDynRange "b-dynamic range"
+#define prmBDynRange "b-dyn log factor"
////////////////////////////////////////////////////////////////////////////////
/// B Image Steering:
/// \li \b Functionality: Steers the B image.
@@ -276,7 +276,7 @@ class probeInfo
/// \li \b Functionality: Adjusts the number of focal points.
/// \li \b Type: Integer
/// \li \b Units: Count
-/// \li \b Range: 1 to 10, dependant on transducer, see imaging.lst.xml and imaging.set.xml.
+/// \li \b Range: 1 to 10, dependant on transducer, see imaging.set.xml.
///
////////////////////////////////////////////////////////////////////////////////
#define prmBFocusCount "b-focus count"
@@ -328,15 +328,6 @@ class probeInfo
////////////////////////////////////////////////////////////////////////////////
#define prmBExtensionAngle "b-extension angle"
////////////////////////////////////////////////////////////////////////////////
-/// Focus Count:
-/// \li \b Functionality: Adjusts the number of focal points.
-/// \li \b Type: Integer
-/// \li \b Units: Count
-/// \li \b Range: 1 to 10, dependant on transducer.
-///
-////////////////////////////////////////////////////////////////////////////////
-#define prmBxFocusCount "bx-focus count"
-////////////////////////////////////////////////////////////////////////////////
/// Dual Mode Active Display:
/// \li \b Functionality: Adjusts the active display in dual modes.
/// \li \b Type: Integer
@@ -650,7 +641,6 @@ class probeInfo
///
////////////////////////////////////////////////////////////////////////////////
#define prmTriplexActiveDisplay "triplex-mode"
-
////////////////////////////////////////////////////////////////////////////////
/// Sampling Frequency:
/// \li \b Functionality: Adjusts the sampling frequency of the envelope detector.
@@ -729,37 +719,6 @@ class probeInfo
////////////////////////////////////////////////////////////////////////////////
#define prmPowerNegative "b-voltage [-]"
////////////////////////////////////////////////////////////////////////////////
-/// B Sample Size:
-/// \li \b Functionality: Adjusts the B output sample size from the envelope detector.
-/// \li \b Type: Integer
-/// \li \b Units: Index
-/// \li \b Range: 0 and 1
-///@note 0 = 8 bit output. 1 = 16 bit output.
-///
-////////////////////////////////////////////////////////////////////////////////
-#define prmBSampleSize "b-sample size"
-////////////////////////////////////////////////////////////////////////////////
-/// RF Mode:
-/// \li \b Functionality: Adjusts the active displays in RF mode.
-/// \li \b Type: Integer
-/// \li \b Units: Index
-/// \li \b Range: 0, 1, 2
-///@note 0 = B image only. 1 = RF collection only. 2 = B and RF
-///
-////////////////////////////////////////////////////////////////////////////////
-#define prmRfMode "rf-mode"
-////////////////////////////////////////////////////////////////////////////////
-/// RF Decimation:
-/// \li \b Functionality: Adjusts the decimation factor from 40 MHz of the RF data.
-/// \li \b Type: Integer
-/// \li \b Units: Decimation Factor
-/// \li \b Range: 0 (40 MHz), 1, 2, 3
-///@note When DDR is off, the data must be decimated to at least 20 MHz.
-///@sa porta::init()
-///
-////////////////////////////////////////////////////////////////////////////////
-#define prmRfDecim "rf-rf decimation"
-////////////////////////////////////////////////////////////////////////////////
/// Motor Frames:
/// \li \b Functionality: Adjusts the number of frames that will acquired in one sweep
/// of the motor across the 4D transducer.
@@ -39,6 +39,14 @@ class URect
int bottom;
};
+class UPoint
+{
+public:
+
+ int x;
+ int y;
+};
+
class UCurve
{
public:
View
@@ -85,7 +85,6 @@ class texolinkage texo
bool addTGC(CURVE* tgc, int depth);
bool addReceive(texoReceiveParams rxPrms);
bool addTransmit(texoTransmitParams txPrms);
- bool loadCompressionTable(char* data, int size);
bool setPower(int power, int maxPositive, int maxNegative);
void setVCAInfo(VCAInfo vcaInfo);
View
Binary file not shown.
@@ -130,7 +130,8 @@ class texoReceiveParams
int manualDelays[65];
/// custom line duration in ns
int customLineDuration;
- /// digital gain value applied to entire scanline (0 - 4095)
+ /// digital gain value applied to entire scanline (0 - 4095 (12 bits) for hw V2)
+ /// (0 - 16383 (14 bits) for hw V3 & V4)
int lgcValue;
/// tgc selection by index
int tgcSel;
@@ -142,4 +143,10 @@ class texoReceiveParams
int numChannels;
/// recieve aperture curve
CURVE rxAprCrv;
+ // the window type to use for the receive aperture
+ int weightType;
+ // custom apodization window (true = on, false = off)
+ bool useCustomWindow;
+ // custom apodization window
+ unsigned char window[64];
};

0 comments on commit 26944c3

Please sign in to comment.