[Ravl-commits] SF.net SVN: ravl:[8080] main/Ravl/Image/Processing/Edges

[<ee...@us...>]

Revision: 8080
          http://ravl.svn.sourceforge.net/ravl/?rev=8080&view=rev
Author:   ees1wc
Date:     2011-07-13 10:18:16 +0000 (Wed, 13 Jul 2011)

Log Message:
-----------
Corrected threshold argument order

Modified Paths:
--------------
    main/Ravl/Image/Processing/Edges/EdgeDetector.cc
    main/Ravl/Image/Processing/Edges/EdgeDetector.hh
    main/Ravl/Image/Processing/Edges/EdgeLink.cc
    main/Ravl/Image/Processing/Edges/EdgeLink.hh
    main/Ravl/Image/Processing/Edges/testEdges.cc

Modified: main/Ravl/Image/Processing/Edges/EdgeDetector.cc
===================================================================
--- main/Ravl/Image/Processing/Edges/EdgeDetector.cc	2011-07-13 09:25:36 UTC (rev 8079)
+++ main/Ravl/Image/Processing/Edges/EdgeDetector.cc	2011-07-13 10:18:16 UTC (rev 8080)
@@ -17,7 +17,7 @@
 
   //: Constructor.
   
-  EdgeDetectorBodyC::EdgeDetectorBodyC(bool nuseDeriche,RealT nminHyst,RealT nmaxHyst) 
+  EdgeDetectorBodyC::EdgeDetectorBodyC(bool nuseDeriche,RealT nmaxHyst,RealT nminHyst) 
     : minHyst(nminHyst),
       maxHyst(nmaxHyst),
       useDeriche(nuseDeriche),
@@ -45,7 +45,7 @@
     IntT edgels;
     nonMaxSup.Apply(edgeDr,edgeDc,edgeMag,nonMax,mean,edgels);
     
-    edgeMap = HysteresisThreshold(nonMax,minHyst,maxHyst);
+    edgeMap = HysteresisThreshold(nonMax,maxHyst,minHyst);
     
     return true;
   }
@@ -116,7 +116,7 @@
     IntT edgels;
     nonMaxSup.Apply(edgeDr,edgeDc,edgeMag,nonMax,mean,edgels);
     
-    edgeMap = HysteresisThreshold(nonMax,minHyst,maxHyst);
+    edgeMap = HysteresisThreshold(nonMax,maxHyst,minHyst);
     
     return true;    
   }

Modified: main/Ravl/Image/Processing/Edges/EdgeDetector.hh
===================================================================
--- main/Ravl/Image/Processing/Edges/EdgeDetector.hh	2011-07-13 09:25:36 UTC (rev 8079)
+++ main/Ravl/Image/Processing/Edges/EdgeDetector.hh	2011-07-13 10:18:16 UTC (rev 8080)
@@ -32,7 +32,7 @@
     : public RCBodyC
   {
   public:
-    EdgeDetectorBodyC(bool useDeriche,RealT minHyst,RealT maxHyst);
+    EdgeDetectorBodyC(bool useDeriche,RealT maxHyst,RealT minHyst);
     //: Constructor.
     
     bool Apply(const ImageC<RealT> &img,EdgeLinkC &edgeMap,ImageC<RealT> &edgeDr,ImageC<RealT> &edgeDc,ImageC<RealT> &edgeMag) const;
@@ -97,7 +97,7 @@
     //: Default constructor.
     // Creates an invalid handle.
     
-    EdgeDetectorC(bool useDeriche,RealT minHyst= 15,RealT maxHyst = 20)
+    EdgeDetectorC(bool useDeriche,RealT maxHyst = 20,RealT minHyst= 15)
       : RCHandleC<EdgeDetectorBodyC>(*new EdgeDetectorBodyC(useDeriche,minHyst,maxHyst))
     {}
     //: Constructor.

Modified: main/Ravl/Image/Processing/Edges/EdgeLink.cc
===================================================================
--- main/Ravl/Image/Processing/Edges/EdgeLink.cc	2011-07-13 09:25:36 UTC (rev 8079)
+++ main/Ravl/Image/Processing/Edges/EdgeLink.cc	2011-07-13 10:18:16 UTC (rev 8080)
@@ -25,16 +25,16 @@
 
 namespace RavlImageN {
 
-  EdgeLinkC HysteresisThreshold(const ImageC<RealT> &img,RealT upThr,RealT downThr) {
+  EdgeLinkC HysteresisThreshold(const ImageC<RealT> &img,RealT maxThr,RealT minThr) {
     EdgeLinkC ret(img.Rectangle());
     Array2dIter2C<ByteT,RealT> it(ret,img);
     for(;it;it++)
-      it.Data1() = (it.Data2() <= downThr) ? EDGE_PROC : EDGE_UNPROC;
+      it.Data1() = (it.Data2() <= minThr) ? EDGE_PROC : EDGE_UNPROC;
     
     DrawFrame(ret,(ByteT) EDGE_PROC,ret.Frame());
     
     for(it.First();it;it++)
-      if((it.Data2() > upThr) && (((EdgeStateT) it.Data1()) == EDGE_UNPROC))
+      if((it.Data2() > maxThr) && (((EdgeStateT) it.Data1()) == EDGE_UNPROC))
 	ret.LabelContour(it.Index());
     
 #if 0
@@ -114,7 +114,7 @@
     return ret;
   }
 
-  //: List all edgles in image
+  //: List all edgels in image
   
   SArray1dC<EdgelC> EdgeLinkC::ArrayOfEdgels(const ImageC<RealT> & inDrIm, 
 					     const ImageC<RealT> & inDcIm,  
@@ -136,7 +136,7 @@
     return ret;
   }
 
-  //: Generate a list of all edgles in image
+  //: Generate a list of all edgels in image
   
   DListC<EdgelC> EdgeLinkC::ListOfEdgels(const ImageC<RealT> & inDrIm, 
 					 const ImageC<RealT> & inDcIm,  

Modified: main/Ravl/Image/Processing/Edges/EdgeLink.hh
===================================================================
--- main/Ravl/Image/Processing/Edges/EdgeLink.hh	2011-07-13 09:25:36 UTC (rev 8079)
+++ main/Ravl/Image/Processing/Edges/EdgeLink.hh	2011-07-13 10:18:16 UTC (rev 8080)
@@ -125,7 +125,7 @@
     UIntT edgeCount; // Count of edges in the map.
   };
   
-  EdgeLinkC HysteresisThreshold(const ImageC<RealT> &img,RealT upThr,RealT downThr);
+  EdgeLinkC HysteresisThreshold(const ImageC<RealT> &img,RealT maxThr,RealT minThr);
 }
 
 

Modified: main/Ravl/Image/Processing/Edges/testEdges.cc
===================================================================
--- main/Ravl/Image/Processing/Edges/testEdges.cc	2011-07-13 09:25:36 UTC (rev 8079)
+++ main/Ravl/Image/Processing/Edges/testEdges.cc	2011-07-13 10:18:16 UTC (rev 8080)
@@ -108,10 +108,10 @@
 
   if (!det.Apply(imgB, edgeArrayList)) return __LINE__;
   if (edgeArrayList.Size() != 1) return __LINE__;
-  if (edgeArrayList.First().Size() != 12) return __LINE__;
-  for (IntT i=0; i<12; ++i) {
+  if (edgeArrayList.First().Size() != 7) return __LINE__;
+  for (IntT i=0; i<edgeArrayList.First().Size(); ++i) {
     if (edgeArrayList.First()[i].At()[0] != imgB.Rows()/2) return __LINE__;
-    if (edgeArrayList.First()[i].At()[1] != i+6)  return __LINE__;
+    if (edgeArrayList.First()[i].At()[1] != i+11)  return __LINE__;
   }
   cout << "DListC<SArray1dC<EdgelC> > size: " << edgeArrayList.First().Size()
        << "\n  uses #8\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.