Changeset 1001 for mchelper

Timestamp:

11/13/08 13:20:56 (8 weeks ago)

Author:

liamMT

Message:

- make sure board info updates get to any connected xml clients

Location:

mchelper/trunk

Files:

• include/MainWindow.h (modified) (1 diff)
• source/Inspector.cpp (modified) (1 diff)
• source/MainWindow.cpp (modified) (1 diff)
• source/OscXmlServer.cpp (modified) (2 diffs)

mchelper/trunk/include/MainWindow.h

@@ -104 +104 @@
   void onOscTutorial();
   
+signals:
+  void boardInfoUpdate(Board* board);
+  
   #ifdef MCHELPER_TEST_SUITE
   friend class TestXmlServer;
   #endif
-
 };
 

mchelper/trunk/source/Inspector.cpp

@@ -150 +150 @@
   {
     board->sendMessage( msgs );
+    mainWindow->updateBoardInfo(board);
     mainWindow->message(msgs, MsgType::Command, board->location());
   }

mchelper/trunk/source/MainWindow.cpp

@@ -332 +332 @@
 void MainWindow::updateBoardInfo(Board *board)
 {
-  //oscXmlServer->sendBoardListUpdate(board);
+  emit boardInfoUpdate(board);
   inspector->setData(board);
 }

mchelper/trunk/source/OscXmlServer.cpp

@@ -105 +105 @@
   qRegisterMetaType<MsgType::Type>("MsgType::Type"); 
   connect(this, SIGNAL(msg(QString, MsgType::Type, QString)), mainWindow, SLOT(message(QString, MsgType::Type, QString)));
+  connect(mainWindow, SIGNAL(boardInfoUpdate(Board*)), this, SLOT(boardInfoUpdate(Board*)));
   handler = new XmlHandler( mainWindow, this ); 
   xml.setContentHandler( handler );
@@ -200 +201 @@
 void OscXmlClient::boardInfoUpdate( Board* board )
 {   
-  QDomDocument doc;
+  if(!board)
+    return;
+  QDomDocument doc;
   QDomElement boardUpdate = doc.createElement( "BOARD_INFO" );
   doc.appendChild( boardUpdate );