clean-up

lorejam · Aug 27, 2014 · f01eba7 · f01eba7
1 parent b6ea797
commit f01eba7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/karmaLearn/main.cpp b/karmaLearn/main.cpp
@@ -144,7 +144,7 @@ class KarmaLearn: public RFModule
 
     Semaphore mutex;
     RpcServer rpcPort;
-    Port      plotPort;
+    BufferedPort<ImageOf<PixelMono> > plotPort;
 
     /************************************************************************/
     IMachineLearner *createLearner()
@@ -361,7 +361,8 @@ class KarmaLearn: public RFModule
 
             if (predict(plotItem,input,output,variance))
             {
-                ImageOf<PixelMono> img; img.resize(320,240);
+                ImageOf<PixelMono> &img=plotPort.prepare();
+                img.resize(320,240);
                 for (int x=0; x<img.width(); x++)
                     for (int y=0; y<img.height(); y++)
                         img(x,y)=255;
@@ -416,7 +417,7 @@ class KarmaLearn: public RFModule
                     pold=p;
                 }
 
-                plotPort.write(img);
+                plotPort.write();
             }
         }
     }

diff --git a/karmaToolFinder/main.cpp b/karmaToolFinder/main.cpp
@@ -476,9 +476,9 @@ class FinderModule: public RFModule, public PortReader
     bool               enabled;
 
     BufferedPort<ImageOf<PixelBgr> > imgInPort;
-    Port                             imgOutPort;
+    BufferedPort<ImageOf<PixelBgr> > imgOutPort;
     Port                             dataInPort;
-    Port                             logPort;
+    BufferedPort<Vector>             logPort;
 
     /************************************************************************/
     bool read(ConnectionReader &connection)
@@ -511,7 +511,9 @@ class FinderModule: public RFModule, public PortReader
 
             if (logPort.getOutputCount()>0)
             {
-                Vector log=p;
+                Vector &log=logPort.prepare();
+
+                log=p;
                 for (int i=0; i<H.rows(); i++)
                     log=cat(log,H.getRow(i));
                 for (int i=0; i<Prj.rows(); i++)
@@ -521,7 +523,7 @@ class FinderModule: public RFModule, public PortReader
                 for (int i=0; i<He.rows(); i++)
                     log=cat(log,He.getRow(i));
 
-                logPort.write(log);
+                logPort.write();
             }
 
             mutex.wait();
@@ -827,7 +829,8 @@ class FinderModule: public RFModule, public PortReader
                 tip.addInt(point_t.x);
                 tip.addInt(point_t.y);
 
-                imgOutPort.write(*pImgBgrIn);
+                imgOutPort.prepare()=*pImgBgrIn;
+                imgOutPort.write();
             }
         }