From 3b88845aa3314ee23c3ca02485aa9f0b8940636e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Mon, 15 Jul 2013 16:53:14 +0200
Subject: [PATCH] removed qDebug from extract_callbaks

drag and drop fixed

openAt added to FolderComic and PDFComic
---
 YACReader/comic.cpp                    | 58 +++++++++++++++++---------
 YACReader/comic.h                      |  1 +
 YACReader/viewer.cpp                   |  4 +-
 compressed_archive/extract_callbacks.h |  9 ++--
 4 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/YACReader/comic.cpp b/YACReader/comic.cpp
index b073a825..86ff51a4 100644
--- a/YACReader/comic.cpp
+++ b/YACReader/comic.cpp
@@ -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)
 {
diff --git a/YACReader/comic.h b/YACReader/comic.h
index 6bb1ce33..a894aaf6 100644
--- a/YACReader/comic.h
+++ b/YACReader/comic.h
@@ -124,6 +124,7 @@
 	private:
 		//pdf
 		Poppler::Document * pdfComic;
+		void renderPage(int page);
 
 		//void run();
 	public:
diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
index 568b4bb5..c8c17c24 100644
--- a/YACReader/viewer.cpp
+++ b/YACReader/viewer.cpp
@@ -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()
diff --git a/compressed_archive/extract_callbacks.h b/compressed_archive/extract_callbacks.h
index 004fbb0d..ed1f185d 100644
--- a/compressed_archive/extract_callbacks.h
+++ b/compressed_archive/extract_callbacks.h
@@ -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;
 }