Merge branch 'master' of http://47.96.250.93:3000/adc_pilot/modularization

src/driver/driver_camera_miivii/driver_camera_miivii.xml

@@ -1,13 +1,13 @@
 <xml>	
 	<node name="driver_camera_miivii">
-		<param name="CamNum" value="1" />
+		<param name="CamNum" value="2" />
 		<param name="bcompress" value="1" />
 		<param name="compquality" value="95" />
 		<param name="devname" value="/dev/video0" />
 		<param name="ShowPic" value="ShowPic" />
-		<param name="msgname0" value="PicFront" />
-		<param name="msgname1" value="PicRear" />
-		<param name="msgname2" value="PicLeft" />
-		<param name="msgname3" value="PicRight" />
+		<param name="msgname0" value="picfront" />
+		<param name="msgname1" value="picrear" />
+		<param name="msgname2" value="picleft" />
+		<param name="msgname3" value="picright" />
 	</node>
 </xml>

src/tool/picview/mainwindow.cpp

@@ -160,15 +160,18 @@ MainWindow::MainWindow(QWidget *parent) :
     std::cout<<strpath.toStdString()<<std::endl;
     iv::xmlparam::Xmlparam xp(strpath.toStdString());
 
-    std::string xmlmsgname = xp.GetParam("msgname","image00");
+    std::string strxmlmsgname0 = xp.GetParam("msgname0","image00");
+    std::string strxmlmsgname1 = xp.GetParam("msgname1","image01");
+    std::string strxmlmsgname2 = xp.GetParam("msgname2","image02");
+    std::string strxmlmsgname3 = xp.GetParam("msgname3","image03");
 
  //   mpa = iv::modulecomm::RegisterRecv(xmlmsgname.data(),Listenpic);
 
     void * pa[4];
-    pa[0] =iv::modulecomm::RegisterRecv("image00",Listenpics0);
-    pa[1] =iv::modulecomm::RegisterRecv("image01",Listenpics1);
-    pa[2] =iv::modulecomm::RegisterRecv("image02",Listenpics2);
-    pa[3] =iv::modulecomm::RegisterRecv("image04",Listenpics3);
+    pa[0] =iv::modulecomm::RegisterRecv(strxmlmsgname0.data(),Listenpics0);
+    pa[1] =iv::modulecomm::RegisterRecv(strxmlmsgname1.data(),Listenpics1);
+    pa[2] =iv::modulecomm::RegisterRecv(strxmlmsgname2.data(),Listenpics2);
+    pa[3] =iv::modulecomm::RegisterRecv(strxmlmsgname3.data(),Listenpics3);
 
     connect(&mTimer,SIGNAL(timeout()),this,SLOT(onTimer()));
 #ifdef Q_OS_WIN32

src/tool/picview/picview.xml

@@ -0,0 +1,8 @@
+<xml>	
+	<node name="picview">
+		<param name="msgname0" value="picfront" />
+		<param name="msgname1" value="picrear" />
+		<param name="msgname2" value="picleft" />
+		<param name="msgname3" value="picright" />
+	</node>
+</xml>