Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/msw/VtlApiTests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{3e9b609e-a2c5-4b62-b0d8-199758363deb}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
Expand Down
2 changes: 1 addition & 1 deletion build/msw/VtlBackendTests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{b0eccf36-91d7-47ca-8f08-ab92c55d489b}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
Expand Down
366 changes: 366 additions & 0 deletions include/VocalTractLabApi/VocalTractLabApi.h

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions include/VocalTractLabBackend/TlModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ class TlModel

void getImpulseResponseWindow(Signal *window, int length);
void getImpulseResponse(Signal *impulseResponse, int lengthExponent);
Matrix2x2 getMatrixProduct(int section, int freqIndex);
ComplexValue getFossaInputImpedance(int freqIndex);
ComplexValue getNoseRadiationImpedance(int freqIndex);
ComplexValue getMouthRadiationImpedance(int freqIndex);
void getSpectrum(SpectrumType type, ComplexSignal *spectrum, int spectrumLength, int section);

int getMostConstrictedSection();
Expand Down Expand Up @@ -121,6 +125,7 @@ class TlModel
ComplexValue noseRadiationImpedance[MAX_NUM_FREQ];
ComplexValue lungTerminationImpedance[MAX_NUM_FREQ];
ComplexValue radiationCharacteristic[MAX_NUM_FREQ];
ComplexValue fossaInputImpedanceArray[MAX_NUM_FREQ];


// ************************************************************************
Expand Down
1 change: 1 addition & 0 deletions include/VocalTractLabBackend/Tube.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ class Tube
double nasalCavityLength_cm;
double piriformFossaLength_cm;
double piriformFossaVolume_cm3;
double rawVelumOpening_cm2 = 0.0;

// **************************************************************************
// Private functions.
Expand Down
12 changes: 7 additions & 5 deletions include/VocalTractLabBackend/VocalTract.h
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ class VocalTract
void calcCrossSections();
void getCrossProfiles(Point2D P, Point2D v, double *upperProfile, double *lowerProfile,
bool considerTongue, Tube::Articulator &articulator, bool debug = false);
int getRawCuts(Point2D P, Point2D v, double *cutData, int maxCuts);
void insertUpperProfileLine(Point2D P0, Point2D P1, int surfaceIndex,
double *upperProfile, int *upperProfileSurface);
void insertLowerProfileLine(Point2D P0, Point2D P1, int surfaceIndex,
Expand Down Expand Up @@ -481,15 +482,16 @@ class VocalTract
/// Private data.
// **************************************************************************

private:
bool intersectionsPrepared[NUM_SURFACES]; // For the fast intersection method
bool hasStoredControlParams;
double storedControlParams[NUM_PARAMS];

// Outlines used for centerline computation (public for debug export).
LineStrip2D upperOutline;
LineStrip2D lowerOutline;
LineStrip2D tongueOutline;
LineStrip2D epiglottisOutline;

private:
bool intersectionsPrepared[NUM_SURFACES]; // For the fast intersection method
bool hasStoredControlParams;
double storedControlParams[NUM_PARAMS];
};

// ****************************************************************************
Expand Down
Loading
Loading