Various changes to the file comparator window to make it a lot easier

to undestand.

re/filecomparatorwindow.cpp

@@ -16,7 +16,7 @@ FileComparatorWindow::FileComparatorWindow(QWidget *parent) :
     connect(ui->btnClear, SIGNAL(clicked(bool)), this, SLOT(clearReference()));
 
     ui->lblFirstFile->setText("");
-    ui->lblRefFrames->setText("0");
+    ui->lblRefFrames->setText("Loaded frames: 0");
 
     installEventFilter(this);
 }
@@ -95,7 +95,7 @@ void FileComparatorWindow::loadReferenceFile()
     QString resultingFileName;
     if (FrameFileIO::loadFrameFile(resultingFileName, &referenceFrames))
     {
-        ui->lblRefFrames->setText(QString::number(referenceFrames.length()));
+        ui->lblRefFrames->setText("Loaded frames: " + QString::number(referenceFrames.length()));
         if (interestedFrames.count() > 0 && referenceFrames.count() > 0) calculateDetails();
     }
 }
@@ -123,10 +123,10 @@ void FileComparatorWindow::calculateDetails()
     if (!uniqueInterested)
     {
         referenceOnlyBase = new QTreeWidgetItem();
-        referenceOnlyBase->setText(0, "IDs found only in reference frames");
+        referenceOnlyBase->setText(0, "IDs found only in Side 2 - Reference frames");
     }
     sharedBase = new QTreeWidgetItem();
-    sharedBase->setText(0,"IDs found in both places");
+    sharedBase->setText(0,"IDs found on both sides");
 
     //first we have to fill out the data structures to get ready to do the report
     for (int x = 0; x < interestedFrames.count(); x++)
@@ -240,7 +240,7 @@ void FileComparatorWindow::calculateDetails()
             if (!uniqueInterested)
             {
                 bitmapBaseReference = new QTreeWidgetItem();
-                bitmapBaseReference->setText(0, "Bits set only in reference frames");
+                bitmapBaseReference->setText(0, "Bits set only in Side 2 - Reference frames");
             }
             sharedItem->addChild(bitmapBaseInterested);
             if (!uniqueInterested) sharedItem->addChild(bitmapBaseReference);
@@ -277,7 +277,7 @@ void FileComparatorWindow::calculateDetails()
                 if (!uniqueInterested)
                 {
                     valuesReference = new QTreeWidgetItem();
-                    valuesReference->setText(0, "Values found only in reference frames");
+                    valuesReference->setText(0, "Values found only in Side 2 - Reference frames");
                 }
                 valuesBase->addChild(valuesInterested);
                 if (!uniqueInterested) valuesBase->addChild(valuesReference);

ui/filecomparatorwindow.ui

@@ -15,13 +15,31 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="8,0,8">
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>SIDE 1</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QLabel" name="label_3">
          <property name="text">
-          <string>File of interest:</string>
+          <string>Single file to compare to side 2:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
@@ -41,12 +59,40 @@
        </item>
       </layout>
      </item>
+     <item>
+      <widget class="Line" name="line">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label_4">
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>Side 2</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Loaded reference frames:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>One or more files to compare with the single file on side1:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
@@ -79,10 +125,20 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QCheckBox" name="ckUniqueToInterested">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
      <property name="text">
-      <string>Show only unique data for interested file</string>
+      <string>Show only data unique to Side 1</string>
      </property>
     </widget>
    </item>