Changeset 399 for trunk/yao

Timestamp:

08/04/10 15:36:04 (14 years ago)

Author:

yerima

Message:

Opning an existing project. SpaceWindow? is ready.

Location:

trunk/yao/src/interface/src

Files:

• MainWindow.cpp (modified) (3 diffs)
• SpaceWindow.cpp (modified) (1 diff)

trunk/yao/src/interface/src/MainWindow.cpp

@@ -556 +556 @@
                 test = builder.readAll();
                 istringstream iss(test.toStdString());
-                FilePath aString, name, aType, boot, offset, step, size;
+                FilePath aString, theShape, name, parent, aType, boot, offset, step, size;
+                vector <int> theShapeVector;
 
                 while ( getline(iss, aString, '\n' ) )
@@ -601 +602 @@
                                         Trajectory localTrajectory(name, m_trajectoryWindow->toInt(boot), m_trajectoryWindow->toDouble(size), m_trajectoryWindow->toDouble(step), m_trajectoryWindow->toInt(offset), 'M');//Trajectory object.
                                         theTrajectoryTable.push_back(localTrajectory); //Trajectory vector (contents many objects)   
+                                        //if (m_trajectoryWindow->isTrajectoryTableEmpty()) 
 
                                 }               //theConstantTable.push_back(aString.getTitle());
-                                if (aString.getExtension() == ".sp1")
+                                if (aString.getExtension() == ".sp1")//{
                                         name = aString.getTitle();
-                                //if (aString.getExtension() == ".sp2")
+                                        //cout << name << endl;
+                                //}
+                                if (aString.getExtension() == ".sp2"){
+                                        aType = aString.getTitle();     
+                                        istringstream aShape1(aType); 
+                                        while ( getline(aShape1, theShape, ' ' )){
+                                                theShapeVector.push_back(m_spaceWindow->toInt(theShape));
+                                                //cout << aType << endl;
+                                        }
+                                }
+                                if (aString.getExtension() == ".sp3") {
+                                        parent = aString.getTitle(); 
+                                        //cout << parent << endl;
+                                        Space espace(name, theTrajectoryTable.find(parent), theShapeVector);
+                                        theSpaceTable.push_back(espace);
+                                        theShapeVector.clear();
+                                        
+                                }       
+                        }
                         
-                        }
+                                //m_spaceButton->setEnabled(true);
                 
         }
@@ -615 +635 @@
                         actionSaveAsProject->setEnabled(true);
                 }
+
+        //connect(m_trajectoryWindow, SIGNAL(trajRowIsAdded(bool)), m_spaceButton, SLOT(setEnabled(bool)));
+        //connect(m_trajectoryWindow, SIGNAL(trajRowIsAdded(bool)), m_operaButton, SLOT(setEnabled(bool)));
+
         
 }

trunk/yao/src/interface/src/SpaceWindow.cpp

@@ -198 +198 @@
  
                                          if (!(dim.empty() || traj.empty())) {
-                                                                                                if (!d1.empty()) {
+                                                if (!d1.empty()) {
                                                         Space espace(name, localTrajectoryTable->find(traj), theShape);
                                                         localSpaceTable->push_back(espace);