Changeset 2425

Timestamp:

12/20/06 11:29:50 (6 years ago)

Author:

balister

Message:

Builds without any signal processing.

Location:

components/EnergyMeasure/trunk/EnergyMeasure

Files:

• EnergyMeasure.cpp (modified) (6 diffs)
• EnergyMeasure.h (modified) (2 diffs)

components/EnergyMeasure/trunk/EnergyMeasure/EnergyMeasure.cpp

@@ -24 +24 @@
 #include <string>
 #include <iostream>
+
 #include "EnergyMeasure.h"
 
@@ -31 +32 @@
 
 
-    processing_thread = new omni_thread(process_data, (void *) this);   //Create the thread for the writer's processing function 
+    processing_thread = new omni_thread(run_process_data, (void *) this);   //Create the thread for the writer's processing function 
     processing_thread->start();    //Start the thread containing the writer's processing function 
 
@@ -84 +85 @@
     std::cout << "props length : " << props.length() << std::endl;
 
-    for (unsigned int i = 0; i <props.length(); i++)
-    {
+    for (unsigned int i = 0; i <props.length(); i++) {
         std::cout << "Property id : " << props[i].id << std::endl;
 
-        if (strcmp(props[i].id, "DCE:2a20d289-f84a-4acd-bf5b-449c30e72949") == 0)
-        {
-            CORBA::unsupported_type simple_temp;
-            props[i].value >>= simple_temp;
-            simple_0_value = simple_temp;
+        // outputFileName, string - If set, write output to the file with the name passed in the property
+        if (strcmp(props[i].id, "DCE:2a20d289-f84a-4acd-bf5b-449c30e72949") == 0) {
+            const char *str;
+            props[i].value >>= str;
+
+            fileName = str;
+            std::cout << "EnergyMeasure: Output file name is: " << fileName << std::endl;
         }
-
-        if (strcmp(props[i].id, "DCE:2a32bbe6-c43f-44f6-b553-b51c95f40e33") == 0)
-        {
-            CORBA::unsupported_type simple_temp;
-            props[i].value >>= simple_temp;
-            simple_1_value = simple_temp;
+        
+        // display, boolean - If true print the per packet energy to the console
+        if (strcmp(props[i].id, "DCE:2a32bbe6-c43f-44f6-b553-b51c95f40e33") == 0) {
+            CORBA::Boolean b;
+            props[i].value >>= b;
+            printEnergy = b;
         }
 
@@ -105 +107 @@
 }
 
-void process_data(void *data)
+void EnergyMeasure_i::process_data()
 {
     std::cout << "EnergyMeasure's process_data thread started" << std::endl;
-
-    EnergyMeasure_i *Class_instance_name = (EnergyMeasure_i *) data;  //Change Class_instance_name here i.e. to Tx, Rx, Channel, Modulator...
-    
-
 
     PortTypes::ShortSequence *I_in_0(NULL), *Q_in_0(NULL);
@@ -118 +116 @@
     while(1)
     {
-        Class_instance_name->dataIn_0->getData(I_in_0, Q_in_0);
+        dataIn_0->getData(I_in_0, Q_in_0);
 
         I_in_0_length = I_in_0->length();
@@ -130 +128 @@
 
 
-        Class_instance_name->dataIn_0->bufferEmptied();
+        dataIn_0->bufferEmptied();
     }
 }

components/EnergyMeasure/trunk/EnergyMeasure/EnergyMeasure.h

@@ -25 +25 @@
 #define ENERGYMEASURE_IMPL_H
 
+#include <string>
+
 #include <stdlib.h>
+
 #include "ossie/cf.h"
 
 
 #include "ossie/PortTypes.h"
+
 #include "standardinterfaces/complexShort.h"
 #include "standardinterfaces/complexShort_p.h"
 
 #include "ossie/Resource_impl.h"
+
 class EnergyMeasure_i;
-
-void process_data(void *data);
 
 class EnergyMeasure_i : public virtual Resource_impl
 {
-
-    friend void process_data(void *data);
-
     public:
         EnergyMeasure_i(const char *uuid, omni_condition *sem);
         ~EnergyMeasure_i(void);
+
+        static void run_process_data(void *data) { ((EnergyMeasure_i *)data)->process_data();};
 
         void start() throw (CF::Resource::StartError, CORBA::SystemException);
@@ -62 +64 @@
         EnergyMeasure_i(EnergyMeasure_i&);
    
+        void process_data();
+
         omni_condition *component_running;  //for component shutdown
         omni_thread *processing_thread;     //for component writer function
         
-        CORBA::String simple_0_value;
-        CORBA::Boolean simple_1_value;
+        std::string fileName;
+        bool printEnergy;