Changeset 4561

Timestamp:

08/08/07 15:50:47 (6 years ago)

Author:

DrewCormier

Message:

usrp commander seems much cooler than USRP_Ctrl

Location:

experimental/components/USRP_Ctrl_GUI/branches/0.6.2/USRP_Ctrl_GUI

Files:

• USRP_Commander.cpp (added)
• USRP_Commander.h (added)
• USRP_Ctrl.cpp (deleted)
• USRP_Ctrl.h (deleted)
• USRP_Ctrl.prf.xml (deleted)
• USRP_Ctrl.scd.xml (deleted)
• USRP_Ctrl.spd.xml (deleted)
• main.cpp (modified) (5 diffs)

experimental/components/USRP_Ctrl_GUI/branches/0.6.2/USRP_Ctrl_GUI/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 
-Copyright 2006 Virginia Polytechnic Institute and State University
+Copyright 2007 Virginia Polytechnic Institute and State University
 
-This file is part of the OSSIE USRP_Ctrl.
+This file is part of the OSSIE USRP_Commander.
 
-OSSIE USRP_Ctrl is free software; you can redistribute it and/or modify
+OSSIE USRP_Commander 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 USRP_Ctrl is distributed in the hope that it will be useful,
+OSSIE USRP_Commander 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 USRP_Ctrl; if not, write to the Free Software
+along with OSSIE USRP_Commander; 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 "USRP_Ctrl.h"
+#include "USRP_Commander.h"
 
 
@@ -32 +32 @@
 
 {
+    ossieDebugLevel = 3;
+
     ossieSupport::ORB *orb = new ossieSupport::ORB;
     omni_mutex component_running_mutex;
     omni_condition *component_running = new omni_condition(&component_running_mutex);
 
-    if (argc != 3) {
-        std::cout << argv[0] << " <id> <usage name> " << std::endl;
-        exit (-1);
-    }
+    ossieSupport::ossieComponent usrp_commander(orb, argc, argv);
 
-    char *uuid = argv[1];
-    char *label = argv[2];
+    USRP_Commander_i* usrp_commander_servant;
+    CF::Resource_var usrp_commander_var;
 
-    DEBUG(3, USRP_Ctrl, "Identifier - " << uuid << "  Label - " << label)
+    // Create the usrp_commander component servant and object reference
 
-    USRP_Ctrl_i* usrp_ctrl_servant;
-    CF::Resource_var usrp_ctrl_var;
+    usrp_commander_servant = new USRP_Commander_i(usrp_commander.getUuid(), component_running);
+    usrp_commander_var = usrp_commander_servant->_this();
 
-    // Create the usrp_ctrl component servant and object reference
+    PortableServer::ObjectId_var servantId = orb->poa->reference_to_id(usrp_commander_var);
 
-    usrp_ctrl_servant = new USRP_Ctrl_i(uuid, component_running);
-    usrp_ctrl_var = usrp_ctrl_servant->_this();
-
-    orb->bind_object_to_name((CORBA::Object_ptr) usrp_ctrl_var, label);
+    usrp_commander.bind(usrp_commander_var);
 
     // This bit is ORB specific
@@ -62 +58 @@
 
     component_running->wait();
-    orb->unbind_name(label);
+
+    usrp_commander.unbind();
+
+    DEBUG(4, USRP_Commander, "Deactivate object.");
+    orb->poa->deactivate_object(servantId);
+
+    DEBUG(4, USRP_Commander, "Destroy POA.");
+    orb->poa->destroy(false, false);
+
+    DEBUG(4, USRP_Commander, "Shutdown orb.");
     orb->orb->shutdown(0);