Code has been compacted with functions

annot.m

@@ -0,0 +1,24 @@
+function annot(voltData,x,y,xScale,yScale)
+% Write voltage labels of the selected constant voltage lines of x,y data
+% Works correctly if HOLD ON command is issued before calling this function
+
+% VOLTDATA is a cell array of voltage data
+% X is the VOLTDATA index of the x-axis
+% Y is the VOLTDATA index of the y-axis
+% XSCALE is the scale factor of the X data (default = 1)
+% YSCALE is the scale factor of the Y data (default = 1)
+
+if nargin == 3
+   xScale = 1;
+   yScale = 1;
+end
+
+v = 0;
+for i = 1:12
+    v = v + 5;
+    text(voltData{i}(end,x)./xScale, ...
+        voltData{i}(end,y)./yScale, ...
+        [num2str(v), ' V \rightarrow'], 'HorizontalAlignment', 'right')
+end
+
+end

annot3.m

@@ -0,0 +1,28 @@
+function annot3(voltData,x,y,z,xScale,yScale,zScale)
+% Write voltage labels of the selected constant voltage lines of x,y,z data
+% Works correctly if HOLD ON command is issued before calling this function
+
+% VOLTDATA is a cell array of voltage data
+% X is the VOLTDATA index of the x-axis
+% Y is the VOLTDATA index of the y-axis
+% Z is the VOLTDATA index of the z-axis
+% XSCALE is the scale factor of the X data (default = 1)
+% YSCALE is the scale factor of the Y data (default = 1)
+% ZSCALE is the scale factor of the Z data (default = 1)
+
+if nargin == 4
+   xScale = 1;
+   yScale = 1;
+   zScale = 1;
+end
+
+v = 0;
+for i = 1:12
+    v = v + 5;
+    text(voltData{i}(end,x)./xScale, ...
+        voltData{i}(end,y)./yScale, ...
+        voltData{i}(end,z)./zScale, ...
+        [num2str(v), ' V \rightarrow'], 'HorizontalAlignment', 'right')
+end
+
+end

performanceCharts.m

@@ -1,7 +1,7 @@
 % Calculate the Lehner 2280-40 electric motor map from performance data
 % issued by the manufacturer. Plot propeller operating points on the map.
-% Version 5. Define and compare as many propeller operating conditions as
-% desired.
+% Version 6. Code compacted with functions, now it should be easier to add
+% other charts or features.
 close all; clearvars; clc
 
 %% User-provided data
@@ -29,18 +29,11 @@
                 2.4     141     5993];
 
 %% Lehner performance data
-V1 = csvread('data\V5.csv');
-V2 = csvread('data\V10.csv');
-V3 = csvread('data\V15.csv');
-V4 = csvread('data\V20.csv');
-V5 = csvread('data\V25.csv');
-V6 = csvread('data\V30.csv');
-V7 = csvread('data\V35.csv');
-V8 = csvread('data\V40.csv');
-V9 = csvread('data\V45.csv');
-V10 = csvread('data\V50.csv');
-V11 = csvread('data\V55.csv');
-V12 = csvread('data\V60.csv');
+v = 0;
+for i = 1:12
+    v = v + 5;
+    V{i} = csvread(['data\V', num2str(v), '.csv']);
+end
 
 scale = 1000; % Scale factor over RPM for better interpolation
 for i = 1:numel(condition)
@@ -52,68 +45,63 @@
 
 % Current	Input power     RPM     Momentum	Output power	Efficiency
 % A         W               /min	Ncm         W	            %
-c = [V1(:,1); V2(:,1); V3(:,1); V4(:,1); V5(:,1); V6(:,1); V7(:,1); ...
-    V8(:,1); V9(:,1); V10(:,1); V11(:,1); V12(:,1)]; % Current
-e = [V1(:,2); V2(:,2); V3(:,2); V4(:,2); V5(:,2); V6(:,2); V7(:,2); ...
-    V8(:,2); V9(:,2); V10(:,2); V11(:,2); V12(:,2)]; % Input (electric) power
-r = [V1(:,3); V2(:,3); V3(:,3); V4(:,3); V5(:,3); V6(:,3); V7(:,3); ...
-    V8(:,3); V9(:,3); V10(:,3); V11(:,3); V12(:,3)] ./ scale; % RPM (scaled)
-t = [V1(:,4); V2(:,4); V3(:,4); V4(:,4); V5(:,4); V6(:,4); V7(:,4); ...
-    V8(:,4); V9(:,4); V10(:,4); V11(:,4); V12(:,4)]; % Momentum (torque)
-s = [V1(:,5); V2(:,5); V3(:,5); V4(:,5); V5(:,5); V6(:,5); V7(:,5); ...
-    V8(:,5); V9(:,5); V10(:,5); V11(:,5); V12(:,5)]; % Output (shaft) power
-h = [V1(:,6); V2(:,6); V3(:,6); V4(:,6); V5(:,6); V6(:,6); V7(:,6); ...
-    V8(:,6); V9(:,6); V10(:,6); V11(:,6); V12(:,6)]; % Efficiency
-
-% Limit curves from data
-limCur = [V1(end,1); V2(end,1); V3(end,1); V4(end,1); V5(end,1); V6(end,1); V7(end,1); ...
-    V8(end,1); V9(end,1); V10(end,1); V11(end,1); V12(end,1)];
-limInp = [V1(end,2); V2(end,2); V3(end,2); V4(end,2); V5(end,2); V6(end,2); V7(end,2); ...
-    V8(end,2); V9(end,2); V10(end,2); V11(end,2); V12(end,2)];
-limRPM = [V1(end,3); V2(end,3); V3(end,3); V4(end,3); V5(end,3); V6(end,3); V7(end,3); ...
-    V8(end,3); V9(end,3); V10(end,3); V11(end,3); V12(end,3)] ./ scale;
-limMom = [V1(end,4); V2(end,4); V3(end,4); V4(end,4); V5(end,4); V6(end,4); V7(end,4); ...
-    V8(end,4); V9(end,4); V10(end,4); V11(end,4); V12(end,4)];
-limPow = [V1(end,5); V2(end,5); V3(end,5); V4(end,5); V5(end,5); V6(end,5); V7(end,5); ...
-    V8(end,5); V9(end,5); V10(end,5); V11(end,5); V12(end,5)];
-limEta = [V1(end,6); V2(end,6); V3(end,6); V4(end,6); V5(end,6); V6(end,6); V7(end,6); ...
-    V8(end,6); V9(end,6); V10(end,6); V11(end,6); V12(end,6)];
-
-%% Calculate CURRENT from expected shaft power and RPM (propeller data)
-[xa, ya] = meshgrid((0:100:11000)./scale, 0:0.1:15);  % x: RPM, y: Ampere
-za = griddata(r,c,s,xa,ya);
+c = [];
+e = [];
+r = [];
+t = [];
+s = [];
+h = [];
+limCur = [];
+limInp = [];
+limRPM = [];
+limMom = [];
+limPow = [];
+limEta = [];
+for i = 1:12
+    % gather data for interpolation
+    c = [c; V{i}(:,1)]; % Current
+    e = [e; V{i}(:,2)]; % Input (electric) power
+    r = [r; V{i}(:,3)]; % RPM (scaled)
+    t = [t; V{i}(:,4)]; % Momentum (torque)
+    s = [s; V{i}(:,5)]; % Output (shaft) power
+    h = [h; V{i}(:,6)]; % Efficiency
+    % limit curves
+    limCur = [limCur; V{i}(end,1)];
+    limInp = [limInp; V{i}(end,2)];
+    limRPM = [limRPM; V{i}(end,3)];
+    limMom = [limMom; V{i}(end,4)];
+    limPow = [limPow; V{i}(end,5)];
+    limEta = [limEta; V{i}(end,6)];
+end
+r = r ./ scale;
+limRPM = limRPM ./ scale;
 
-% Interpolate data to caclculate current drawn at propeller operating points
+% Interpolate data to caclculate current drawn, motor torque and propeller
+% efficiency at assigned operating points
 for i = 1:numel(condition)
     % create a temporary variable to access cell data
     tempMat =  condition{i};
-    tempMat(:,4) = griddata(s,r,c,tempMat(:,2),tempMat(:,3));
+    tempMat(:,4) = griddata(s,r,c,tempMat(:,2),tempMat(:,3)); % current
+    tempMat(:,5) = griddata(s,r,t,tempMat(:,2),tempMat(:,3)); % torque
+    tempMat(:,6) = griddata(s,r,h,tempMat(:,2),tempMat(:,3)); % efficiency
     condition{i} = tempMat;
 end
 
+%% Calculate CURRENT from expected shaft power and RPM (propeller data)
+[xa, ya] = meshgrid((0:100:11000)./scale, 0:0.1:15);  % x: RPM, y: Ampere
+za = griddata(r,c,s,xa,ya);
+
 % Plot section
 figure
 hold on
 surf(xa,ya,za,'FaceColor','interp','LineStyle','none')
-plot3(V1(:,3)./scale,V1(:,1),V1(:,5),'k--')
-plot3(V2(:,3)./scale,V2(:,1),V2(:,5),'k--')
-plot3(V3(:,3)./scale,V3(:,1),V3(:,5),'k--')
-plot3(V4(:,3)./scale,V4(:,1),V4(:,5),'k--')
-plot3(V5(:,3)./scale,V5(:,1),V5(:,5),'k--')
-plot3(V6(:,3)./scale,V6(:,1),V6(:,5),'k--')
-plot3(V7(:,3)./scale,V7(:,1),V7(:,5),'k--')
-plot3(V8(:,3)./scale,V8(:,1),V8(:,5),'k--')
-plot3(V9(:,3)./scale,V9(:,1),V9(:,5),'k--')
-plot3(V10(:,3)./scale,V10(:,1),V10(:,5),'k--')
-plot3(V11(:,3)./scale,V11(:,1),V11(:,5),'k--')
-plot3(V12(:,3)./scale,V12(:,1),V12(:,5),'k--')
-% plot3(limRPM,limCur,limPow,'k-','LineWidth',2)
+voltagePlot3(V,3,1,5,scale,1,1)
 
 for i = 1:numel(condition)
     % create a temporary variable to access part of cell data
     tempMat =  condition{i};
     conditionCurves{i} = plot3(tempMat(:,3),tempMat(:,4),tempMat(:,2)+20,...
-        '-o','LineWidth',3.0,'MarkerSize',3,'MarkerEdgeColor','black'); %#ok<SAGROW>
+        '-o','LineWidth',3.0,'MarkerSize',3,'MarkerEdgeColor','black');
 end
 
 hold off, grid on, view(-20,30)
@@ -122,18 +110,7 @@
 legend([conditionCurves{:}],conditionLabels,'Location','Best')
 
 % Annotations on surf
-text(V1(end,3)./scale,V1(end,1),V1(end,5),'5 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V2(end,3)./scale,V2(end,1),V2(end,5),'10 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V3(end,3)./scale,V3(end,1),V3(end,5),'15 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V4(end,3)./scale,V4(end,1),V4(end,5),'20 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V5(end,3)./scale,V5(end,1),V5(end,5),'25 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V6(end,3)./scale,V6(end,1),V6(end,5),'30 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V7(end,3)./scale,V7(end,1),V7(end,5),'35 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V8(end,3)./scale,V8(end,1),V8(end,5),'40 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V9(end,3)./scale,V9(end,1),V9(end,5),'45 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V10(end,3)./scale,V10(end,1),V10(end,5),'50 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V11(end,3)./scale,V11(end,1),V11(end,5),'55 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V12(end,3)./scale,V12(end,1),V12(end,5),'60 V \rightarrow', 'HorizontalAlignment', 'right')
+annot3(V,3,1,5,scale,1,1)
 
 for i = 1:numel(condition)
     tempMat =  condition{i};
@@ -158,19 +135,7 @@
 figure
 hold on
 [C,H] = contourf(xa,ya,za,0:50:700);
-plot(V1(:,3)./scale,V1(:,1),'k--')
-plot(V2(:,3)./scale,V2(:,1),'k--')
-plot(V3(:,3)./scale,V3(:,1),'k--')
-plot(V4(:,3)./scale,V4(:,1),'k--')
-plot(V5(:,3)./scale,V5(:,1),'k--')
-plot(V6(:,3)./scale,V6(:,1),'k--')
-plot(V7(:,3)./scale,V7(:,1),'k--')
-plot(V8(:,3)./scale,V8(:,1),'k--')
-plot(V9(:,3)./scale,V9(:,1),'k--')
-plot(V10(:,3)./scale,V10(:,1),'k--')
-plot(V11(:,3)./scale,V11(:,1),'k--')
-plot(V12(:,3)./scale,V12(:,1),'k--')
-% plot(limRPM,limCur,'k-','LineWidth',2)
+voltagePlot(V,3,1,scale,1)
 
 for i = 1:numel(condition)
     % create a temporary variable to access part of cell data
@@ -186,18 +151,7 @@
 legend([conditionCurves{:}],conditionLabels,'Location','Best')
 
 % Annotations on contour
-text(V1(end,3)./scale,V1(end,1),'5 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V2(end,3)./scale,V2(end,1),'10 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V3(end,3)./scale,V3(end,1),'15 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V4(end,3)./scale,V4(end,1),'20 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V5(end,3)./scale,V5(end,1),'25 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V6(end,3)./scale,V6(end,1),'30 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V7(end,3)./scale,V7(end,1),'35 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V8(end,3)./scale,V8(end,1),'40 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V9(end,3)./scale,V9(end,1),'45 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V10(end,3)./scale,V10(end,1),'50 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V11(end,3)./scale,V11(end,1),'55 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V12(end,3)./scale,V12(end,1),'60 V \rightarrow', 'HorizontalAlignment', 'right')
+annot(V,3,1,scale,1)
 
 for i = 1:numel(condition)
     tempMat =  condition{i};
@@ -222,32 +176,10 @@
 [xt, yt] = meshgrid((0:100:11000)./scale, 0:1:70);  % x: RPM, y: Ncm
 zt = griddata(r,t,h,xt,yt);
 
-% Interpolate data to caclculate motor torque and efficiency at propeller operating points
-for i = 1:numel(condition)
-    % create a temporary variable to access cell data
-    tempMat =  condition{i};
-    tempMat(:,5) = griddata(s,r,t,tempMat(:,2),tempMat(:,3));
-    tempMat(:,6) = griddata(s,r,h,tempMat(:,2),tempMat(:,3));
-    condition{i} = tempMat;
-end
-
-% Plot section
 figure
 hold on
 surf(xt,yt,zt,'FaceColor','interp','LineStyle','none')
-plot3(V1(:,3)./scale,V1(:,4),V1(:,6),'k--')
-plot3(V2(:,3)./scale,V2(:,4),V2(:,6),'k--')
-plot3(V3(:,3)./scale,V3(:,4),V3(:,6),'k--')
-plot3(V4(:,3)./scale,V4(:,4),V4(:,6),'k--')
-plot3(V5(:,3)./scale,V5(:,4),V5(:,6),'k--')
-plot3(V6(:,3)./scale,V6(:,4),V6(:,6),'k--')
-plot3(V7(:,3)./scale,V7(:,4),V7(:,6),'k--')
-plot3(V8(:,3)./scale,V8(:,4),V8(:,6),'k--')
-plot3(V9(:,3)./scale,V9(:,4),V9(:,6),'k--')
-plot3(V10(:,3)./scale,V10(:,4),V10(:,6),'k--')
-plot3(V11(:,3)./scale,V11(:,4),V11(:,6),'k--')
-plot3(V12(:,3)./scale,V12(:,4),V12(:,6),'k--')
-% plot3(limRPM,limMom,limEta,'k-','LineWidth',2)
+voltagePlot3(V,3,4,6,scale,1,1)
 
 for i = 1:numel(condition)
     % create a temporary variable to access part of cell data
@@ -262,18 +194,7 @@
 legend([conditionCurves{:}],conditionLabels,'Location','Best')
 
 % Annotations on surf
-text(V1(end,3)./scale,V1(end,4),V1(end,6),'5 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V2(end,3)./scale,V2(end,4),V2(end,6),'10 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V3(end,3)./scale,V3(end,4),V3(end,6),'15 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V4(end,3)./scale,V4(end,4),V4(end,6),'20 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V5(end,3)./scale,V5(end,4),V5(end,6),'25 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V6(end,3)./scale,V6(end,4),V6(end,6),'30 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V7(end,3)./scale,V7(end,4),V7(end,6),'35 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V8(end,3)./scale,V8(end,4),V8(end,6),'40 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V9(end,3)./scale,V9(end,4),V9(end,6),'45 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V10(end,3)./scale,V10(end,4),V10(end,6),'50 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V11(end,3)./scale,V11(end,4),V11(end,6),'55 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V12(end,3)./scale,V12(end,4),V12(end,6),'60 V \rightarrow', 'HorizontalAlignment', 'right')
+annot3(V,3,4,6,scale,1,1)
 
 for i = 1:numel(condition)
     tempMat =  condition{i};
@@ -298,19 +219,7 @@
 figure
 hold on
 [C,H] = contourf(xt,yt,zt,[5:10:85,85:2:90,90:0.5:95]);
-plot(V1(:,3)./scale,V1(:,4),'k--')
-plot(V2(:,3)./scale,V2(:,4),'k--')
-plot(V3(:,3)./scale,V3(:,4),'k--')
-plot(V4(:,3)./scale,V4(:,4),'k--')
-plot(V5(:,3)./scale,V5(:,4),'k--')
-plot(V6(:,3)./scale,V6(:,4),'k--')
-plot(V7(:,3)./scale,V7(:,4),'k--')
-plot(V8(:,3)./scale,V8(:,4),'k--')
-plot(V9(:,3)./scale,V9(:,4),'k--')
-plot(V10(:,3)./scale,V10(:,4),'k--')
-plot(V11(:,3)./scale,V11(:,4),'k--')
-plot(V12(:,3)./scale,V12(:,4),'k--')
-% plot(limRPM,limMom,'k-','LineWidth',2)
+voltagePlot(V,3,4,scale,1)
 
 for i = 1:numel(condition)
     % create a temporary variable to access part of cell data
@@ -326,18 +235,7 @@
 legend([conditionCurves{:}],conditionLabels,'Location','Best')
 
 % Annotations on contour
-text(V1(end,3)./scale,V1(end,4),'5 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V2(end,3)./scale,V2(end,4),'10 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V3(end,3)./scale,V3(end,4),'15 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V4(end,3)./scale,V4(end,4),'20 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V5(end,3)./scale,V5(end,4),'25 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V6(end,3)./scale,V6(end,4),'30 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V7(end,3)./scale,V7(end,4),'35 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V8(end,3)./scale,V8(end,4),'40 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V9(end,3)./scale,V9(end,4),'45 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V10(end,3)./scale,V10(end,4),'50 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V11(end,3)./scale,V11(end,4),'55 V \rightarrow', 'HorizontalAlignment', 'right')
-text(V12(end,3)./scale,V12(end,4),'60 V \rightarrow', 'HorizontalAlignment', 'right')
+annot(V,3,4,scale,1)
 
 for i = 1:numel(condition)
     tempMat =  condition{i};

voltagePlot.m

@@ -0,0 +1,21 @@
+function voltagePlot(voltData,x,y,xScale,yScale)
+% Plot 3D lines of the selected constant voltage lines of x,y,z data
+% Works correctly if HOLD ON command is issued before calling this function
+
+% VOLTDATA is a cell array of voltage data
+% X is the VOLTDATA index of the x-axis
+% Y is the VOLTDATA index of the y-axis
+% XSCALE is the scale factor of the X data (default = 1)
+% YSCALE is the scale factor of the Y data (default = 1)
+
+if nargin == 3
+   xScale = 1;
+   yScale = 1;
+end
+
+for i = 1:12
+    plot(voltData{i}(:,x)./xScale, ...
+        voltData{i}(:,y)./yScale, 'k--')
+end
+
+end