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

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

 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <algorithm>
+
 #include "Support/Common.h"
 
-#include "Output/GraphicsView.h"
-#include "Output/GraphicsOutputDevice.h"
+#include "Modules/Output/Graphics/GraphicsView.h"
+#include "Modules/Output/Graphics/Devices/GraphicsOutputDevice.h"
+
+namespace aimc {
 
 GraphicsView::GraphicsView(Parameters *parameters) : Module(parameters) {
   module_description_ = "";
   module_identifier_ = "graphics";
   module_type_ = "output";

   AIM_ASSERT(m_pAxisX);
   m_pAxisY = new GraphAxisSpec();
   AIM_ASSERT(m_pAxisY);
   m_pAxisFreq = new GraphAxisSpec();
   AIM_ASSERT(m_pAxisFreq);
-
-  m_pAxisY->Initialize(m_pParam,
-                       _S("graph.y"),
-                       -1,
-                       1,
-                       Scale::SCALE_LINEAR);
+  initialized_ = true;
+
+  if (!m_pAxisY->Initialize(m_pParam,
+                            _S("graph.y"),
+                            -1,
+                            1,
+                            Scale::SCALE_LINEAR)) {
+    LOG_ERROR("Axis initialization failed");
+    initialized_ = false;
+  }
   m_fMarginLeft = m_pParam->GetFloat(_S("graph.margin.left"));
   m_fMarginRight = m_pParam->GetFloat(_S("graph.margin.right"));
   m_fMarginTop = m_pParam->GetFloat(_S("graph.margin.top"));
   m_fMarginBottom = m_pParam->GetFloat(_S("graph.margin.bottom"));
   m_bPlotLabels = m_pParam->GetBool(_S("graph.plotlabels"));

   else if (strcmp(sGraphType, _S("colormap"))==0)
     m_iGraphType = GraphTypeColormap;
   else if (strcmp(sGraphType, _S("none"))==0)
     m_iGraphType = GraphTypeNone;
   else {
-    ret = false;
-    AIM_ERROR(_T("Unrecognized graph type: '%s'"), sGraphType);
+    LOG_ERROR(_T("Unrecognized graph type: '%s'"), sGraphType);
+    initialized_ = false;
   }
 
   if (strcmp(m_pParam->GetString(_S("graph.mindistance")),"auto") == 0)
     // -1 means detect later, based on type and Fire() argument
     m_fMinPlotDistance = -1;
   else
     m_fMinPlotDistance = m_pParam->GetFloat(_S("graph.mindistance"));
-
 }
 
 GraphicsView::~GraphicsView() {
   DELETE_IF_NONNULL(m_pAxisX);
   DELETE_IF_NONNULL(m_pAxisY);
   DELETE_IF_NONNULL(m_pAxisFreq);
 }
 
-bool
+void GraphicsView::ResetInternal() {
+}
 
 bool GraphicsView::InitializeInternal(const SignalBank &bank) {
   if (!m_pDev) {
     LOG_ERROR("Output device not connected");
     return false;

   }
 
   /* Inform graphics output of maximum number of vertices between
    * gBegin*() and gEnd(), for any type of plot. Colormap needs most.
    */
-  if (!m_pDev->Initialize(MAX(10, bank.buffer_length() * 2 + 2))) {
+  if (!m_pDev->Initialize(std::max<int>(10, bank.buffer_length() * 2 + 2))) {
     LOG_ERROR("");
     return false;
   }
+  return true;
 }
 
 void GraphicsView::Process(const SignalBank &bank) {
   float height = 1.0 / bank.channel_count();
   float heightMinMargin = height * (1.0f - m_fMarginBottom - m_fMarginTop);

       break;
 
     // Scale to single channel graphing.
     yOffs = yOffs * (1.0f - height) + height / 2.0;
     yOffs = yOffs * (1.0f - m_fMarginTop - m_fMarginBottom) + m_fMarginBottom;
-    PlotData(bank[i], yOffs, heightMinMargin, xScaling);
+    PlotData(bank[i], bank.sample_rate(), yOffs, heightMinMargin, xScaling);
   }
   m_pDev->gRelease();
 }
 
 void GraphicsView::SetAxisScale(Scale::ScaleType iHori,

    * But if the value changes (or it's the last point), we must draw the
    * previous point too.
    */
   if (!m_bFirstPoint
       && !isLast
-      && fabs(m_fPrevVal-val) < m_fMinPlotDistance) {
+      && abs(m_fPrevVal-val) < m_fMinPlotDistance) {
     m_iPrevValEqual++;
     // Don't set m_fPrevVal to avoid not catching slow changes
     m_fPrevX = x;
     m_fPrevY = y;
     m_fPrevHeight = height;

   default:
     // Shouldn't happen
     AIM_ASSERT(0);
   }
 }
+}  // namespace aimc