Changeset 5270

Timestamp:

10/07/07 13:24:41 (6 years ago)

Author:

jgaeddert

Message:

fixing source files so that component builds; still needs functionality added

Location:

experimental/components/SubchannelSelector/trunk/SubchannelSelector/src

Files:

• SubchannelSelector.cpp (modified) (1 diff)
• SubchannelSelector.h (modified) (1 diff)
• main.cpp (modified) (5 diffs)

experimental/components/SubchannelSelector/trunk/SubchannelSelector/src/SubchannelSelector.cpp

@@ -112 +112 @@
         std::cout << "Property id : " << props[i].id << std::endl;
 
-        if (strcmp(props[i].id, "DCE:9032b00e-74f4-11dc-a5a4-00123f63025f") == 0)
-        {
+        if (strcmp(props[i].id, "DCE:9032b00e-74f4-11dc-a5a4-00123f63025f") == 0) {
+            // subchannel_frequency
             CORBA::Float simple_temp;
             props[i].value >>= simple_temp;
             simple_0_value = simple_temp;
+        } else if (strcmp(props[i].id, "DCE:b56e1f7a-74f4-11dc-b9ef-00123f63025f") == 0) {
+            // decimation rate
+            CORBA::ULong simple_temp;
+            props[i].value >>= simple_temp;
+            simple_0_value = simple_temp;
+        } else {
+            // unknown property
+            std::cerr << "ERROR: SubchannelSelector::configure() unknown property \""
+               << props[i].id << "\"" << std::endl;
+            throw CF::PropertySet::InvalidConfiguration();
         }
-
-        if (strcmp(props[i].id, "DCE:b56e1f7a-74f4-11dc-b9ef-00123f63025f") == 0)
-        {
+    }
 }
 

experimental/components/SubchannelSelector/trunk/SubchannelSelector/src/SubchannelSelector.h

@@ -87 +87 @@
     omni_condition *component_running;  ///< for component shutdown
     omni_thread *processing_thread;     ///< for component writer function
-        
-        CORBA::Float simple_0_value;
-        CORBA::Ulong simple_1_value;
 
+    CORBA::Float simple_0_value;
+    CORBA::ULong simple_1_value;
     
     // list components provides and uses ports
-        standardInterfaces_i::complexShort_p *dataIn_0;
-        standardInterfaces_i::complexShort_u *dataOut_0;
+    standardInterfaces_i::complexShort_p *dataIn_0;
+    standardInterfaces_i::complexShort_u *dataOut_0;
     
 };

experimental/components/SubchannelSelector/trunk/SubchannelSelector/src/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2007 Virginia Polytechnic Institute and State University
+Copyright 2006 Virginia Polytechnic Institute and State University
 
 This file is part of the OSSIE SubchannelSelector.
@@ -23 +23 @@
 #include <iostream>
 #include "ossie/ossieSupport.h"
+#include "ossie/debug.h"
 
 #include "SubchannelSelector.h"
 
+using namespace std;
+using namespace standardInterfaces;  // For standard OSSIE interface classes
+
+
 int main(int argc, char* argv[])
-
 {
-    ossieDebugLevel = 3;
+    ossieDebugLevel = 5;
 
     ossieSupport::ORB *orb = new ossieSupport::ORB;
@@ -35 +39 @@
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    ossieSupport::ossieComponent subchannelselector(orb, argc, argv);
+    if (argc != 3) {
+        cout << argv[0] << " <id> <usage name> " << endl;
+        exit (-1);
+    }
+
+    char *uuid = argv[1];
+    char *label = argv[2];
+
+    cout << "Identifier - " << uuid << "  Label - " << label << endl;
 
     SubchannelSelector_i* subchannelselector_servant;
@@ -42 +54 @@
     // Create the subchannelselector component servant and object reference
 
-    subchannelselector_servant = new SubchannelSelector_i(subchannelselector.getUuid(), component_running);
+    subchannelselector_servant = new SubchannelSelector_i(uuid, component_running);
     subchannelselector_var = subchannelselector_servant->_this();
 
-    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(subchannelselector_var);
-
-    subchannelselector.bind(subchannelselector_var);
+    orb->bind_object_to_name((CORBA::Object_ptr) subchannelselector_var, label);
 
     // This bit is ORB specific
@@ -55 +65 @@
 
     component_running->wait();
-
-    subchannelselector.unbind();
-
-    DEBUG(4, SubchannelSelector, "Deactivate object.");
-    orb->poa->deactivate_object(servantId);
-
-    DEBUG(4, SubchannelSelector, "Destroy POA.");
-    orb->poa->destroy(false, false);
-
-    DEBUG(4, SubchannelSelector, "Shutdown orb.");
+    orb->unbind_name(label);
     orb->orb->shutdown(0);