Skip to content

GitLab

Commit 60de1377 authored by Philipp Schäfer's avatar Philipp Schäfer
Browse files

giving the AC3D model class a proper name - step 2 

-internal class renaming
-added wrapper function to remain old functionality
-renamed class usages in itaRavenProject
parent 58a3718b
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 36 deletions
applications/SoundFieldSimulation/Raven/AC3D/itaAc3dModel.m
View file @ 60de1377
classdef load_ac3d
classdef itaAc3dModel
% Class for GA model info
% <ITA-Toolbox>
......@@ -29,7 +29,7 @@ classdef load_ac3d
methods
% CONSTRUCTOR
function obj = load_ac3d(filename)
function obj = itaAc3dModel(filename)
if nargin > 0
obj = obj.readAc3DModelFile(filename);
end
......
applications/SoundFieldSimulation/Raven/AC3D/load_ac3d.m 0 → 100644
View file @ 60de1377
function obj = load_ac3d(varargin)
%LOAD_AC3D - Creates an itaAc3dModel obj
% This is a wrapper to support the former itaAc3dModel classname
% "load_ac3d". In future, just use itaAc3dModel directly.
%
% See also itaAc3dModel.
%
% Autor: Philipp Schfer -- Email: psc@akustik.rwth-aachen.de
% <ITA-Toolbox>
% This file is part of the ITA-Toolbox. Some rights reserved.
% You can find the license for this m-file in the license.txt file in the ITA-Toolbox folder.
% </ITA-Toolbox>
obj = itaAc3dModel(varargin{:});
\ No newline at end of file
applications/SoundFieldSimulation/Raven/itaRavenProject.m
View file @ 60de1377
......@@ -648,11 +648,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -747,12 +747,12 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
obj.model{iRoom}.plotModel(tgtAxes, comp2axesMapping, wireframe);
hold on;
end
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
obj.model.plotModel(tgtAxes, comp2axesMapping, wireframe);
end
else
......@@ -839,12 +839,12 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
obj.model{iRoom}.plotModel(tgtAxes, comp2axesMapping, wireframe);
hold on;
end
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
obj.model.plotModel(tgtAxes, comp2axesMapping, wireframe);
end
else
......@@ -1670,13 +1670,13 @@ classdef itaRavenProject < handle
roomID = 0;
end
if isempty(obj.model)
roommodel = load_ac3d(obj.modelFileList{roomID + 1});
roommodel = itaAc3dModel(obj.modelFileList{roomID + 1});
else
roommodel = obj.model{roomID + 1};
end
else
if isempty(obj.model)
roommodel = load_ac3d(obj.modelFileList);
roommodel = itaAc3dModel(obj.modelFileList);
else
roommodel = obj.model;
end
......@@ -2890,11 +2890,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -2922,11 +2922,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -2956,11 +2956,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -2989,11 +2989,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -3022,11 +3022,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -3057,11 +3057,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -3108,11 +3108,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -3141,11 +3141,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -3174,11 +3174,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -3754,11 +3754,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -3885,11 +3885,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -4041,11 +4041,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......@@ -4180,11 +4180,11 @@ classdef itaRavenProject < handle
if isempty(obj.model)
if iscell(obj.modelFileList)
for iRoom = 1 : numel(obj.modelFileList)
obj.model{iRoom} = load_ac3d(obj.modelFileList{iRoom});
obj.model{iRoom} = itaAc3dModel(obj.modelFileList{iRoom});
end
roommodel = obj.model{roomID + 1};
else
obj.model = load_ac3d(obj.modelFileList);
obj.model = itaAc3dModel(obj.modelFileList);
roommodel = obj.model;
end
else
......
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