update

utat-uav · Nov 23, 2014 · a25dd54 · a25dd54
1 parent cc83913
commit a25dd54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Richard_photoList/Richard_photoList.pro.user b/Richard_photoList/Richard_photoList.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.2.1, 2014-11-23T10:55:23. -->
+<!-- Written by QtCreator 3.2.1, 2014-11-23T10:57:38. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -235,8 +235,8 @@
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Richard_photoList</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/richardyu/Dropbox/Richard_photoList/Richard_photoList.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Richard_photoList2</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/richardyu/Documents/groundstation/Richard_photoList/Richard_photoList.pro</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">Richard_photoList.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>

diff --git a/Richard_photoList/mainwindow.cpp b/Richard_photoList/mainwindow.cpp
@@ -29,14 +29,14 @@ MainWindow::MainWindow(QWidget *parent) :
     const int h = 150;
 
     // I want to display 100 rows of pictures
-    // each row contains 8 column;
+    // each row contains 8 columns;
     const int rows = 100;
     const int columns = 8;
 
     imageLabel = new QLabel*[rows * columns];
     imageMap = new QPixmap*[rows * columns];
 
-    // double for loop, treat the image grid like a matric
+    // double for loop, treat the image grid like a matrix
     // for every row, display each column in the current row
     for (int k = 0; k < rows; k++) {
         for (int j = 0; j < columns; j++) {
@@ -98,14 +98,14 @@ void MainWindow::addImage() {
     const int h = 150;
 
     // I want to display 100 rows of pictures
-    // each row contains 8 column;
+    // each row contains 8 columns;
     const int rows = 100;
     const int columns = 8;
 
     imageLabel = new QLabel*[rows * columns];
     imageMap = new QPixmap*[rows * columns];
 
-    // double for loop, treat the image grid like a matric
+    // double for loop, treat the image grid like a matrix
     // for every row, display each column in the current row
     for (int k = 0; k < rows; k++) {
         for (int j = 0; j < columns; j++) {