[Debian-astro-commits] [gyoto] 115/221: Convert Astrobj::Standard to Object/Property (safetyValue)

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit c307c5caea29a9d21575157020ce6967fa0d0016
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Thu Nov 27 09:33:41 2014 +0100

    Convert Astrobj::Standard to Object/Property (safetyValue)
---
 include/GyotoDefs.h            |  2 ++
 include/GyotoStandardAstrobj.h | 15 ++++-----------
 lib/StandardAstrobj.C          | 21 ++++++---------------
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/include/GyotoDefs.h b/include/GyotoDefs.h
index d2bf69b..0117a1f 100644
--- a/include/GyotoDefs.h
+++ b/include/GyotoDefs.h
@@ -598,6 +598,8 @@ namespace Gyoto {
 # define setBinSpectrumConverter  binSpectrumConverter
 # define setSpectrumConverter     spectrumConverter
 # define setIntensityConverter    intensityConverter
+# define getSafetyValue           safetyValue;
+# define setSafetyValue           safetyValue;
 //\}
 #endif
 
diff --git a/include/GyotoStandardAstrobj.h b/include/GyotoStandardAstrobj.h
index 99cadb8..2fba4a0 100644
--- a/include/GyotoStandardAstrobj.h
+++ b/include/GyotoStandardAstrobj.h
@@ -97,6 +97,8 @@ class Gyoto::Astrobj::Standard :
   // Constructors - Destructor
   // -------------------------
  public:
+  GYOTO_OBJECT;
+
   /**
    *  kind_ =  "Default", rmax_ = 0., rmax_set_ = 0.
    */
@@ -122,8 +124,8 @@ class Gyoto::Astrobj::Standard :
   // Accessors
   // ---------
  public:
-  virtual void setSafetyValue(double val) ; ///< Set Standard::safety_value_
-  virtual double getSafetyValue() const ; ///< Get Standard::safety_value_
+  virtual void safetyValue(double val) ; ///< Set Standard::safety_value_
+  virtual double safetyValue() const ; ///< Get Standard::safety_value_
 
   // Outputs
   // -------
@@ -164,15 +166,6 @@ class Gyoto::Astrobj::Standard :
    */
   virtual double giveDelta(double coord[8]);
 
-  virtual int setParameter(std::string name,
-			   std::string content,
-			   std::string unit = "") ;
-
-
-#ifdef GYOTO_USE_XERCES
-  virtual void fillElement(FactoryMessenger *fmp) const ;
-#endif
-
 };
 
 
diff --git a/lib/StandardAstrobj.C b/lib/StandardAstrobj.C
index df41f2b..1d8c399 100644
--- a/lib/StandardAstrobj.C
+++ b/lib/StandardAstrobj.C
@@ -39,6 +39,10 @@ using namespace std;
 using namespace Gyoto;
 using namespace Gyoto::Astrobj;
 
+GYOTO_PROPERTY_DOUBLE(Standard,
+		      SafetyValue, safetyValue, Generic::properties);
+GYOTO_PROPERTY_FINALIZE(Standard, &SafetyValue);
+
 Standard::Standard(string kin) :
   Generic(kin),
   critical_value_(DBL_MIN), safety_value_(DBL_MAX)
@@ -157,20 +161,7 @@ int Standard::Impact(Photon* ph, size_t index, Properties *data){
 
 }
 
-void Standard::setSafetyValue(double val) {safety_value_ = val; }
-double Standard::getSafetyValue() const { return safety_value_; }
+void Standard::safetyValue(double val) {safety_value_ = val; }
+double Standard::safetyValue() const { return safety_value_; }
 
 double Standard::giveDelta(double *) {return 0.05;}
-
-int Standard::setParameter(string name, string content, string unit)  {
-  if (name == "SafetyValue") safety_value_ = atof(content.c_str());
-  else return Generic::setParameter(name, content, unit);
-  return 0;
-}
-
-#ifdef GYOTO_USE_XERCES
-void Standard::fillElement(FactoryMessenger* fmp) const {
-  fmp -> setParameter("SafetyValue", safety_value_);
-  Generic::fillElement(fmp);
-}
-#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git