Changeset 847

Timestamp:

01/18/2011 01:42:37 PM (10 years ago)

Author:

lmalek

Message:

Fixed error in merging, updated Linux instruction

Location:

libs/SAMGAR/trunk

Files:

• GUI/server3Gui.cpp (modified) (4 diffs)
• INSTALL_Linux.txt (modified) (2 diffs)

libs/SAMGAR/trunk/GUI/server3Gui.cpp

@@ -168 +168 @@
          NewonetoAdd=false;
 
+ Network::disconnect(TempConnect.GetMom()->GetRealName().c_str(),TempConnect.GetDad()->GetRealName().c_str());
+ Network::disconnect(TempConnect.GetDad()->GetRealName().c_str(),TempConnect.GetMom()->GetRealName().c_str());
+/*
          cmd.clear();
          cmd.addString("unsubscribe");
@@ -181 +184 @@
                              TempConnect.GetDad()->GetRealName().c_str());
       
-      }
+*/  
+  }
    }
   
@@ -746 +750 @@
 {
    QString filename = QFileDialog::getOpenFileName(this,"Samgar File Load",
-                                                   QString(),".SAMstate");
+                                                   QString(),"*.SAMstate");
    QFile f( filename );
    f.open( QIODevice::ReadOnly );
@@ -798 +802 @@
   
 }
-
+void MyConnectionView::LoadAuto(void)
+{
+
+        
+        if(QFile::exists(QString("AutoLoad.SAMstate")))
+        {
+        this->mylogwindow->WriteToLog("Loading Autoconnect file",true);
+        QFile f(QString("AutoLoad.SAMstate"));
+   f.open( QIODevice::ReadOnly );
+   QTextStream in(&f);
+  
+   QString name;
+
+   // TODO: assume that the comment line special sighn is # and ignore all data
+   // that stands after it. 
+   in.readLine(); 
+   in.readLine();
+   in.readLine();
+   in.readLine();
+   in.readLine();// ignore first couple of lines cos there for humans
+
+   QString Data = in.readLine(); // get first valid line
+   while(!Data.isEmpty()&&!Data.isNull())
+   {
+      string Pdata[10];// = {" "};
+    
+      QStringList list1 = Data.split(",");
+      string name=list1.at(0).toStdString();
+      int x = list1.at(2).toInt();
+      int y = list1.at(3).toInt();
+    
+      for(int zz = 4;zz<list1.size();zz++)
+      {
+         Pdata[zz-4]=list1.at(zz).toStdString();
+      }
+      AddMod(name,Pdata,x,y);
+      Data = in.readLine();
+   }
+   in.readLine(); in.readLine();in.readLine();in.readLine();
+  
+   // load connections // put stuff here to load connections, dont worry about
+   // threads as the conns themselves should be thread safe 
+
+   Data = in.readLine(); // get first valid line
+   string fake[maxports];
+   while(!Data.isEmpty()&&!Data.isNull())
+   {
+      QStringList list1 = Data.split(",");
+      string dname=list1.at(0).toStdString();
+      string mname=list1.at(1).toStdString();
+      int conntype = list1.at(2).toInt();
+      CreateConnection(dname,mname,conntype,true,false);
+      Data = in.readLine();
+   }
+
+   f.close();
+        }
+        else
+        {
+        this->mylogwindow->WriteToLog("No Autoconnect file exists",false);
+        }
+}
 void MyConnectionView::updateconnection(string d,string m,bool deleate,
                                         bool connected)

libs/SAMGAR/trunk/INSTALL_Linux.txt

@@ -40 +40 @@
 cp SAMGAR/GUI/*.h yarp-2.3.1/src/yarpserver/src/
 cp SAMGAR/GUI/*.qrc yarp-2.3.1/src/yarpserver/src/
-cp -r SAMGAR/GUI/images yarp-2.3.1/src/yarpserver/src/
+mkdir yarp-2.3.1/src/yarpserver/src/images
+cp SAMGAR/GUI/images/*.* yarp-2.3.1/src/yarpserver/src/images
 
 5. Modify CMakeList.txt file responsible for compiling yarpserver
@@ -53 +54 @@
 
 FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtXml REQUIRED)
-SET(QT_USE_QTXML 1)
 INCLUDE(${QT_USE_FILE})