Merge PR #173 branch 'sprint4/172-generatePdf' of github.com:FACT-Tea…

…m/FactDev into S4 Conflicts: src/gui/mainwindow/mainwindow.ui
FACT-Team · Mar 9, 2015 · 1fe97dd · 1fe97dd
2 parents 1545edd + e4d431e
commit 1fe97dd
Show file tree

Hide file tree

Showing 17 changed files with 193 additions and 68 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ install:
     - sudo apt-get install g++-4.8 gdb 
     - sudo apt-get install doxygen doxygen-latex doxygen-doc
     - sudo apt-get install -y lcov 
-#  - sudo apt-get install texlive texlive-fonts-extra latex-xcolor texlive-extra-utils texlive-font-utils  >> /dev/null
+    - sudo apt-get install texlive texlive-fonts-extra latex-xcolor texlive-extra-utils texlive-font-utils  >> /dev/null
     - wget -O Qt5.2.0.tar.xz https://www.dropbox.com/s/mkqtb8teeydsmrk/Qt5.2.0.tar.xz?dl=0 
     - mkdir ~/Qt5.2.0 
     - tar -xJf Qt5.2.0.tar.xz -C ~/Qt5.2.0 

diff --git a/scripts/tests.sh b/scripts/tests.sh
@@ -1,7 +1,7 @@
 cd ..
 echo "#### COMPILATION ####"
 ~/Qt5.2.0/5.2.0/gcc_64/bin/qmake FactDev.pro -r -spec linux-g++ CONFIG+=debug >> /dev/null
-make -j15 >> /dev/null
+make -j9 >> /dev/null
 LD_LIBRARY_PATH=`pwd`/src
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 ln -s `pwd`/src/sql `pwd`/tests/sql

diff --git a/src/generator/pdfgenerator.cpp b/src/generator/pdfgenerator.cpp
@@ -0,0 +1,23 @@
+#include "pdfgenerator.h"
+
+namespace Generator {
+PdfGenerator::PdfGenerator(QString pdflatexPath)
+{
+    _pdflatexPath = pdflatexPath;
+}
+
+void PdfGenerator::generate(QString inputDir, QString filename)
+{
+    QProcess process;
+    process.setWorkingDirectory(inputDir);
+    QStringList args;
+    args << filename+".tex";
+    process.start(_pdflatexPath, args);
+    process.waitForFinished();
+
+
+    QFile(inputDir+"/"+filename+".aux").remove();
+    QFile(inputDir+"/"+filename+".log").remove();
+}
+
+}
diff --git a/src/generator/pdfgenerator.h b/src/generator/pdfgenerator.h
@@ -0,0 +1,17 @@
+#ifndef PDFGENERATOR_H
+#define PDFGENERATOR_H
+#include <QString>
+#include <QProcess>
+#include <QFile>
+
+namespace Generator {
+class PdfGenerator
+{
+public:
+    PdfGenerator(QString pdflatexPath="pdflatex");
+    void generate(QString inputDir, QString filename);
+private:
+    QString _pdflatexPath;
+};
+}
+#endif // PDFGENERATOR_H
diff --git a/src/generator.cpp → src/generator/texgenerator.cpp b/src/generator.cpp → src/generator/texgenerator.cpp
@@ -1,17 +1,17 @@
-#include "generator.h"
+#include "generator/texgenerator.h"
 
-
-Generator::Generator(QString tpl)
+namespace Generator {
+TexGenerator::TexGenerator(QString tpl)
 {
     _tplFile = tpl;
 }
 
-Generator::~Generator()
+TexGenerator::~TexGenerator()
 {
 
 }
 
-void Generator::generate(QVariantHash data, QString path)
+void TexGenerator::generate(QVariantHash data, QString path)
 {
     QString ret;
 
@@ -36,4 +36,4 @@ void Generator::generate(QVariantHash data, QString path)
     }
 }
 
-
+}
diff --git a/src/generator.h → src/generator/texgenerator.h b/src/generator.h → src/generator/texgenerator.h
@@ -1,20 +1,23 @@
-#ifndef GENERATOR_H
-#define GENERATOR_H
+#ifndef TEXGENERATOR_H
+#define TEXGENERATOR_H
+
 #include "models/billing.h"
 #include "models/user.h"
 
 #include "libs/qt-mustache/src/mustache.h"
 
-class Generator
+namespace Generator {
+class TexGenerator
 {
 public:
-    Generator(QString tpl);
-    ~Generator();
+    TexGenerator(QString tpl);
+    ~TexGenerator();
 
     void generate(QVariantHash data, QString path);
 
 private:
     QString _tplFile;
 };
 
-#endif // GENERATOR_H
+}
+#endif // TEXGENERATOR_H
diff --git a/src/gui/dialogs/addquotedialog.cpp b/src/gui/dialogs/addquotedialog.cpp
@@ -62,7 +62,8 @@ void AddQuoteDialog::accept() {
     _quote->setContributories(*((Widgets::ContributoriesWidget*)ui->wdgContributories)->getContributories());
 
     _quote->commit();
-    _quote->generateTex();
+    _quote->generatePdf();
+
     QDialog::accept();
 }
 

diff --git a/src/gui/mainwindow/mainwindow.cpp b/src/gui/mainwindow/mainwindow.cpp
@@ -228,11 +228,18 @@ void MainWindow::removeDoc() {
     removeItem(ui->tblQuotes, ItemType(ItemType::BILLING, "document"));
 }
 
-void MainWindow::generateTex()
+void MainWindow::openPdf()
 {
     QModelIndex ls = ui->tblQuotes->selectionModel()->selectedRows().first();
     int pid = ui->tblQuotes->model()->data(ls, Qt::DisplayRole).toInt();
-    Billing(pid).generateTex();
+    Billing bill(pid);
+    if(!QFile(bill.getPath()+".pdf").exists()) {
+        bill.generatePdf();
+    }
+    QFileInfo pdf(bill.getPath()+".pdf");
+
+    QDesktopServices::openUrl(QUrl("file:///"+pdf.absoluteFilePath()));
+
 }
 
 void MainWindow::search(QString text)
@@ -572,7 +579,7 @@ void MainWindow::updateButtons()
     ui->wdgTblProjectsToolBar->updateBtn(canAdd);
     ui->btnRemoveDoc->setEnabled(billingIsSelected);
     ui->btnEditDoc->setEnabled(billingIsSelected);    
-    ui->btnLatex->setEnabled(billingIsSelected);
+    ui->btnPdf->setEnabled(billingIsSelected);
 
     if (billingIsSelected) {
 

diff --git a/src/gui/mainwindow/mainwindow.h b/src/gui/mainwindow/mainwindow.h
@@ -6,6 +6,8 @@
 #include <QModelIndex>
 #include <QTableView>
 #include <QDir>
+#include <QDesktopServices>
+#include <QUrl>
 
 #include "utils/itemtype.h"
 #include "utils/log.h"
@@ -189,7 +191,7 @@ public slots:
      */
     //void editQuote();
 
-    void generateTex();
+    void openPdf();
 private slots:
     /**
      * @brief MainWindow::openContextualMenuTable open contextual menu

diff --git a/src/gui/mainwindow/mainwindow.ui b/src/gui/mainwindow/mainwindow.ui
@@ -335,13 +335,13 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="btnLatex">
+             <widget class="QPushButton" name="btnPdf">
               <property name="text">
-               <string>Générer en LaTeX</string>
+               <string>Ouvrir le PDF</string>
               </property>
               <property name="icon">
                <iconset resource="../../icons.qrc">
-                <normaloff>:/icons/img/convert_to_latex.png</normaloff>:/icons/img/convert_to_latex.png</iconset>
+                <normaloff>:/icons/img/convert_to_pdf.png</normaloff>:/icons/img/convert_to_pdf.png</iconset>
               </property>
              </widget>
             </item>
@@ -704,8 +704,8 @@
    <slot>editCustomer()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>910</x>
-     <y>543</y>
+     <x>367</x>
+     <y>104</y>
     </hint>
     <hint type="destinationlabel">
      <x>764</x>
@@ -720,8 +720,8 @@
    <slot>removeCustomer()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>823</x>
-     <y>543</y>
+     <x>348</x>
+     <y>104</y>
     </hint>
     <hint type="destinationlabel">
      <x>280</x>
@@ -736,8 +736,8 @@
    <slot>addCustomer()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>599</x>
-     <y>543</y>
+     <x>311</x>
+     <y>104</y>
     </hint>
     <hint type="destinationlabel">
      <x>406</x>
@@ -752,8 +752,8 @@
    <slot>addProject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>726</x>
-     <y>543</y>
+     <x>330</x>
+     <y>104</y>
     </hint>
     <hint type="destinationlabel">
      <x>720</x>
@@ -880,8 +880,8 @@
    <slot>customersTableToProjectsTable()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>378</x>
-     <y>108</y>
+     <x>373</x>
+     <y>96</y>
     </hint>
     <hint type="destinationlabel">
      <x>1026</x>
@@ -896,8 +896,8 @@
    <slot>backToCustomersTable()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>332</x>
-     <y>106</y>
+     <x>327</x>
+     <y>93</y>
     </hint>
     <hint type="destinationlabel">
      <x>326</x>
@@ -928,8 +928,8 @@
    <slot>projectsTableToDocsTable()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>379</x>
-     <y>146</y>
+     <x>374</x>
+     <y>99</y>
     </hint>
     <hint type="destinationlabel">
      <x>920</x>
@@ -944,8 +944,8 @@
    <slot>backToProjectsTable()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>578</x>
-     <y>121</y>
+     <x>583</x>
+     <y>119</y>
     </hint>
     <hint type="destinationlabel">
      <x>672</x>
@@ -960,8 +960,8 @@
    <slot>addProject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>916</x>
-     <y>539</y>
+     <x>499</x>
+     <y>130</y>
     </hint>
     <hint type="destinationlabel">
      <x>797</x>
@@ -976,8 +976,8 @@
    <slot>editProject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>916</x>
-     <y>539</y>
+     <x>499</x>
+     <y>130</y>
     </hint>
     <hint type="destinationlabel">
      <x>738</x>
@@ -992,8 +992,8 @@
    <slot>removeProject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>916</x>
-     <y>539</y>
+     <x>499</x>
+     <y>130</y>
     </hint>
     <hint type="destinationlabel">
      <x>0</x>
@@ -1008,8 +1008,8 @@
    <slot>changeCustomerTable()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>378</x>
-     <y>108</y>
+     <x>373</x>
+     <y>96</y>
     </hint>
     <hint type="destinationlabel">
      <x>415</x>
@@ -1024,8 +1024,8 @@
    <slot>changeProjectsTable()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>379</x>
-     <y>146</y>
+     <x>374</x>
+     <y>99</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
@@ -1130,10 +1130,10 @@
    </hints>
   </connection>
   <connection>
-   <sender>btnLatex</sender>
+   <sender>btnPdf</sender>
    <signal>released()</signal>
    <receiver>MainWindow</receiver>
-   <slot>generateTex()</slot>
+   <slot>openPdf()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>828</x>
@@ -1225,7 +1225,7 @@
   <slot>changeDocsTable()</slot>
   <slot>editQuote()</slot>
   <slot>updateButtons()</slot>
-  <slot>generateTex()</slot>
+  <slot>openPdf()</slot>
   <slot>billingIsPaid()</slot>
  </slots>
 </ui>