comparison src/Modules/Output/Graphics/GraphAxisSpec.cc @ 118:18237d55e346

- A few changes to get graphics working. In progress.

 #include "Support/Common.h"
 #include <string.h>
 #include <stdio.h>
 
 #include "Modules/Output/Graphics/GraphAxisSpec.h"
+
+namespace aimc {
 
 GraphAxisSpec::GraphAxisSpec(float fMin, float fMax, Scale::ScaleType iScale) {
   m_pScale = NULL;
   m_sLabel = NULL;
   SetDisplayRange(fMin, fMax);

 }
 
 void GraphAxisSpec::SetDisplayScale(Scale::ScaleType iScale) {
   DELETE_IF_NONNULL(m_pScale);
   m_pScale = Scale::Create(iScale);
-  aimASSERT(m_pScale);
+  AIM_ASSERT(m_pScale);
   m_pScale->FromLinearScaledExtrema(m_fMin, m_fMax);
 }
 
 bool GraphAxisSpec::Initialize(Parameters *parameters,
                                const char *sPrefix,
                                float fMin,
                                float fMax,
                                Scale::ScaleType iScale) {
-  AIM_ASSERT(pParam);
+  AIM_ASSERT(parameters);
   AIM_ASSERT(sPrefix && sPrefix[0]!='\0');
   char sParamName[Parameters::MaxParamNameLength];
 
   //! The following parameters are recognized for each axis:
   //!   - \c "<prefix>.min", the minimum value; a float or \c 'auto'
   snprintf(sParamName, sizeof(sParamName)/sizeof(sParamName[0]),
           "%s.min",
           sPrefix);
-  if (pParam->IsSet(sParamName)) {
+  if (parameters->IsSet(sParamName)) {
     if (strcmp(parameters->GetString(sParamName), "auto") == 0)
       m_fMin = fMin;
     else
       m_fMin = parameters->GetFloat(sParamName);
   }
 
   //!   - \c "<prefix>.max", the maximum value; a float or \c 'auto'
   snprintf(sParamName, sizeof(sParamName)/sizeof(sParamName[0]),
           "%s.max",
           sPrefix);
-  if (pParam->IsSet(sParamName)) {
+  if (parameters->IsSet(sParamName)) {
     if (strcmp(parameters->GetString(sParamName), "auto")==0)
       m_fMax = fMax;
     else
       m_fMax = parameters->GetFloat(sParamName);
   }

   //!   - \c "<prefix>.scale", the scale; one of \c 'auto',
   //!     \c 'linear', \c 'erb' or \c 'log'
   snprintf(sParamName, sizeof(sParamName)/sizeof(sParamName[0]),
            "%s.scale",
            sPrefix);
-  if (pParam->IsSet(sParamName)) {
+  if (parameters->IsSet(sParamName)) {
     // Scale change, we updated min/max values already so no need to
     Scale::ScaleType iThisScale;
     const char *sVal = parameters->GetString(sParamName);
     if (strcmp(sVal, "auto")==0)
       iThisScale = iScale;

     else if (strcmp(sVal, "erb")==0)
       iThisScale = Scale::SCALE_ERB;
     else if (strcmp(sVal, "log")==0)
       iThisScale = Scale::SCALE_LOG;
     else {
-      AIM_ERROR(_T("Unrecognized scale type in parameter '%s': '%s'"),
+      LOG_ERROR(_T("Unrecognized scale type in parameter '%s': '%s'"),
                   sParamName,
                   sVal);
       return false;
     }
     SetDisplayScale(iThisScale);

   if (parameters->IsSet(sParamName))
     m_sLabel = parameters->GetString(sParamName); // Assumes strings remains valid
 
   return true;
 }
+}  // namespace aimc