mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-12-02 07:22:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged in selmf/yacreader/small-fixes-9.0 (pull request #52)

Browse Source 
Small fixes 9.0:
This commit is contained in:
Luis Ángel San Martín
2017-09-27 18:58:41 +00:00
parent f6382666b6 befbb06220
commit aa3fad1fe2
5 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
common/comic.cpp
View File

@ -44,7 +44,7 @@ const QStringList Comic::literalComicExtensions = LiteralComicArchiveExtensions;
//-----------------------------------------------------------------------------
Comic::Comic()
:_pages(),_index(0),_path(),_loaded(false),bm(new Bookmarks()),_loadedPages(),_isPDF(false)
:_pages(),_index(0),_path(),_loaded(false),bm(new Bookmarks()),_loadedPages(),_isPDF(false),_invalidated(false)
{
setup();
}
@ -57,6 +57,7 @@ Comic::Comic(const QString & pathFile, int atPage )
//-----------------------------------------------------------------------------
Comic::~Comic()
{
emit destroyed();
delete bm;
}
//-----------------------------------------------------------------------------
@ -198,7 +199,13 @@ void Comic::updateBookmarkImage(int index)
//-----------------------------------------------------------------------------
void Comic::setPageLoaded(int page)
{
_loadedPages[page] = true;
_loadedPages[page] = true;
}
void Comic::invalidate()
{
_invalidated = true;
emit invalidated();
}
//-----------------------------------------------------------------------------
QByteArray Comic::getRawPage(int page)
@ -585,10 +592,20 @@ void FileComic::process()
for(int i = sectionIndex; i<sections.count() ; i++)
{
if(_invalidated)
{
moveToThread(QCoreApplication::instance()->thread());
return;
}
archive.getAllData(sections.at(i),this);
}
for(int i = 0; i<sectionIndex; i++)
{
if(_invalidated)
{
moveToThread(QCoreApplication::instance()->thread());
return;
}
archive.getAllData(sections.at(i),this);
}
//archive.getAllData(QVector<quint32>(),this);
@ -688,6 +705,12 @@ void FolderComic::process()
int i=_firstPage;
while(count<nPages)
{
if(_invalidated)
{
moveToThread(QCoreApplication::instance()->thread());
return;
}
QFile f(list.at(i).absoluteFilePath());
f.open(QIODevice::ReadOnly);
_pages[i]=f.readAll();
@ -843,10 +866,23 @@ void PDFComic::process()
int buffered_index = _index;
for(int i=buffered_index;i<nPages;i++)
{
if(_invalidated)
{
delete pdfComic;
moveToThread(QCoreApplication::instance()->thread());
return;
}
renderPage(i);
}
for(int i=0;i<buffered_index;i++)
{
if(_invalidated)
{
delete pdfComic;
moveToThread(QCoreApplication::instance()->thread());
return;
}
renderPage(i);
}

7
common/comic.h
View File

@ -38,6 +38,8 @@ class Comic : public QObject
bool _isPDF;
bool _invalidated;
public:
static const QStringList imageExtensions;
@ -79,7 +81,6 @@ class Comic : public QObject
static QList<QString> findValidComicFilesInFolder(const QString &path);
public slots:
void loadFinished();
void setBookmark();
void removeBookmark();
@ -87,9 +88,11 @@ class Comic : public QObject
void checkIsBookmark(int index);
void updateBookmarkImage(int);
void setPageLoaded(int page);
void invalidate();
signals:
void invalidated();
void destroyed();
void imagesLoaded();
void imageLoaded(int index);
void imageLoaded(int index,const QByteArray & image);