mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 13:04:28 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed qDebug from extract_callbaks

Browse Source 
drag and drop fixed

openAt added to FolderComic and PDFComic
This commit is contained in:
Luis Ángel San Martín
2013-07-15 16:53:14 +02:00
parent 0398b8ca57
commit 3b88845aa3
4 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
YACReader/comic.cpp
View File

@ -240,12 +240,12 @@ QList<QString> FileComic::filter(const QList<QString> & src)
}
void FileComic::fileExtracted(int index, const QByteArray & rawData)
{
QFile f("c:/temp/out2.txt");
/*QFile f("c:/temp/out2.txt");
f.open(QIODevice::Append);
QTextStream out(&f);
QTextStream out(&f);*/
int sortedIndex = _fileNames.indexOf(_order.at(index));
out << sortedIndex << " , ";
f.close();
//out << sortedIndex << " , ";
//f.close();
if(sortedIndex == -1)
return;
_pages[sortedIndex] = rawData;
@ -499,6 +499,7 @@ void FolderComic::process()
_pages.clear();
_pages.resize(nPages);
_loadedPages = QVector<bool>(nPages,false);
if(nPages==0)
{
//TODO emitir este mensaje en otro sitio
@ -507,17 +508,27 @@ void FolderComic::process()
}
else
{
_firstPage = bm->getLastPage();
_index = bm->getLastPage();
emit(openAt(_index));
emit pageChanged(0); // this indicates new comic, index=0
emit numPages(_pages.size());
_loaded = true;
for(int i=0;i<nPages;i++)
int count=0;
int i=_firstPage;
while(count<nPages)
{
QFile f(list.at(i).absoluteFilePath());
f.open(QIODevice::ReadOnly);
_pages[i]=f.readAll();
emit imageLoaded(i);
emit imageLoaded(i,_pages[i]);
i++;
if(i==nPages)
i=0;
count++;
}
}
emit imagesLoaded();
@ -578,28 +589,35 @@ void PDFComic::process()
_pages.clear();
_pages.resize(nPages);
_loadedPages = QVector<bool>(nPages,false);
for(int i=0;i<nPages;i++)
{
Poppler::Page* pdfpage = pdfComic->page(i);
if (pdfpage)
{
QImage img = pdfpage->renderToImage(150,150);
delete pdfpage;
QByteArray ba;
QBuffer buf(&ba);
img.save(&buf, "jpg");
_pages[i] = ba;
emit imageLoaded(i);
emit imageLoaded(i,_pages[i]);
_firstPage = bm->getLastPage();
_index = bm->getLastPage();
emit(openAt(_index));
}
for(int i=_index;i<nPages;i++)
renderPage(i);
for(int i=0;i<_index;i++)
renderPage(i);
}
delete pdfComic;
emit imagesLoaded();
}
void PDFComic::renderPage(int page)
{
Poppler::Page* pdfpage = pdfComic->page(page);
if (pdfpage)
{
QImage img = pdfpage->renderToImage(150,150);
delete pdfpage;
QByteArray ba;
QBuffer buf(&ba);
img.save(&buf, "jpg");
_pages[page] = ba;
emit imageLoaded(page);
emit imageLoaded(page,_pages[page]);
}
}
Comic * FactoryComic::newComic(const QString & path)
{

1
YACReader/comic.h
View File

@ -124,6 +124,7 @@
private:
//pdf
Poppler::Document * pdfComic;
void renderPage(int page);
//void run();
public:

4
YACReader/viewer.cpp
View File

@ -111,6 +111,8 @@ drag(false)
informationLabel = new PageLabelWidget(this);
setAcceptDrops(true);
}
void Viewer::createConnections()
@ -176,7 +178,7 @@ void Viewer::open(QString pathFile)
informationLabel->setText("...");
setAcceptDrops(true);
}
void Viewer::showMessageErrorOpening()

9
compressed_archive/extract_callbacks.h
View File

@ -238,13 +238,13 @@ STDMETHODIMP CArchiveExtractCallback::PrepareOperation(Int32 askExtractMode)
{
case NArchive::NExtract::NAskMode::kExtract: _extractMode = true; break;
};
switch (askExtractMode)
/* switch (askExtractMode)
{
case NArchive::NExtract::NAskMode::kExtract: qDebug() << (kExtractingString); break;
case NArchive::NExtract::NAskMode::kTest: qDebug() <<(kTestingString); break;
case NArchive::NExtract::NAskMode::kSkip: qDebug() <<(kSkippingString); break;
};
qDebug() << _filePath;
};*/
//qDebug() << _filePath;
return S_OK;
}
@ -267,6 +267,7 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 operationResult)
break;
default:
{
//TODO comunicar los fallos usando el delegado
NumErrors++;
qDebug() << " ";
switch(operationResult)
@ -295,7 +296,7 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 operationResult)
_outFileStream.Release();
if (_extractMode && _processedFileInfo.AttribDefined)
NFile::NDirectory::MySetFileAttributes(_diskFilePath, _processedFileInfo.Attrib);*/
qDebug() << endl;
//qDebug() << endl;
return S_OK;
}