comparison trunk/src/Modules/Output/Graphics/GraphicsViewTime.cc @ 399:7bfed53caacf

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

 #include <stdio.h>
 
 #include "Support/SignalBank.h"
 #include "Modules/Output/Graphics/GraphicsView.h"
 #include "Modules/Output/Graphics/GraphicsViewTime.h"
+
+namespace aimc {
 
 GraphicsViewTime::GraphicsViewTime(Parameters *pParam)
   : GraphicsView(pParam) {
 }
 

            _S("%s [%.0f..%.0f Hz, %s scale]"),
            m_pAxisFreq->m_sLabel ? m_pAxisFreq->m_sLabel : "",
            m_pAxisFreq->m_fMin, m_pAxisFreq->m_fMax,
            m_pAxisFreq->m_pScale->getName());
   m_pDev->gText2f(0.0025f, 0.35f, sTxt, true);
-  if (m_bPlotScaled) {
-    snprintf(sTxt, sizeof(sTxt) / sizeof(sTxt[0]),
-             _S("%s [cycles, %s scale]"),
-             m_pAxisX->m_sLabel ? m_pAxisX->m_sLabel : "",
-             m_pAxisX->m_pScale->getName());
-  } else {
-    snprintf(sTxt, sizeof(sTxt) / sizeof(sTxt[0]),
-             _S("%s [%.2f..%.2f ms, %s scale]"),
-             m_pAxisX->m_sLabel ? m_pAxisX->m_sLabel : "",
-             m_pAxisX->m_fMin,
-             m_pAxisX->m_fMax,
-             m_pAxisX->m_pScale->getName());
-  }
+  snprintf(sTxt, sizeof(sTxt) / sizeof(sTxt[0]),
+	   _S("%s [%.2f..%.2f ms, %s scale]"),
+	   m_pAxisX->m_sLabel ? m_pAxisX->m_sLabel : "",
+	   m_pAxisX->m_fMin,
+	   m_pAxisX->m_fMax,
+	   m_pAxisX->m_pScale->getName());
+ 
   m_pDev->gText2f(m_fMarginLeft, 0.0025f, sTxt, false);
 
   // Frame time
-  snprintf(sTxt, sizeof(sTxt)/sizeof(sTxt[0]), _S("t=%.0f ms"),
-           pBank->getSampleTime(0));
-  m_pDev->gText2f(0.8f, 0.0025f, sTxt, false);
+  //snprintf(sTxt, sizeof(sTxt)/sizeof(sTxt[0]), _S("t=%.0f ms"),
+  //         pBank->getSampleTime(0));
+  //m_pDev->gText2f(0.8f, 0.0025f, sTxt, false);
 }
 
 void GraphicsViewTime::PlotData(const vector<float> &signal,
                                 float sample_rate,
                                 float yOffset,
                                 float height,
                                 float xScale) {
-  AIM_ASSERT(pSig);
   AIM_ASSERT(xScale >= 0 && xScale <= 1);
   AIM_ASSERT(height > 0  && height <= 1);
   AIM_ASSERT(yOffset >= 0 && yOffset <= 1);
   AIM_ASSERT(m_pAxisX && m_pAxisX->m_pScale);
   AIM_ASSERT(m_pAxisY && m_pAxisY->m_pScale);

   BeginDataStrip();
 
   // Draw the signal.
   float x = 0;
   float y = 0;
-  for (int i = 0; i < signal.size(); i++) {
+  for (unsigned int i = 0; i < signal.size(); i++) {
     // Find out where to draw and do so
     x = xScale * i;
     y = signal[i];
     x = m_pAxisX->m_pScale->FromLinearScaled(x) + 0.5f;
     y = m_pAxisY->m_pScale->FromLinearScaled(y);

   // Redraw the last point in case it's needed
   PlotDataPoint(x, yOffset, y, height, true);
 
   m_pDev->gEnd();
 }
+}  // namespace aimc