Changeset 6208

Timestamp:

01/21/08 18:35:34 (5 years ago)

Author:

balister

Message:

Clean up auotgenerated code, and pass data through for testing.

Location:

components/WFMDemod/trunk/WFMDemod

Files:

• WFMdemod.cpp (modified) (4 diffs)
• WFMdemod.h (modified) (1 diff)

components/WFMDemod/trunk/WFMDemod/WFMdemod.cpp

@@ -29 +29 @@
     Resource_impl(uuid), component_running(condition) 
 {
-    dataIn_0 = new standardInterfaces_i::complexShort_p("dataIn");
-    dataOut_0 = new standardInterfaces_i::complexShort_u("dataOut");
+    dataIn = new standardInterfaces_i::complexShort_p("dataIn");
+    dataOut = new standardInterfaces_i::complexShort_u("dataOut");
 
     //Create the thread for the writer's processing function 
@@ -42 +42 @@
 WFMDemod_i::~WFMDemod_i(void)
 {   
-    delete dataIn_0;
-    delete dataOut_0;
+    delete dataIn;
+    delete dataOut;
 }
 
@@ -59 +59 @@
     CORBA::Object_var p;
 
-    p = dataIn_0->getPort(portName);
+    p = dataIn->getPort(portName);
 
     if (!CORBA::is_nil(p))
         return p._retn();
 
-    p = dataOut_0->getPort(portName);
+    p = dataOut->getPort(portName);
 
     if (!CORBA::is_nil(p))
@@ -133 +133 @@
     DEBUG(3, WFMDemod, "ProcessData() invoked")
 
-    PortTypes::ShortSequence I_out_0, Q_out_0;
+    PortTypes::ShortSequence I_out, Q_out;
 
 
-    PortTypes::ShortSequence *I_in_0(NULL), *Q_in_0(NULL);
-    CORBA::UShort I_in_0_length, Q_in_0_length;
+    PortTypes::ShortSequence *I_in(NULL), *Q_in(NULL);
 
     while(1)
     {
-        dataIn_0->getData(I_in_0, Q_in_0);
+        dataIn->getData(I_in, Q_in);
 
-        I_in_0_length = I_in_0->length();
-        Q_in_0_length = Q_in_0->length();
+        I_out = *I_in;
+        Q_out = *Q_in;
 
-        I_out_0.length(); //must define length of output
-        Q_out_0.length(); //must define length of output
-
-        /*insert code here to do work*/
-
-
-
-
-
-
-        dataIn_0->bufferEmptied();
-        dataOut_0->pushPacket(I_out_0, Q_out_0);
+        dataIn->bufferEmptied();
+        dataOut->pushPacket(I_out, Q_out);
     }
 }

components/WFMDemod/trunk/WFMDemod/WFMdemod.h

@@ -95 +95 @@
     
     // list components provides and uses ports
-        standardInterfaces_i::complexShort_p *dataIn_0;
-        standardInterfaces_i::complexShort_u *dataOut_0;
+        standardInterfaces_i::complexShort_p *dataIn;
+        standardInterfaces_i::complexShort_u *dataOut;
     
 };