mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-03 00:58:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #59 from vedgy/eliminate-SlideInitializer

Browse Source 
Reader: eliminate SlideInitializer class
This commit is contained in:
Luis Ángel San Martín 2019-05-30 18:29:02 +02:00 committed by GitHub
commit d1b1965fc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
YACReader/goto_flow.cpp
View File

@ -108,8 +108,6 @@ void GoToFlow::setNumSlides(unsigned int slides)
toolBar->setTop(slides); toolBar->setTop(slides);
SlideInitializer * si = new SlideInitializer(&mutexGoToFlow,flow,slides);
imagesLoaded.clear(); imagesLoaded.clear();
imagesLoaded.fill(false,slides); imagesLoaded.fill(false,slides);
@ -124,7 +122,10 @@ void GoToFlow::setNumSlides(unsigned int slides)
ready = true; ready = true;
worker->reset(); worker->reset();
si->start(); flow->clear();
for(unsigned int i=0;i<slides;i++)
flow->addSlide(QImage());
flow->setCenterIndex(0);
} }
void GoToFlow::reset() void GoToFlow::reset()
@ -229,30 +230,10 @@ void GoToFlow::setFlowRightToLeft(bool b)
flow->setFlowRightToLeft(b); flow->setFlowRightToLeft(b);
} }
//-----------------------------------------------------------------------------
//SlideInitializer
//-----------------------------------------------------------------------------
SlideInitializer::SlideInitializer(QMutex * m,PictureFlow * flow,int slides)
:QThread(),mutex(m),_flow(flow),_slides(slides)
{
}
void SlideInitializer::run()
{
mutex->lock();
_flow->clear();
for(int i=0;i<_slides;i++)
_flow->addSlide(QImage());
_flow->setCenterIndex(0);
mutex->unlock();
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//PageLoader //PageLoader
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PageLoader::PageLoader(QMutex * m): PageLoader::PageLoader(QMutex * m):
QThread(),mutex(m), restart(false), working(false), idx(-1) QThread(),mutex(m), restart(false), working(false), idx(-1)
{ {

16
YACReader/goto_flow.h
View File

@ -21,7 +21,6 @@ class QLabel;
class Comic; class Comic;
class SlideInitializer;
class PageLoader; class PageLoader;
class YACReaderFlow; class YACReaderFlow;
class PictureFlow; class PictureFlow;
@ -68,23 +67,10 @@ signals:
void goToPage(unsigned int page); void goToPage(unsigned int page);
}; };
//-----------------------------------------------------------------------------
//SlideInitializer
//-----------------------------------------------------------------------------
class SlideInitializer : public QThread
{
public:
SlideInitializer(QMutex * m,PictureFlow * flow,int slides);
private:
QMutex * mutex;
PictureFlow * _flow;
int _slides;
void run();
};
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//PageLoader //PageLoader
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class PageLoader : public QThread class PageLoader : public QThread
{ {
public: public: