From 43af43508553e0f35deaba6ff0c2270c7d1003f1 Mon Sep 17 00:00:00 2001
From: Henning Stahlke <github@henningstahlke.de>
Date: Sun, 19 Nov 2017 11:20:46 +0100
Subject: [PATCH] YASIM: rename method getMAC to getMACLength

---
 src/FDM/YASim/Airplane.cpp   | 8 ++++----
 src/FDM/YASim/Wing.hpp       | 2 +-
 src/FDM/YASim/yasim-test.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/FDM/YASim/Airplane.cpp b/src/FDM/YASim/Airplane.cpp
index 22fc093a1..f25338830 100644
--- a/src/FDM/YASim/Airplane.cpp
+++ b/src/FDM/YASim/Airplane.cpp
@@ -320,7 +320,7 @@ float Airplane::compileWing(Wing* w)
       _wingsN->getNode("wing-area", true)->setFloatValue(w->getArea());
       _wingsN->getNode("aspect-ratio", true)->setFloatValue(w->getAspectRatio());
       _wingsN->getNode("standard-mean-chord", true)->setFloatValue(w->getSMC());
-      _wingsN->getNode("mac", true)->setFloatValue(w->getMAC());
+      _wingsN->getNode("mac", true)->setFloatValue(w->getMACLength());
       _wingsN->getNode("mac-x", true)->setFloatValue(w->getMACx());
       _wingsN->getNode("mac-y", true)->setFloatValue(w->getMACy());
     }
@@ -547,8 +547,8 @@ void Airplane::compile()
       aeroWgt += compileWing(_wing);
       
       // convert % to absolute x coordinates
-      _cgDesiredFront = _wing->getMACx() - _wing->getMAC()*_cgDesiredMin;
-      _cgDesiredAft = _wing->getMACx() - _wing->getMAC()*_cgDesiredMax;
+      _cgDesiredFront = _wing->getMACx() - _wing->getMACLength()*_cgDesiredMin;
+      _cgDesiredAft = _wing->getMACx() - _wing->getMACLength()*_cgDesiredMax;
       if (baseN != 0) {
         SGPropertyNode_ptr n = fgGetNode("/fdm/yasim/model", true);
         n->getNode("cg-x-range-front", true)->setFloatValue(_cgDesiredFront);
@@ -1034,7 +1034,7 @@ float Airplane::getCGMAC()
     if (_wing) {
       float cg[3];
       _model.getBody()->getCG(cg);
-      return (_wing->getMACx() - cg[0]) / _wing->getMAC();
+      return (_wing->getMACx() - cg[0]) / _wing->getMACLength();
     }
     return 0;
 }
diff --git a/src/FDM/YASim/Wing.hpp b/src/FDM/YASim/Wing.hpp
index d31d752c3..4cb26b051 100644
--- a/src/FDM/YASim/Wing.hpp
+++ b/src/FDM/YASim/Wing.hpp
@@ -78,7 +78,7 @@ public:
     float getArea() const { return _wingspan*_meanChord; };
     float getAspectRatio() const { return _aspectRatio; };
     float getSMC() const { return _meanChord; };
-    float getMAC() const { return _mac; }; // get length of MAC
+    float getMACLength() const { return _mac; }; // get length of MAC
     float getMACx() const { return _macX; }; // get x-coord of MAC leading edge 
     float getMACy() const { return _base[1]+_macRootDistance; }; // get y-coord of MAC leading edge 
     
diff --git a/src/FDM/YASim/yasim-test.cpp b/src/FDM/YASim/yasim-test.cpp
index 8c4f69d63..d4f9f1518 100644
--- a/src/FDM/YASim/yasim-test.cpp
+++ b/src/FDM/YASim/yasim-test.cpp
@@ -248,7 +248,7 @@ int main(int argc, char** argv)
     float MAC = 0, MACx = 0, MACy = 0;
     Wing* wing = a->getWing();
     if (wing) {
-      MAC = a->getWing()->getMAC();
+      MAC = a->getWing()->getMACLength();
       MACx = a->getWing()->getMACx();
       MACy = a->getWing()->getMACy();
     }