Result dialog files restored to version before email send changes.

diff --git a/Client/resultdialog.cpp b/Client/resultdialog.cpp
index 1f75c6e..a5f5d32 100644 (file)
--- a/Client/resultdialog.cpp
+++ b/Client/resultdialog.cpp
@@ -14,8 +14,6 @@
 #include <QPainter>
 #include <QPicture>
 #include <QDebug>
 #include <QPainter>
 #include <QPicture>
 #include <QDebug>

-#include <QDesktopServices>
-#include <QUrl>

 
 const int DIAGRAM_WIDTH = 400;
 const int DIAGRAM_HEIGHT = 300;
 
 const int DIAGRAM_WIDTH = 400;
 const int DIAGRAM_HEIGHT = 300;

@@ -116,15 +114,7 @@ void ResultDialog::changeEvent(QEvent *e)
 void ResultDialog::paintEvent(QPaintEvent *)
 {
     setHeaders();
 void ResultDialog::paintEvent(QPaintEvent *)
 {
     setHeaders();

-    //Create Pixmap, where image will be draw
-    QPixmap image(ui->scrollArea->width(), ui->scrollArea->height()/*DIAGRAM_WIDTH+100, DIAGRAM_HEIGHT+70*/);
-       
-    //Create painter and give paramemeter where image will be draw
-    QPainter painter(&image);
-    painter.setPen(Qt::white);
-    painter.setBrush(Qt::white);
-    painter.drawRect(QRect(0, 0, ui->scrollArea->width(), ui->scrollArea->height()/*DIAGRAM_WIDTH+100, DIAGRAM_HEIGHT+70*/));
-    
+    QPainter painter(this);

 
     painter.setRenderHint(QPainter::Antialiasing, true);
     painter.setPen(QPen((Qt::gray),2));
 
     painter.setRenderHint(QPainter::Antialiasing, true);
     painter.setPen(QPen((Qt::gray),2));

@@ -136,7 +126,7 @@ void ResultDialog::paintEvent(QPaintEvent *)
 
     fontForResult.setPixelSize(50);
     painter.setFont(fontForResult);
 
     fontForResult.setPixelSize(50);
     painter.setFont(fontForResult);

-    painter.drawText(diagramStemStart.x() + 30, diagramStemStart.y() - 150, resultString);
+    painter.drawText(diagramStemStart.x() + 50, diagramStemStart.y() - 150, resultString);

     painter.setFont(font);
 
     painter.setPen(QPen((Qt::darkCyan),2));
     painter.setFont(font);
 
     painter.setPen(QPen((Qt::darkCyan),2));

@@ -208,18 +198,6 @@ void ResultDialog::paintEvent(QPaintEvent *)
     {
         painter.drawPolyline(points, pointsToShow);
     }
     {
         painter.drawPolyline(points, pointsToShow);
     }

-    //Save image in file acceleration.png
-    image.save("acceleration.png", 0, -1);
-
-    //Create label
-    QLabel *imageLabel = new QLabel(this);
-    
-    //Set image pixmap to label
-    imageLabel->setPixmap(image);
-    
-    //Set image label to scrollArea
-    ui->scrollArea->setWidget(imageLabel);
-

 }
 
 /**
 }
 
 /**

@@ -820,12 +798,4 @@ void ResultDialog::killHelpDialog()
         helpAccelerationDialog = NULL;
     }
 }
         helpAccelerationDialog = NULL;
     }
 }

-/**
-  * This slot function opens E-mail application with attachment file
-  * (acceleration.png). Image of resultdialog
-  */

 
 

-void ResultDialog::on_pushButtonEMail_clicked()
-{
-    QDesktopServices::openUrl(QUrl("mailto:name@domain.com?Subject=Acceleration Result&Body=Hi, Here are my acceleration result!&Attachment=acceleration.png"));
-}

diff --git a/Client/resultdialog.h b/Client/resultdialog.h
index 21b9ff9..752b790 100644 (file)
--- a/Client/resultdialog.h
+++ b/Client/resultdialog.h
@@ -57,7 +57,6 @@ private:
     QString resultString;
 
 private slots:
     QString resultString;
 
 private slots:

-    void on_pushButtonEMail_clicked();

     void on_pushButtonInfo_clicked();
     void on_pushButtonNew_clicked();
     void on_pushButtonSend_clicked();
     void on_pushButtonInfo_clicked();
     void on_pushButtonNew_clicked();
     void on_pushButtonSend_clicked();

diff --git a/Client/resultdialog.ui b/Client/resultdialog.ui
index 4431c71..974628a 100644 (file)
--- a/Client/resultdialog.ui
+++ b/Client/resultdialog.ui
@@ -70,7 +70,7 @@
     <rect>
      <x>510</x>
      <y>280</y>
     <rect>
      <x>510</x>
      <y>280</y>

-     <width>81</width>
+     <width>131</width>

      <height>71</height>
     </rect>
    </property>
      <height>71</height>
     </rect>
    </property>

@@ -165,9 +165,9 @@
   <widget class="QPushButton" name="pushButtonNew">
    <property name="geometry">
     <rect>
   <widget class="QPushButton" name="pushButtonNew">
    <property name="geometry">
     <rect>

-     <x>710</x>
+     <x>660</x>

      <y>280</y>
      <y>280</y>

-     <width>81</width>
+     <width>131</width>

      <height>71</height>
     </rect>
    </property>
      <height>71</height>
     </rect>
    </property>

@@ -201,7 +201,7 @@
     <string/>
    </property>
    <property name="icon">
     <string/>
    </property>
    <property name="icon">

-    <iconset>
+    <iconset resource="graphics.qrc">

      <normaloff>:/new/prefix1/Graphics/info.png</normaloff>:/new/prefix1/Graphics/info.png</iconset>
    </property>
    <property name="iconSize">
      <normaloff>:/new/prefix1/Graphics/info.png</normaloff>:/new/prefix1/Graphics/info.png</iconset>
    </property>
    <property name="iconSize">

@@ -211,49 +211,9 @@
     </size>
    </property>
   </widget>
     </size>
    </property>
   </widget>

-  <widget class="QScrollArea" name="scrollArea">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>501</width>
-     <height>381</height>
-    </rect>
-   </property>
-   <property name="verticalScrollBarPolicy">
-    <enum>Qt::ScrollBarAlwaysOff</enum>
-   </property>
-   <property name="horizontalScrollBarPolicy">
-    <enum>Qt::ScrollBarAlwaysOff</enum>
-   </property>
-   <property name="widgetResizable">
-    <bool>true</bool>
-   </property>
-   <widget class="QWidget" name="scrollAreaWidgetContents">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>0</y>
-      <width>499</width>
-      <height>379</height>
-     </rect>
-    </property>
-   </widget>
-  </widget>
-  <widget class="QPushButton" name="pushButtonEMail">
-   <property name="geometry">
-    <rect>
-     <x>610</x>
-     <y>280</y>
-     <width>81</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Send E-mail</string>
-   </property>
-  </widget>

  </widget>
  </widget>

- <resources/>
+ <resources>
+  <include location="graphics.qrc"/>
+ </resources>

  <connections/>
 </ui>
  <connections/>
 </ui>