Add statusbar etc.

diff --git a/src/main.ui b/src/main.ui
index 601eff68b33624f3a90c57738cdacc4c85b87e46..b178f46932a4b0140cd19de641d7328449fcd662 100644 (file)
--- a/src/main.ui
+++ b/src/main.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>MainWin</class>
- <widget class="QDialog" name="MainWin" >
-  <property name="geometry" >
+ <widget class="QDialog" name="MainWin">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,163 +10,190 @@
     <height>352</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>TekPic</string>
   </property>
-  <layout class="QHBoxLayout" >
-   <property name="margin" >
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="spacing" >
-    <number>6</number>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
    </property>
    <item>
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QScrollArea" name="scrollArea" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>5</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape" >
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow" >
-        <enum>QFrame::Sunken</enum>
-       </property>
-      </widget>
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QScrollArea" name="scrollArea">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QProgressBar" name="progressBar">
+         <property name="value">
+          <number>24</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QProgressBar" name="progressBar" >
-       <property name="value" >
-        <number>24</number>
-       </property>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
+      <layout class="QVBoxLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>&amp;File name prefix:</string>
+         </property>
+         <property name="buddy">
+          <cstring>prefixLine</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="prefixLine">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>osc-</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Full file &amp;name:</string>
+         </property>
+         <property name="buddy">
+          <cstring>fileLine</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="fileLine">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>100</width>
+           <height>71</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="saveButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>&amp;Save</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="quitButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>&amp;Quit</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+    <widget class="QLabel" name="statusBar">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
      </property>
-     <item>
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
-        <string>&amp;File name prefix:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>prefixLine</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="prefixLine" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>0</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>osc-</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string>Full file &amp;name:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>fileLine</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="fileLine" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>0</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>100</width>
-         <height>71</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="saveButton" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>0</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>&amp;Save</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="quitButton" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>0</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>&amp;Quit</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QScrollArea</class>
-   <extends>QFrame</extends>
-   <header>QScrollArea</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index fcde8f83b24c22438dbefa3d11d107748ff385d4..69c9f4adcca217f2f6ec872095abafa3c5c7caf4 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -34,6 +34,8 @@ MainWindow::MainWindow(const string &tty)
      ui.progressBar->setValue(0);
      ui.progressBar->hide();
      ui.saveButton->setDisabled(true);
+
+     ui.statusBar->setText("Press \"hardcopy\" button on the scope...");
      
      connect(ui.quitButton, SIGNAL(clicked()), this, SLOT(close()));
      connect(&m_commThread, SIGNAL(bytesReceived(int)), ui.progressBar, SLOT(setValue(int)));
@@ -46,6 +48,7 @@ MainWindow::MainWindow(const string &tty)
 }
 
 
+
 MainWindow::~MainWindow()
 {
 }
@@ -59,18 +62,23 @@ void MainWindow::processImage( OscImage * img )
         ui.progressBar->setValue(m_lastSize);
         ui.progressBar->hide();
         
-        m_fileNum++;
-        generateFileName( ui.prefixLine->text());
-        
         if (m_image) delete m_image;
         m_image = img;
         
         QPixmap pixmap;
         ret = pixmap.loadFromData(*m_image);
-        if (!ret) cerr << "Can't display image!"<<endl;
+        if (!ret)
+          ui.statusBar->setText("Cannot display the image! Unsupported format?");
+        else
+          ui.statusBar->setText("Ready");
+
         QApplication::clipboard()->setPixmap(pixmap);
         imageLabel->setPixmap(pixmap);
         imageLabel->adjustSize();
+
+        m_fileNum++;
+        generateFileName( ui.prefixLine->text());
+
 }
 
 
@@ -87,7 +95,8 @@ void MainWindow::generateFileName( const QString & prefix )
         
         ts.setFieldWidth(3); 
         ts.setPadChar('0') ;
-        ts << prefix << m_fileNum << ".tif";
+
+        ts << prefix << m_fileNum << ".bmp";
         ui.fileLine->setText(fname);
 }
 
@@ -104,6 +113,7 @@ void MainWindow::saveImage()
 void MainWindow::newImage()
 {
      ui.progressBar->show();
+     ui.statusBar->setText("Transferring...");
         if (m_lastSize == 0)
                 ui.progressBar->setMaximum(0);
 }

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 74f37f9b8291b51f96c9fc7e6c598747231a4f20..417bbfb29397201ba1e84fe944449c58c6d09c3c 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -38,7 +38,7 @@ public:
 
         ~MainWindow();
 private:
-        Ui::MainWin ui;
+        Ui_MainWin ui;
         OscCommThread m_commThread;
         int m_fileNum;
         int m_lastSize;

diff --git a/src/src.pro b/src/src.pro
index a5c7033e22b959aee16302f4112f853f0691a4a7..0ece1bfc1c0d204f029cc378a7c53a1f4a665a07 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -7,7 +7,7 @@ TARGET = ../bin/tekpic
 CONFIG += debug \
           warn_on 
 TEMPLATE = app 
-FORMS += main.ui 
+FORMS += main.ui  
 HEADERS += mainwindow.h \
            serial.h \
            osccommthread.h