diff --git a/Mesh2Input/Data/Evaluation Grids/21_NF/Elements.txt b/Mesh2Input/EvaluationGrids/21_NF/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/21_NF/Elements.txt rename to Mesh2Input/EvaluationGrids/21_NF/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/21_NF/Nodes.txt b/Mesh2Input/EvaluationGrids/21_NF/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/21_NF/Nodes.txt rename to Mesh2Input/EvaluationGrids/21_NF/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/22_FF/Elements.txt b/Mesh2Input/EvaluationGrids/22_FF/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/22_FF/Elements.txt rename to Mesh2Input/EvaluationGrids/22_FF/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/22_FF/Nodes.txt b/Mesh2Input/EvaluationGrids/22_FF/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/22_FF/Nodes.txt rename to Mesh2Input/EvaluationGrids/22_FF/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/3_ARI/Elements.txt b/Mesh2Input/EvaluationGrids/3_ARI/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/3_ARI/Elements.txt rename to Mesh2Input/EvaluationGrids/3_ARI/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/3_ARI/Nodes.txt b/Mesh2Input/EvaluationGrids/3_ARI/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/3_ARI/Nodes.txt rename to Mesh2Input/EvaluationGrids/3_ARI/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/4_Low_ICO/Elements.txt b/Mesh2Input/EvaluationGrids/4_Low_ICO/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/4_Low_ICO/Elements.txt rename to Mesh2Input/EvaluationGrids/4_Low_ICO/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/4_Low_ICO/Nodes.txt b/Mesh2Input/EvaluationGrids/4_Low_ICO/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/4_Low_ICO/Nodes.txt rename to Mesh2Input/EvaluationGrids/4_Low_ICO/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/4_Low_UV/Elements.txt b/Mesh2Input/EvaluationGrids/4_Low_UV/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/4_Low_UV/Elements.txt rename to Mesh2Input/EvaluationGrids/4_Low_UV/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/4_Low_UV/Nodes.txt b/Mesh2Input/EvaluationGrids/4_Low_UV/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/4_Low_UV/Nodes.txt rename to Mesh2Input/EvaluationGrids/4_Low_UV/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/5_High_ICO/Elements.txt b/Mesh2Input/EvaluationGrids/5_High_ICO/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/5_High_ICO/Elements.txt rename to Mesh2Input/EvaluationGrids/5_High_ICO/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/5_High_ICO/Nodes.txt b/Mesh2Input/EvaluationGrids/5_High_ICO/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/5_High_ICO/Nodes.txt rename to Mesh2Input/EvaluationGrids/5_High_ICO/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/5_High_UV/Elements.txt b/Mesh2Input/EvaluationGrids/5_High_UV/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/5_High_UV/Elements.txt rename to Mesh2Input/EvaluationGrids/5_High_UV/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/5_High_UV/Nodes.txt b/Mesh2Input/EvaluationGrids/5_High_UV/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/5_High_UV/Nodes.txt rename to Mesh2Input/EvaluationGrids/5_High_UV/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/7_SPlane/Elements.txt b/Mesh2Input/EvaluationGrids/7_SPlane/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/7_SPlane/Elements.txt rename to Mesh2Input/EvaluationGrids/7_SPlane/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/7_SPlane/Nodes.txt b/Mesh2Input/EvaluationGrids/7_SPlane/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/7_SPlane/Nodes.txt rename to Mesh2Input/EvaluationGrids/7_SPlane/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/8_HPlane/Elements.txt b/Mesh2Input/EvaluationGrids/8_HPlane/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/8_HPlane/Elements.txt rename to Mesh2Input/EvaluationGrids/8_HPlane/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/8_HPlane/Nodes.txt b/Mesh2Input/EvaluationGrids/8_HPlane/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/8_HPlane/Nodes.txt rename to Mesh2Input/EvaluationGrids/8_HPlane/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/9_FPlane/Elements.txt b/Mesh2Input/EvaluationGrids/9_FPlane/Elements.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/9_FPlane/Elements.txt rename to Mesh2Input/EvaluationGrids/9_FPlane/Elements.txt diff --git a/Mesh2Input/Data/Evaluation Grids/9_FPlane/Nodes.txt b/Mesh2Input/EvaluationGrids/9_FPlane/Nodes.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/9_FPlane/Nodes.txt rename to Mesh2Input/EvaluationGrids/9_FPlane/Nodes.txt diff --git a/Mesh2Input/Data/Evaluation Grids/Custom/readme.txt b/Mesh2Input/EvaluationGrids/Custom/readme.txt similarity index 100% rename from Mesh2Input/Data/Evaluation Grids/Custom/readme.txt rename to Mesh2Input/EvaluationGrids/Custom/readme.txt diff --git a/Mesh2Input/Source/MaterialAssignment.py b/Mesh2Input/MaterialAssignment.py similarity index 100% rename from Mesh2Input/Source/MaterialAssignment.py rename to Mesh2Input/MaterialAssignment.py diff --git a/Mesh2Input/Source/export_mesh2hrtf.py b/Mesh2Input/exportMesh2HRTF.py similarity index 99% rename from Mesh2Input/Source/export_mesh2hrtf.py rename to Mesh2Input/exportMesh2HRTF.py index 14aece4e..59ee2de0 100644 --- a/Mesh2Input/Source/export_mesh2hrtf.py +++ b/Mesh2Input/exportMesh2HRTF.py @@ -244,7 +244,7 @@ class ExportMesh2HRTF(bpy.types.Operator, ExportHelper): programPath = StringProperty( name="Mesh2HRTF-path", description="Path to mesh2HRTF", - default=r"C:\Users\Robert\Documents\Dokumente\Studium TU\Masterarbeit\Digital_Appendix\11 Scripts\mesh2hrtf_edit", + default=r"C:\Users\jkhan\Documents\Mesh2HRTF - Kopie\trunk", ) @classmethod @@ -420,7 +420,7 @@ def rvec2d(v): lowFrequency = 0 lowFrequencyCores = 0 - evaluationGridPath = ("%s/Mesh2Input/Data/Evaluation Grids" % programPath) + evaluationGridPath = ("%s/Mesh2Input/EvaluationGrids" % programPath) # ------------------------ Write object data ----------------------------------- for obj in bpy.context.scene.objects[:]: @@ -862,7 +862,7 @@ def rvec2d(v): fw("receiverPositions") else: fw("[0 0 0; 0 0 0]") - fw(",frequencyDependency,nearFieldCalculation,microphone_area,reference);") + fw(",frequencyDependency,nearFieldCalculation,reference);") file.close # ----------------------- Render pictures of the model ------------------------- diff --git a/NumCalc/startNumCalc b/NumCalc/StartNumCalc(Denker) similarity index 100% rename from NumCalc/startNumCalc rename to NumCalc/StartNumCalc(Denker) diff --git a/EvalTools/Source/EvalTools_export2VTK.m b/PostProcessing/VisualizationForParaView(Matlab)/EvalTools_export2VTK.m similarity index 100% rename from EvalTools/Source/EvalTools_export2VTK.m rename to PostProcessing/VisualizationForParaView(Matlab)/EvalTools_export2VTK.m diff --git a/PostProcessing/VisualizationForParaView(Matlab)/VTKVisualization.m b/PostProcessing/VisualizationForParaView(Matlab)/VTKVisualization.m new file mode 100644 index 00000000..790dab39 --- /dev/null +++ b/PostProcessing/VisualizationForParaView(Matlab)/VTKVisualization.m @@ -0,0 +1,29 @@ +% Mesh2HRTF +% Copyright (C) 2015 by Harald Ziegelwanger, +% Acoustics Research Institute, Austrian Academy of Sciences +% mesh2hrtf.sourceforge.net +% +% Mesh2HRTF is licensed under the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +% Mesh2HRTF is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +% You should have received a copy of the GNU LesserGeneral Public License along with Mesh2HRTF. If not, see . +% +% If you use Mesh2HRTF: +% - Provide credits: +% "Mesh2HRTF, H. Ziegelwanger, ARI, OEAW (mesh2hrtf.sourceforge.net)" +% - In your publication, cite both articles: +% [1] Ziegelwanger, H., Kreuzer, W., and Majdak, P. (2015). "Mesh2HRTF: Open-source software package for the numerical calculation of head-related transfer functions," in Proceedings of the 22nd ICSV, Florence, IT. +% [2] Ziegelwanger, H., Majdak, P., and Kreuzer, W. (2015). "Numerical calculation of listener-specific head-related transfer functions and sound localization: Microphone model and mesh discretization," The Journal of the Acoustical Society of America, 138, 208-222. +% +% Author: Harald Ziegelwanger (Acoustics Research Institute, Austrian Academy of Sciences) +% Co-Authors: Fabian Brinkmann, Robert Pelzer (Audio Communication Group, Technical University Berlin) + +if ~exist('Visualization','dir') + mkdir('Visualization'); +end +if exist('ObjectMesh.mat','file') + load('ObjectMesh.mat') + if ~exist(['Visualization' filesep 'ObjectMesh'],'dir') + mkdir(['Visualization' filesep 'ObjectMesh']) + end + EvalTools_export2VTK(['Visualization' filesep 'ObjectMesh' filesep],nodes{1}(:,2:end),elements{1}(:,2:end),20*log10(abs(element_data{1})/0.00002),'amp') +end \ No newline at end of file diff --git a/Mesh2Input/Source/export_evaluationgrid.py b/PreProcessing/EvaluationGrid(Blender)/exportEvaluationGrid.py similarity index 100% rename from Mesh2Input/Source/export_evaluationgrid.py rename to PreProcessing/EvaluationGrid(Blender)/exportEvaluationGrid.py diff --git a/Mesh2Input/EvaluationGrid(Matlab)/demo.m b/PreProcessing/EvaluationGrid(Matlab)/demo.m similarity index 100% rename from Mesh2Input/EvaluationGrid(Matlab)/demo.m rename to PreProcessing/EvaluationGrid(Matlab)/demo.m diff --git a/Mesh2Input/EvaluationGrid(Matlab)/getMesh2HRTFevalGrid.m b/PreProcessing/EvaluationGrid(Matlab)/getMesh2HRTFevalGrid.m similarity index 100% rename from Mesh2Input/EvaluationGrid(Matlab)/getMesh2HRTFevalGrid.m rename to PreProcessing/EvaluationGrid(Matlab)/getMesh2HRTFevalGrid.m diff --git a/Mesh2Input/EvaluationGrid(Matlab)/writeMesh2HRTFevalGrid.m b/PreProcessing/EvaluationGrid(Matlab)/writeMesh2HRTFevalGrid.m similarity index 100% rename from Mesh2Input/EvaluationGrid(Matlab)/writeMesh2HRTFevalGrid.m rename to PreProcessing/EvaluationGrid(Matlab)/writeMesh2HRTFevalGrid.m diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/CMakeLists.txt b/PreProcessing/MeshGrading(OpenFlipper)/CMakeLists.txt similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/CMakeLists.txt rename to PreProcessing/MeshGrading(OpenFlipper)/CMakeLists.txt diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/Icons/MeshGrading.png b/PreProcessing/MeshGrading(OpenFlipper)/Icons/MeshGrading.png similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/Icons/MeshGrading.png rename to PreProcessing/MeshGrading(OpenFlipper)/Icons/MeshGrading.png diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingPlugin.cc b/PreProcessing/MeshGrading(OpenFlipper)/MeshGradingPlugin.cc similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingPlugin.cc rename to PreProcessing/MeshGrading(OpenFlipper)/MeshGradingPlugin.cc diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingPlugin.hh b/PreProcessing/MeshGrading(OpenFlipper)/MeshGradingPlugin.hh similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingPlugin.hh rename to PreProcessing/MeshGrading(OpenFlipper)/MeshGradingPlugin.hh diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingT.cc b/PreProcessing/MeshGrading(OpenFlipper)/MeshGradingT.cc similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingT.cc rename to PreProcessing/MeshGrading(OpenFlipper)/MeshGradingT.cc diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingT.hh b/PreProcessing/MeshGrading(OpenFlipper)/MeshGradingT.hh similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingT.hh rename to PreProcessing/MeshGrading(OpenFlipper)/MeshGradingT.hh diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingToolbox.cc b/PreProcessing/MeshGrading(OpenFlipper)/MeshGradingToolbox.cc similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingToolbox.cc rename to PreProcessing/MeshGrading(OpenFlipper)/MeshGradingToolbox.cc diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingToolbox.hh b/PreProcessing/MeshGrading(OpenFlipper)/MeshGradingToolbox.hh similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/MeshGradingToolbox.hh rename to PreProcessing/MeshGrading(OpenFlipper)/MeshGradingToolbox.hh diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/ProgressEmitter.hh b/PreProcessing/MeshGrading(OpenFlipper)/ProgressEmitter.hh similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/ProgressEmitter.hh rename to PreProcessing/MeshGrading(OpenFlipper)/ProgressEmitter.hh diff --git a/Mesh2Input/MeshGrading(OpenFlipper)/toolbox.ui b/PreProcessing/MeshGrading(OpenFlipper)/toolbox.ui similarity index 100% rename from Mesh2Input/MeshGrading(OpenFlipper)/toolbox.ui rename to PreProcessing/MeshGrading(OpenFlipper)/toolbox.ui diff --git a/Mesh2Input/Source/MeshCentering.py b/PreProcessing/MeshManipulation(Blender)/MeshCentering.py similarity index 100% rename from Mesh2Input/Source/MeshCentering.py rename to PreProcessing/MeshManipulation(Blender)/MeshCentering.py diff --git a/VERSION b/VERSION index 7dff5b89..9325c3cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.1 \ No newline at end of file +0.3.0 \ No newline at end of file diff --git a/history.txt b/history.txt index 481d01db..315e14a2 100644 --- a/history.txt +++ b/history.txt @@ -8,11 +8,15 @@ *** Michael Kalcher, ARI *** Fabian Brinkmann, TU-Berlin *** Robert Pelzer, TU-Berlin +*** Junaid Khan, FH Technikum Wien ************************************************************* -*** DEVELOPMENT STATUS *** +*** DEVELOPMENT STATUS *** -*** v0.2.1 (???) +*** v0.3.0 (28.05.2019, Junaid Khan) +- New directory structure +- Starting of Pascal case naming of the files +- Small bugfixes in the scripts *** v0.2.0 (Fabian Brinkmann, Robert Pelzer, Piotr Majdak) - Mesh2Input: