[Change] Remove file before an mkdir.
This commit is contained in:
parent
671e75bf52
commit
68d4bb443f
@ -7,11 +7,11 @@
|
||||
PDFJam::PDFJam(void) {
|
||||
|
||||
}
|
||||
#if 0
|
||||
|
||||
/* Ensure the folder exists. */
|
||||
void PDFJam::makeFolder(QString path) {
|
||||
QString tmp = "mkdir -p %1";
|
||||
int value = system(tmp.arg(path).toStdString().c_str());
|
||||
QString tmp = "mksir -p %1 && rm %2*";
|
||||
int value = system(tmp.arg(path).arg(path).toStdString().c_str());
|
||||
if(value != 0)
|
||||
qDebug() << "ERROR: Failed to make " << path;
|
||||
}
|
||||
@ -61,11 +61,4 @@ void PDFJam::run(void) {
|
||||
|
||||
/*system("echo 'tata' > /tmp/test.txt");*/
|
||||
}
|
||||
#endif
|
||||
|
||||
void PDFJam::run(void) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
@ -1,14 +1,28 @@
|
||||
#pragma once
|
||||
#include <QThread>
|
||||
#include <QMutex>
|
||||
#include <QImage>
|
||||
#include <poppler-qt5.h>
|
||||
|
||||
class PDFJam {/*: public QThread {*/
|
||||
/*Q_OBJECT*/
|
||||
class PDFPageWidget;
|
||||
class QImage;
|
||||
|
||||
class PDFJam : public QThread {
|
||||
Q_OBJECT
|
||||
public:
|
||||
PDFJam(void);
|
||||
|
||||
void pushCommand(QString);
|
||||
void loadFile(QString fileName, int, int);
|
||||
void makeFolder(QString);
|
||||
|
||||
protected:
|
||||
void run(void);
|
||||
|
||||
private:
|
||||
volatile bool stopped;
|
||||
QVector<QString> cmdQueue;
|
||||
QString nextCommand(void);
|
||||
bool isQueueEmpty(void);
|
||||
QMutex mutex;
|
||||
};
|
||||
|
||||
|
@ -12,6 +12,7 @@ PDFPageWidget::PDFPageWidget(QWidget* parent) :
|
||||
this->resize(150, 150);
|
||||
this->setMinimumSize(150, 150);
|
||||
this->setMinimumSize(150, 150);
|
||||
this->setAutoFillBackground(true);
|
||||
|
||||
this->setMouseTracking(true);
|
||||
this->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
||||
@ -79,7 +80,7 @@ void PDFPageWidget::setPopplerPage(Poppler::Page* pp) {
|
||||
void PDFPageWidget::setThumbnail(QImage pageImage) {
|
||||
image = pageImage;
|
||||
pixmap = QPixmap::fromImage(image);
|
||||
pixmap = pixmap.scaled(size(), Qt::KeepAspectRatio);
|
||||
pixmap = pixmap.scaled(size() - QSize(6,6), Qt::KeepAspectRatio);
|
||||
|
||||
update();
|
||||
}
|
||||
@ -88,20 +89,35 @@ void PDFPageWidget::mousePressEvent(QMouseEvent* event) {
|
||||
if(pPage != NULL) {
|
||||
emit pageClicked(event, path);
|
||||
emit previewUpdate(pPage);
|
||||
|
||||
selected = !selected;
|
||||
update();
|
||||
}
|
||||
}
|
||||
|
||||
void PDFPageWidget::leaveEvent(QEvent* event) {
|
||||
btn1->hide();
|
||||
btn2->hide();
|
||||
|
||||
this->setFrameStyle(QFrame::Plain);
|
||||
}
|
||||
|
||||
void PDFPageWidget::enterEvent(QEvent* event) {
|
||||
btn1->show();
|
||||
btn2->show();
|
||||
|
||||
this->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
|
||||
}
|
||||
|
||||
void PDFPageWidget::paintEvent(QPaintEvent* event) {
|
||||
QPalette palette = this->palette();
|
||||
if(selected)
|
||||
palette.setColor(backgroundRole(), palette.color(QPalette::Highlight));
|
||||
else
|
||||
palette.setColor(backgroundRole(), palette.color(QPalette::AlternateBase));
|
||||
this->setPalette(palette);
|
||||
|
||||
QFrame::paintEvent(event);
|
||||
QPainter painter(this);
|
||||
painter.drawPixmap(QRect((size().width() - pixmap.width()) / 2,
|
||||
(size().height() - pixmap.height()) / 2,
|
||||
|
@ -46,6 +46,8 @@ private:
|
||||
QPixmap pixmap;
|
||||
QPushButton* btn1, *btn2;
|
||||
|
||||
bool selected = false;
|
||||
|
||||
signals:
|
||||
void pageClicked(QMouseEvent* event, QString path);
|
||||
void previewUpdate(Poppler::Page*);
|
||||
|
@ -12,7 +12,6 @@ void PDFPreviewWidget::setImage(QImage image) {
|
||||
}
|
||||
|
||||
void PDFPreviewWidget::regenImage(void) {
|
||||
if(pPage != NULL) {
|
||||
double dpi;
|
||||
double dpi2;
|
||||
QSize targetSize = this->size();
|
||||
@ -22,11 +21,11 @@ void PDFPreviewWidget::regenImage(void) {
|
||||
dpi2 = targetSize.width() / (float)oriSize.width()*72;
|
||||
dpi = dpi<dpi2?dpi:dpi2;
|
||||
previewImage = pPage->renderToImage(dpi, dpi);
|
||||
}
|
||||
}
|
||||
|
||||
void PDFPreviewWidget::previewUpdate(Poppler::Page* pp) {
|
||||
pPage = pp;
|
||||
qDebug() << "Set new popler page" << pp;
|
||||
regenImage();
|
||||
update();
|
||||
}
|
||||
@ -36,6 +35,7 @@ void PDFPreviewWidget::pageClicked(QMouseEvent* mouseEvent, QImage image) {
|
||||
}
|
||||
|
||||
void PDFPreviewWidget::resizeEvent(QResizeEvent* event) {
|
||||
if(pPage != NULL)
|
||||
regenImage();
|
||||
}
|
||||
|
||||
|
@ -39,6 +39,7 @@ void PDFTableWidget::loadFile(QString fileName) {
|
||||
PDFFileWidget* fileWidget = new PDFFileWidget();
|
||||
fileWidget->setAncestor(this);
|
||||
fileWidget->setDocument(doc, fileName);
|
||||
pdfJam.loadFile(fileName, files.size()-1, doc->numPages());
|
||||
|
||||
fileWidgets.append(fileWidget);
|
||||
|
||||
|
@ -3,6 +3,7 @@
|
||||
#include <QHash>
|
||||
#include <poppler-qt5.h>
|
||||
|
||||
#include "pdf_jam.h"
|
||||
#include "pdf_page_widget.h"
|
||||
|
||||
class QImage;
|
||||
@ -20,7 +21,7 @@ public:
|
||||
void registerPage(PDFPageWidget* child);
|
||||
|
||||
protected:
|
||||
|
||||
PDFJam pdfJam;
|
||||
private:
|
||||
QVBoxLayout* outerLayout;
|
||||
QScrollArea* scrollArea;
|
||||
|
Loading…
Reference in New Issue
Block a user