Changeset 4105 for trunk/MagicSoft/Cosy/videodev

Timestamp:

05/20/04 05:01:03 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/videodev

Files:

• Camera.h (modified) (1 diff)
• FilterLed.cc (modified) (3 diffs)

trunk/MagicSoft/Cosy/videodev/Camera.h

@@ -1 @@
-#ifndef CAMERA_H
-#define CAMERA_H
+#ifndef COSY_Camera
+#define COSY_Camera
 
 #ifndef ROOT_TMutex

trunk/MagicSoft/Cosy/videodev/FilterLed.cc

@@ -8 +8 @@
 #include "Ring.h"
 
+#include "MGMap.h"
+
 ClassImp(FilterLed);
-
-void FilterLed::DrawCircle(float cx, float cy, float rpix, byte col) const
-{
-    if (cx-rpix<1 || cy-rpix<1 || cx+rpix>fW-2 || cy+rpix>fH-2)
-        return;
-
-    for (int dx=-(int)(rpix*0.7); dx<(int)(rpix*0.7); dx+=2)
-    {
-        const int dy = (int)sqrt(rpix*rpix-dx*dx);
-        fImg[(int)(cx+dx) + (int)(cy-dy)*fW] = col;
-        fImg[(int)(cx+dx) + (int)(cy+dy)*fW] = col;
-        fImg[(int)(cx-dy) + (int)(cy+dx)*fW] = col;
-        fImg[(int)(cx+dy) + (int)(cy+dx)*fW] = col;
-    }
-}
-
-void FilterLed::DrawCircle(const Ring &l, byte col=0x40) const
-{
-    DrawCircle(l.GetX(), l.GetY(), l.GetR(), col);
-}
-
-void FilterLed::DrawCircle(const Ring &l, double r, byte col=0x40) const
-{
-    DrawCircle(l.GetX(), l.GetY(), r, col);
-}
 
 void FilterLed::DrawBox(const int x1, const int y1,
@@ -39 +16 @@
                         const int col) const
 {
-    for (int x=x1; x<x2+1; x++)
-        for (int y=y1; y<y2+1; y++)
-            if (x>=0 && x<fW-1 && y>=0 && y<fH-1)
-                fImg[y*fW+x] = col;
-}
-
-void FilterLed::MarkPoint(const Led &led) const
-{
-    const int x = (int)(led.GetX()+.5);
-    const int y = (int)(led.GetY()+.5);
-    const int m = (int)(led.GetMag());
-
-    MarkPoint(x, y, m);
+    MGMap::DrawBox(fImg, 768, 576, x1, y1, x2, y2, col);
 }
 
@@ -64 +29 @@
     DrawBox(x+5, y, x+8, y, m);
     DrawBox(x, y-8, x, y-5, m);
+}
+
+void FilterLed::MarkPoint(const Led &led) const
+{
+    const int x = (int)(led.GetX()+.5);
+    const int y = (int)(led.GetY()+.5);
+    const int m = (int)(led.GetMag());
+
+    MarkPoint(x, y, m);
+}
+
+void FilterLed::DrawCircle(float cx, float cy, float r, byte col) const
+{
+    MGMap::DrawCircle(fImg, 768, 576, cx, cy, r, col);
+}
+
+void FilterLed::DrawCircle(const Ring &l, byte col) const
+{
+    DrawCircle(l.GetX(), l.GetY(), l.GetR(), col);
+}
+
+void FilterLed::DrawCircle(const Ring &l, double r, byte col) const
+{
+    DrawCircle(l.GetX(), l.GetY(), r, col);
 }