Changeset 8586

Timestamp:

01/21/09 11:53:20 (4 years ago)

Author:

mcarrick

Message:

removing metadata from interpolator

Location:

ossiedev/trunk/components/Interpolator

Files:

• Interpolator.cpp (moved) (moved from ossiedev/trunk/components/Interpolator/Interpolator_metadata.cpp) (22 diffs)
• Interpolator.h (moved) (moved from ossiedev/trunk/components/Interpolator/Interpolator_metadata.h) (7 diffs)
• Interpolator.prf.xml (moved) (moved from ossiedev/trunk/components/Interpolator/Interpolator_metadata.prf.xml) (4 diffs)
• Interpolator.scd.xml (moved) (moved from ossiedev/trunk/components/Interpolator/Interpolator_metadata.scd.xml)
• Interpolator.spd.xml (moved) (moved from ossiedev/trunk/components/Interpolator/Interpolator_metadata.spd.xml) (2 diffs)
• Makefile.am (modified) (1 diff)
• README.txt (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• main.cpp (modified) (4 diffs)

ossiedev/trunk/components/Interpolator/Interpolator.cpp

@@ -3 +3 @@
 Copyright 2006, 2007 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE Interpolator_metadata.
-
-OSSIE Interpolator_metadata is free software; you can redistribute it and/or modify
+This file is part of the OSSIE Interpolator.
+
+OSSIE Interpolator is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE Interpolator_metadata is distributed in the hope that it will be useful,
+OSSIE Interpolator is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE Interpolator_metadata; if not, write to the Free Software
+along with OSSIE Interpolator; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -26 +26 @@
 #include "ossie/debug.h"
 
-#include "Interpolator_metadata.h"
-
-Interpolator_metadata_i::Interpolator_metadata_i(const char *uuid, omni_condition *con) : 
+#include "Interpolator.h"
+
+Interpolator_i::Interpolator_i(const char *uuid, omni_condition *con) : 
     Resource_impl(uuid),
     component_running(con),
@@ -39 +39 @@
     previous_length = 0;
 
-    dataIn = new standardInterfacesMD_i::complexShort_p("inData");
-    dataOut = new standardInterfacesMD_i::complexShort_u("outData");
+    dataIn = new standardInterfaces_i::complexShort_p("inData");
+    dataOut = new standardInterfaces_i::complexShort_u("outData");
 
     // Start the run_interpolation thread
@@ -61 +61 @@
                                   
 
-Interpolator_metadata_i::~Interpolator_metadata_i(void)
+Interpolator_i::~Interpolator_i(void)
 {
     delete dataIn;
@@ -72 +72 @@
 }
 
-CORBA::Object_ptr Interpolator_metadata_i::getPort( const char* portName) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort)
-{
-    DEBUG(4, Interpolator_metadata, "Interpolator_metadata getPort() called with: " << portName);
+CORBA::Object_ptr Interpolator_i::getPort( const char* portName) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort)
+{
+    DEBUG(4, Interpolator, "Interpolator getPort() called with: " << portName);
 
     CORBA::Object_var p;
@@ -91 +91 @@
 }
 
-void Interpolator_metadata_i::start() throw (CORBA::SystemException, CF::Resource::StartError)
-{
-    DEBUG(3, Interpolator_metadata, "Interpolator_metadata start() called")
-}
-
-void Interpolator_metadata_i::stop() throw (CORBA::SystemException, CF::Resource::StopError) 
-{
-    DEBUG(3, Interpolator_metadata, "Interpolator_metadata stop() called")
-}
-
-void Interpolator_metadata_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError)
-{
-    DEBUG(3, Interpolator_metadata, "In releaseObject.");
+void Interpolator_i::start() throw (CORBA::SystemException, CF::Resource::StartError)
+{
+    DEBUG(3, Interpolator, "Interpolator start() called")
+}
+
+void Interpolator_i::stop() throw (CORBA::SystemException, CF::Resource::StopError) 
+{
+    DEBUG(3, Interpolator, "Interpolator stop() called")
+}
+
+void Interpolator_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError)
+{
+    DEBUG(3, Interpolator, "In releaseObject.");
     component_running->signal();
-    DEBUG(3, Interpolator_metadata, "Leaving releaseObject.");
+    DEBUG(3, Interpolator, "Leaving releaseObject.");
  }
 
-void Interpolator_metadata_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException)
+void Interpolator_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException)
 {
 #ifdef INTERP_LOGGING
@@ -116 +116 @@
 }
 
-void Interpolator_metadata_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration)
-{
-    DEBUG(3, Interpolator_metadata, "Interpolator_metadata configure() called")
+void Interpolator_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration)
+{
+    DEBUG(3, Interpolator, "Interpolator configure() called")
         
-    DEBUG(3, Interpolator_metadata, "Props length : " << props.length())
+    DEBUG(3, Interpolator, "Props length : " << props.length())
 
     for (unsigned int i = 0; i < props.length(); i++) {
-        DEBUG(3, Interpolator_metadata, "Property id : " << props[i].id)
-
-        if (strcmp(props[i].id, "DCE:8ebaf719-be0f-48af-b623-524989b43862") == 0) {
+        DEBUG(3, Interpolator, "Property id : " << props[i].id)
+
+        if (strcmp(props[i].id, "DCE:e5c1d4aa-4b7f-48b7-b3bf-ed90b7653bec") == 0) {
             // InterpFactor property, sets the interpolation factor
             CORBA::UShort D;
@@ -133 +133 @@
 
             M = D;
-            DEBUG(3, Interpolator_metadata, "Interpolation factor set to " << M)
+            DEBUG(3, Interpolator, "Interpolation factor set to " << M)
             std::cout << std::endl << "INTERP: k = " << M << std::endl;
             isConfigured_k = true;
-        } else if (strcmp(props[i].id, "DCE:c3dcab06-841f-4259-a54f-a82c6209f59e") == 0) {
+        } else if (strcmp(props[i].id, "DCE:9c39de73-54d4-43ad-ab9d-52f5fa526ddf") == 0) {
             // filter property, Filter coefficients
             CORBA::FloatSeq *coeff_ptr;
@@ -151 +151 @@
 
                 h = new float[len_h];
-                DEBUG(3, Interpolator_metadata, "Interpolator filter length = " << len_h)
+                DEBUG(3, Interpolator, "Interpolator filter length = " << len_h)
                 for (unsigned int i = 0; i < len_h; i++) {
                     h[i] = (*coeff_ptr)[i];
-                    //DEBUG(4, Interpolator_metadata, "Coeff[" << i << "] = " << h[i])
+                    //DEBUG(4, Interpolator, "Coeff[" << i << "] = " << h[i])
                     printf("g(%d) = %f;\n", i+1, h[i]);
                 }
@@ -165 +165 @@
             }
 
-        } else if (strcmp(props[i].id, "DCE:d462e7b6-3128-4fa5-9f73-c5b319b4bbf0") == 0) {
+        } else if (strcmp(props[i].id, "DCE:e65ba870-4c11-11dc-9470-00123f63025f") == 0) {
             // pulse shape
             const char * prop_str;
@@ -176 +176 @@
             } else {
                 // unknown pulse shape
-                std::cerr << "ERROR: Interpolator_metadata::configure() unknown pulse shape "
+                std::cerr << "ERROR: Interpolator::configure() unknown pulse shape "
                           << prop_str << std::endl;
                 throw CF::PropertySet::InvalidConfiguration();
@@ -183 +183 @@
             std::cout << std::endl << "INTERP: pulse_shape = " << pulseShape << std::endl;
 
-        } else if (strcmp(props[i].id, "DCE:58320c73-0498-452a-aa94-48f7df572534") == 0) {
+        } else if (strcmp(props[i].id, "DCE:f6843fdc-4c11-11dc-b0be-00123f63025f") == 0) {
             // m : symbol delay
             CORBA::UShort simple_temp;
@@ -190 +190 @@
             isConfigured_m = true;
             std::cout << std::endl << "INTERP: m = " << m << std::endl;
-        } else if (strcmp(props[i].id, "DCE:8ce7c2bc-b7f7-427b-ada8-7c1c0c7eded1") == 0) {
+        } else if (strcmp(props[i].id, "DCE:fed01972-4c11-11dc-8d59-00123f63025f") == 0) {
             // beta : excess bandwidth factor
             CORBA::Float simple_temp;
@@ -198 +198 @@
             std::cout << std::endl << "INTERP: beta = " << beta << std::endl;
         } else {
-            std::cerr << "Interpolator_metadata: Unknown property id " << props[i].id << std::endl;
+            std::cerr << "Interpolator: Unknown property id " << props[i].id << std::endl;
             throw CF::PropertySet::InvalidConfiguration();
         }
@@ -215 +215 @@
 
         ///\todo do not assume always rrcos filter
-        std::cout << "Interpolator_metadata designing new rrcos filter: "
+        std::cout << "Interpolator designing new rrcos filter: "
                   << pulseShape << ", k=" << M << ", m=" << m << ", beta=" << beta
                   << std::endl;
@@ -231 +231 @@
 }
 
-void Interpolator_metadata_i::run_interpolation()
-{
-    DEBUG(3, Interpolator_metadata, "Interpolator_metadata run_interpolation() thread started")
+void Interpolator_i::run_interpolation()
+{
+    DEBUG(3, Interpolator, "Interpolator run_interpolation() thread started")
     PortTypes::ShortSequence *I_in, *Q_in;
     PortTypes::ShortSequence I_out, Q_out;
@@ -243 +243 @@
     while (1) {
 
-        dataIn->getData(I_in, Q_in, metadata);
+        dataIn->getData(I_in, Q_in);//, metadata);
         {
             omni_mutex_lock l(accessPrivateData);
@@ -251 +251 @@
 
         // Adjust MetaData tags
-        if ( createDynamicFilter )
+/*        if ( createDynamicFilter )
             metadata->signal_bandwidth *= (float) ( metadata->sampling_frequency * (1+beta) );
         else
@@ -257 +257 @@
 
         metadata->sampling_frequency *= (float) M;
-
+*/
 
         unsigned int len = I_in->length();
@@ -263 +263 @@
 
         if (len != old_len || M_factor != old_M) {
-            DEBUG(4, Interpolator_metadata, "data len or M changed.");
+            DEBUG(4, Interpolator, "data len or M changed.");
             I_out.length(len * M_factor);
             Q_out.length(len * M_factor);
             old_len = len;
             old_M = M_factor;
-            DEBUG(4, Interpolator_metadata, "New data len: " << len << " M: " << M);
+            DEBUG(4, Interpolator, "New data len: " << len << " M: " << M);
         }
 
         for (unsigned int i = 0; i < len; i++) {
 
-            DEBUG(8, Interpolator_metadata, "About to filter data.");
+            DEBUG(8, Interpolator, "About to filter data.");
             i_filter->do_work(true, (*I_in)[i], I_out[out_idx]);
             q_filter->do_work(true, (*Q_in)[i], Q_out[out_idx]);
-            DEBUG(8, Interpolator_metadata, "Done filtering data.");
+            DEBUG(8, Interpolator, "Done filtering data.");
 
 #ifdef INTERP_LOGGING
@@ -297 +297 @@
         }
         dataIn->bufferEmptied();
-        dataOut->pushPacket(I_out, Q_out, *metadata);
+        dataOut->pushPacket(I_out, Q_out);//, *metadata);
     }
 }

ossiedev/trunk/components/Interpolator/Interpolator.h

@@ -3 +3 @@
 Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE Interpolator_metadata.
+This file is part of the OSSIE Interpolator.
 
-OSSIE Interpolator_metadata is free software; you can redistribute it and/or modify
+OSSIE Interpolator is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE Interpolator_metadata is distributed in the hope that it will be useful,
+OSSIE Interpolator is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE Interpolator_metadata; if not, write to the Free Software
+along with OSSIE Interpolator; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -22 +22 @@
 
 
-#ifndef INTERPOLATOR_METADATA_IMPL_H
-#define INTERPOLATOR_METADATA_IMPL_H
+#ifndef INTERPOLATOR_IMPL_H
+#define INTERPOLATOR_IMPL_H
 
 #include <stdlib.h>
@@ -29 +29 @@
 #include "ossie/cf.h"
 
-#include "standardinterfaces-metadata/complexShortMD_u.h"
-#include "standardinterfaces-metadata/complexShortMD_p.h"
+#include "standardinterfaces/complexShort_u.h"
+#include "standardinterfaces/complexShort_p.h"
 
 #include "ossie/Resource_impl.h"
@@ -37 +37 @@
 #undef INTERP_LOGGING
 
-class Interpolator_metadata_i;
+class Interpolator_i;
 
-class Interpolator_metadata_i : public Resource_impl
+class Interpolator_i : public Resource_impl
 {
 
   public:
-    Interpolator_metadata_i(const char *uuid, omni_condition *con);
-    ~Interpolator_metadata_i(void);
+    Interpolator_i(const char *uuid, omni_condition *con);
+    ~Interpolator_i(void);
 
-    static void do_run_interpolation(void *data) { ((Interpolator_metadata_i *)data)->run_interpolation(); };
+    static void do_run_interpolation(void *data) { ((Interpolator_i *)data)->run_interpolation(); };
 
     void start() throw (CF::Resource::StartError, CORBA::SystemException);
@@ -62 +62 @@
 
   private:
-    Interpolator_metadata_i();
-    Interpolator_metadata_i(const Interpolator_metadata_i &);
+    Interpolator_i();
+    Interpolator_i(const Interpolator_i &);
 
     void run_interpolation();
@@ -86 +86 @@
 
     // For data in port
-    standardInterfacesMD_i::complexShort_p *dataIn;
+    standardInterfaces_i::complexShort_p *dataIn;
 
     // For data out port
-    standardInterfacesMD_i::complexShort_u *dataOut;
+    standardInterfaces_i::complexShort_u *dataOut;
 
-    standardInterfacesMD::MetaData *metadata;
+    //standardInterfaces::MetaData *metadata;
 
     // For debugging

ossiedev/trunk/components/Interpolator/Interpolator.prf.xml

@@ -5 +5 @@
 <properties>
 <description />
-    <simple id="DCE:8ebaf719-be0f-48af-b623-524989b43862" type="ushort" name="InterpFactor (k)" mode="readwrite">
+    <simple id="DCE:e5c1d4aa-4b7f-48b7-b3bf-ed90b7653bec" type="ushort" name="InterpFactor (k)" mode="readwrite">
         <value>1</value>
         <kind kindtype="configure" />
     </simple>
-    <simplesequence id="DCE:c3dcab06-841f-4259-a54f-a82c6209f59e" type="float" name="filter" mode="readwrite">
+    <simplesequence id="DCE:9c39de73-54d4-43ad-ab9d-52f5fa526ddf" type="float" name="filter" mode="readwrite">
         <values>
             <value>1.0</value>           
@@ -16 +16 @@
     </simplesequence>
 
-    <simple id="DCE:d462e7b6-3128-4fa5-9f73-c5b319b4bbf0" type="string" name="pulse_shape" mode="readwrite">
+    <simple id="DCE:e65ba870-4c11-11dc-9470-00123f63025f" type="string" name="pulse_shape" mode="readwrite">
         <description>Type of pulse shape to use for filter prototype</description>
         <value>rrcos</value>
@@ -22 +22 @@
     </simple>
 
-    <simple id="DCE:58320c73-0498-452a-aa94-48f7df572534" type="ushort" name="m" mode="readwrite">
+    <simple id="DCE:f6843fdc-4c11-11dc-b0be-00123f63025f" type="ushort" name="m" mode="readwrite">
         <description>Symbol delay</description>
         <value>2</value>
@@ -28 +28 @@
     </simple>
 
-    <simple id="DCE:8ce7c2bc-b7f7-427b-ada8-7c1c0c7eded1" type="float" name="beta" mode="readwrite">
+    <simple id="DCE:fed01972-4c11-11dc-8d59-00123f63025f" type="float" name="beta" mode="readwrite">
         <description>Excess bandwidth factor</description>
         <value>0.3</value>

ossiedev/trunk/components/Interpolator/Interpolator.spd.xml

@@ -3 +3 @@
 <!--Created with OSSIE WaveDev Beta Version 0.5.0b-->
 <!--Powered by Python-->
-<softpkg type="sca_compliant" name="Interpolator_metadata" id="DCE:02c597e8-160b-4986-8439-f9ba52e2a3ee">
+<softpkg type="sca_compliant" name="Interpolator" id="DCE:e1a32064-21c5-11db-a265-000f1fd5acd7">
     <title/>
     <author>
@@ -11 +11 @@
     </author>
     <propertyfile type="PRF">
-        <localfile name="xml/Interpolator_metadata/Interpolator_metadata.prf.xml"/>
+        <localfile name="xml/Interpolator/Interpolator.prf.xml"/>
     </propertyfile>
     <descriptor>
-        <localfile name="xml/Interpolator_metadata/Interpolator_metadata.scd.xml"/>
+        <localfile name="xml/Interpolator/Interpolator.scd.xml"/>
     </descriptor>
-    <implementation id="DCE:00163ccc-4939-4273-a34e-59acd71e6931" aepcompliance="aep_compliant">
+    <implementation id="DCE:e1a41b54-21c5-11db-9618-000f1fd5acd7" aepcompliance="aep_compliant">
         <description>Default Description</description> 
         <code type="Executable">
-            <localfile name="bin/Interpolator_metadata"/>
+            <localfile name="bin/Interpolator"/>
         </code>
         <processor name="x86"/>

ossiedev/trunk/components/Interpolator/Makefile.am

@@ -2 +2 @@
 AM_CXXFLAGS = -Wall 
 
-ossieName = Interpolator_metadata
+ossieName = Interpolator
 dombindir = $(prefix)/bin
-dombin_PROGRAMS = Interpolator_metadata
+dombin_PROGRAMS = Interpolator
 
 xmldir = $(prefix)/xml/$(ossieName)
-dist_xml_DATA = Interpolator_metadata.prf.xml Interpolator_metadata.scd.xml \
-Interpolator_metadata.spd.xml 
+dist_xml_DATA = Interpolator.prf.xml Interpolator.scd.xml \
+Interpolator.spd.xml 
 
-Interpolator_metadata_SOURCES = Interpolator_metadata.cpp Interpolator_metadata.h main.cpp
+Interpolator_SOURCES = Interpolator.cpp Interpolator.h main.cpp
 
 # --- documentation ---

ossiedev/trunk/components/Interpolator/README.txt

@@ -1 +1 @@
 README.txt
 
-Interpolator_metadata
+Interpolator
 
 Based off Decimator. Uses 31 tap filter. Probably overkill...

ossiedev/trunk/components/Interpolator/configure.ac

@@ -1 @@
-AC_INIT(Interpolator_metadata, 0.0.1)
+AC_INIT(interpolator, 0.0.1)
 AM_INIT_AUTOMAKE
 
@@ -24 +24 @@
 AC_CHECK_LIB([standardInterfaces], [main], [], [AC_MSG_ERROR([cannot find standardInterfaces])])
 AC_CHECK_HEADERS([standardinterfaces/complexShort.h], [], [AC_MSG_ERROR([cannot find standardInterfaces header files])])
-AC_CHECK_LIB([standardInterfaces_metadata], [main], [], [AC_MSG_ERROR([cannot find standardInterfaces-metadata])])
-AC_CHECK_HEADERS([standardinterfaces-metadata/complexShortMD.h], [], [AC_MSG_ERROR([cannot find standardInterfaces-metadata header files])])
 
 AC_LANG_POP

ossiedev/trunk/components/Interpolator/main.cpp

@@ -3 +3 @@
 Copyright 2006 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE Interpolator_metadata.
+This file is part of the OSSIE Interpolator.
 
-OSSIE Interpolator_metadata is free software; you can redistribute it and/or modify
+OSSIE Interpolator is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-OSSIE Interpolator_metadata is distributed in the hope that it will be useful,
+OSSIE Interpolator is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -16 +16 @@
 
 You should have received a copy of the GNU General Public License
-along with OSSIE Interpolator_metadata; if not, write to the Free Software
+along with OSSIE Interpolator; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
@@ -25 +25 @@
 #include "ossie/debug.h"
 
-#include "Interpolator_metadata.h"
+#include "Interpolator.h"
 
 using namespace std;
-using namespace standardInterfacesMD;  // For standard OSSIE interface classes
+using namespace standardInterfaces;  // For standard OSSIE interface classes
 
 
@@ -48 +48 @@
     cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
-    Interpolator_metadata_i* interpolator_servant;
+    Interpolator_i* interpolator_servant;
     CF::Resource_var interpolator_var;
 
     // Create the interpolator component servant and object reference
 
-    interpolator_servant = new Interpolator_metadata_i(uuid, component_running);
+    interpolator_servant = new Interpolator_i(uuid, component_running);
     interpolator_var = interpolator_servant->_this();