More fixes due to renaming of files and functions

parent b25468a4
...@@ -106,7 +106,7 @@ configure_file( "matlab/VA_build.m.proto" "${CMAKE_CURRENT_SOURCE_DIR}/matlab/VA ...@@ -106,7 +106,7 @@ configure_file( "matlab/VA_build.m.proto" "${CMAKE_CURRENT_SOURCE_DIR}/matlab/VA
# Install specialties # Install specialties
install( FILES "matlab/VA_build.m" DESTINATION "matlab" ) install( FILES "matlab/VA_build.m" DESTINATION "matlab" )
install( FILES "matlab/VA.m.proto" DESTINATION "matlab" ) install( FILES "matlab/VA.m.proto" DESTINATION "matlab" )
install( FILES "matlab/VA_generateStubs.m" DESTINATION "matlab" ) install( FILES "matlab/VA_generate_stubs.m" DESTINATION "matlab" )
install( FILES "matlab/VA_example_simple.m" DESTINATION "matlab" ) install( FILES "matlab/VA_example_simple.m" DESTINATION "matlab" )
install( FILES "matlab/VA_example_tracked_listener.m" DESTINATION "matlab" ) install( FILES "matlab/VA_example_tracked_listener.m" DESTINATION "matlab" )
install( FILES "matlab/VA_example_offline_simulation.m" DESTINATION "matlab" ) install( FILES "matlab/VA_example_offline_simulation.m" DESTINATION "matlab" )
......
...@@ -12,6 +12,7 @@ classdef VA < handle ...@@ -12,6 +12,7 @@ classdef VA < handle
% %
% See also: VA_example_simple, VA_example_tracked_sound_receiver, % See also: VA_example_simple, VA_example_tracked_sound_receiver,
% VA_example_generic_path_renderer, VA_example_random_numbers % VA_example_generic_path_renderer, VA_example_random_numbers
% VA_example_generic_path_renderer, VA_example_random_numbers
% %
% Quick usage: % Quick usage:
% %
......
...@@ -41,7 +41,7 @@ outputFile = fullfile( va_script_dir, 'VA.m' ); ...@@ -41,7 +41,7 @@ outputFile = fullfile( va_script_dir, 'VA.m' );
fprintf( 'Generating code for VA Matlab class ''%s'' ...\n', outputFile ); fprintf( 'Generating code for VA Matlab class ''%s'' ...\n', outputFile );
code = fileread( templateFile ); code = fileread( templateFile );
stubCode = VA_generateStubs(); stubCode = VA_generate_stubs();
code = strrep( code, '###STUBCODE###', stubCode ); code = strrep( code, '###STUBCODE###', stubCode );
......
...@@ -41,7 +41,7 @@ outputFile = fullfile( va_script_dir, 'VA.m' ); ...@@ -41,7 +41,7 @@ outputFile = fullfile( va_script_dir, 'VA.m' );
fprintf( 'Generating code for VA Matlab class ''%s'' ...\n', outputFile ); fprintf( 'Generating code for VA Matlab class ''%s'' ...\n', outputFile );
code = fileread( templateFile ); code = fileread( templateFile );
stubCode = VA_generateStubs(); stubCode = VA_generate_stubs();
code = strrep( code, '###STUBCODE###', stubCode ); code = strrep( code, '###STUBCODE###', stubCode );
......
...@@ -41,7 +41,7 @@ outputFile = fullfile( va_script_dir, 'VA.m' ); ...@@ -41,7 +41,7 @@ outputFile = fullfile( va_script_dir, 'VA.m' );
fprintf( 'Generating code for VA Matlab class ''%s'' ...\n', outputFile ); fprintf( 'Generating code for VA Matlab class ''%s'' ...\n', outputFile );
code = fileread( templateFile ); code = fileread( templateFile );
stubCode = VA_generateStubs(); stubCode = VA_generate_stubs();
code = strrep( code, '###STUBCODE###', stubCode ); code = strrep( code, '###STUBCODE###', stubCode );
......
...@@ -13,7 +13,7 @@ va = VA( 'localhost' ); ...@@ -13,7 +13,7 @@ va = VA( 'localhost' );
L = va.create_sound_receiver( 'VA_Listener' ); L = va.create_sound_receiver( 'VA_Listener' );
va.set_sound_receiver_position( L, [ 0 1.7 0 ] ) va.set_sound_receiver_position( L, [ 0 1.7 0 ] )
H = va.create_directivity( '$(DefaultHRIR)' ); H = va.create_directivity_from_file( '$(DefaultHRIR)' );
va.set_sound_receiver_directivity( L, H ); va.set_sound_receiver_directivity( L, H );
S = va.create_sound_source( 'VA_Source' ); S = va.create_sound_source( 'VA_Source' );
......
...@@ -10,7 +10,7 @@ va = VA( 'localhost' ); ...@@ -10,7 +10,7 @@ va = VA( 'localhost' );
L = va.create_sound_receiver( 'VA_Listener' ); L = va.create_sound_receiver( 'VA_Listener' );
va.set_sound_receiver_position( L, [ 0 1.7 0 ] ) va.set_sound_receiver_position( L, [ 0 1.7 0 ] )
H = va.create_directivity( '$(DefaultHRIR)' ); H = va.create_directivity_from_file( '$(DefaultHRIR)' );
va.set_sound_receiver_directivity( L, H ); va.set_sound_receiver_directivity( L, H );
S = va.create_sound_source( 'VA_Source' ); S = va.create_sound_source( 'VA_Source' );
......
...@@ -28,7 +28,7 @@ va.set_sound_source_position( S, [ 2 1.7 2 ] ) ...@@ -28,7 +28,7 @@ va.set_sound_source_position( S, [ 2 1.7 2 ] )
L = va.create_sound_receiver( 'VA_Listener' ); L = va.create_sound_receiver( 'VA_Listener' );
va.set_sound_receiver_position( L, [ 0 1.7 0 ] ) va.set_sound_receiver_position( L, [ 0 1.7 0 ] )
H = va.create_directivity( '$(DefaultHRIR)' ); H = va.create_directivity_from_file( '$(DefaultHRIR)' );
va.set_sound_receiver_directivity( L, H ); va.set_sound_receiver_directivity( L, H );
% Connect the signal source to the virtual sound source % Connect the signal source to the virtual sound source
......
% Stub generator for the VA Matlab facade class % Stub generator for the VA Matlab facade class
% Author: Frank Wefers (fwefers@akustik.rwth-aachen.de) % Author: Frank Wefers (fwefers@akustik.rwth-aachen.de)
function [output] = generateStubs() function [output] = VA_generate_stubs()
% Get interface describtion % Get interface describtion
d = VAMatlab('enumerate_functions'); d = VAMatlab('enumerate_functions');
......
...@@ -22,7 +22,7 @@ function varargout = VA_setup(varargin) ...@@ -22,7 +22,7 @@ function varargout = VA_setup(varargin)
% Edit the above text to modify the response to help VA_setup % Edit the above text to modify the response to help VA_setup
% Last Modified by GUIDE v2.5 08-Feb-2017 15:42:50 % Last Modified by GUIDE v2.5 05-Dec-2018 16:00:56
% Begin initialization code - DO NOT EDIT % Begin initialization code - DO NOT EDIT
gui_Singleton = 1; gui_Singleton = 1;
...@@ -218,7 +218,7 @@ if vamatlab_found ...@@ -218,7 +218,7 @@ if vamatlab_found
savepath savepath
end end
set( handles.edit_vamatlab_full_path, 'String', fullfile( vamatlab_dir, [ 'VAMatlab.' mexext ] ) ) set( handles.edit_vamatlab_full_path, 'String', fullfile( vamatlab_dir, [ 'VAMatlab.' mexext ] ) )
v = VAMatlab( 'getVersion' ); v = VAMatlab( 'get_version' );
set( handles.edit_vamatlab_version, 'String', v ) set( handles.edit_vamatlab_version, 'String', v )
else else
set( handles.edit_vamatlab_full_path, 'String', 'not found' ) set( handles.edit_vamatlab_full_path, 'String', 'not found' )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment