[elvystrac] r1727 - All debug messages commented out - now rock stable. To be further investigated!
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Mon, 15 Feb 2010 08:44:43 +0100
Author: JirkaH
Date: 2010-02-15 08:44:43 +0100 (Mon, 15 Feb 2010)
New Revision: 1727
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/abstractmaintainer.cpp
branches/client/pdf-presentation-branch/elvys-client/src/autodeleter.cpp
branches/client/pdf-presentation-branch/elvys-client/src/category.cpp
branches/client/pdf-presentation-branch/elvys-client/src/categorymaintainerdoc.cpp
branches/client/pdf-presentation-branch/elvys-client/src/categorymaintainerlayout.cpp
branches/client/pdf-presentation-branch/elvys-client/src/documentmaintainer.cpp
branches/client/pdf-presentation-branch/elvys-client/src/dynamictext.cpp
branches/client/pdf-presentation-branch/elvys-client/src/elvys.cpp
branches/client/pdf-presentation-branch/elvys-client/src/filecachemaintainer.cpp
branches/client/pdf-presentation-branch/elvys-client/src/http.cpp
branches/client/pdf-presentation-branch/elvys-client/src/layoutmaintainer.cpp
branches/client/pdf-presentation-branch/elvys-client/src/main.cpp
branches/client/pdf-presentation-branch/elvys-client/src/modechanger.cpp
branches/client/pdf-presentation-branch/elvys-client/src/panel.cpp
branches/client/pdf-presentation-branch/elvys-client/src/pdfdocument.cpp
branches/client/pdf-presentation-branch/elvys-client/src/pdffiller.cpp
branches/client/pdf-presentation-branch/elvys-client/src/pdfpage.cpp
branches/client/pdf-presentation-branch/elvys-client/src/pdfpresentationdocument.cpp
branches/client/pdf-presentation-branch/elvys-client/src/pdfpresentationviewer.cpp
branches/client/pdf-presentation-branch/elvys-client/src/pdfviewer.cpp
branches/client/pdf-presentation-branch/elvys-client/src/pdfzoomed.cpp
branches/client/pdf-presentation-branch/elvys-client/src/screenshooter.cpp
branches/client/pdf-presentation-branch/elvys-client/src/serialcontrols.cpp
branches/client/pdf-presentation-branch/elvys-client/src/statisticsdata.cpp
branches/client/pdf-presentation-branch/elvys-client/src/xmlabstractparser.cpp
branches/client/pdf-presentation-branch/elvys-client/src/xmlappparser.cpp
branches/client/pdf-presentation-branch/elvys-client/src/xmlcatdocparser.cpp
branches/client/pdf-presentation-branch/elvys-client/src/xmlcatlayoutparser.cpp
branches/client/pdf-presentation-branch/elvys-client/src/xmldocumentparser.cpp
branches/client/pdf-presentation-branch/elvys-client/src/xmlfilecacheparser.cpp
branches/client/pdf-presentation-branch/elvys-client/src/xmllayoutparser.cpp
branches/client/pdf-presentation-branch/elvys-client/src/xmlpaneldocparser.cpp
Log:
All debug messages commented out - now rock stable. To be further investigated!
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/abstractmaintainer.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/abstractmaintainer.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/abstractmaintainer.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -59,13 +59,13 @@
}
QFile::rename(xmlNameTemp, xmlName);
} else {
- qDebug() << "Neco je spatne, soubor " << xmlNameTemp << "
neexistuje" ;
+ ////qDebug() << "Neco je spatne, soubor " << xmlNameTemp << "
neexistuje" ;
}
}
void AbstractMaintainer::readDownloadedXML(QString & id) {
- qDebug() << Q_FUNC_INFO << "New data!!!" << id;
+ ////qDebug() << Q_FUNC_INFO << "New data!!!" << id;
if ( fileTemp->size() != 0 ) {
if (! fileTemp->isOpen()) {
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/autodeleter.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/autodeleter.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/autodeleter.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -102,18 +102,18 @@
_dir = QDir(dirName);
if (! _dir.exists(_dirName)) {
- qDebug() << Q_FUNC_INFO << "no such directory:" << dirName;
+ ////qDebug() << Q_FUNC_INFO << "no such directory:" << dirName;
return;
}
#ifdef Q_OS_UNIX
struct statvfs stat;
if ( statvfs(dirName.toLocal8Bit().constData(), &stat) != 0) {
- qDebug() << Q_FUNC_INFO << "Error getting filesystem size:" <<
strerror(errno);
+ ////qDebug() << Q_FUNC_INFO << "Error getting filesystem size:"
<< strerror(errno);
return;
}
if (_baseSize == BASE_SIZE_UNDEF) {
- qDebug() << stat.f_bavail << stat.f_bsize;
+ ////qDebug() << stat.f_bavail << stat.f_bsize;
_baseSize = (qint64)stat.f_bavail * (qint64)stat.f_bsize;
_baseSize /= Q_INT64_C(1024);
}
Modified: branches/client/pdf-presentation-branch/elvys-client/src/category.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/category.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/category.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -174,7 +174,7 @@
void Category::panelLayoutDestroyed() {
--panelLayoutsToDestroy;
if (panelLayoutsToDestroy == 0) {
- qDebug() << "all panels successfully destroyed";
+ ////qDebug() << "all panels successfully destroyed";
emit allowNewLayout(true);
}
}
@@ -340,7 +340,7 @@
panelLayoutsToDestroy = panels.count();
- qDebug() << "Category" << objectName() << "destroying current layout" ;
+ ////qDebug() << "Category" << objectName() << "destroying current
layout" ;
foreach(panel, panels) {
panel->destroyLayout();
@@ -443,7 +443,7 @@
panelsFound.insert(panelId, true);
if ( (panel = findChild<Panel *>(QString::number(panelId))) == NULL ) {
- qDebug() << "Category" << objectName() << ": no such panel" <<
panelId << ". Creating new one";
+ ////qDebug() << "Category" << objectName() << ": no such panel"
<< panelId << ". Creating new one";
panel = newPanel(panelId);
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/categorymaintainerdoc.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/categorymaintainerdoc.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/categorymaintainerdoc.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -43,7 +43,7 @@
}
//zkusim znovu sosnout novy document
- qDebug() << Q_FUNC_INFO << " downloading new config.";
+ ////qDebug() << Q_FUNC_INFO << " downloading new config.";
http->downloadPOST("documentConfig", address, xmlNameTemp, userAgent);
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/categorymaintainerlayout.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/categorymaintainerlayout.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/categorymaintainerlayout.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -45,7 +45,7 @@
}
//zkusim znovu sosnout novy document
- qDebug() << Q_FUNC_INFO << " downloading new config.";
+ ////qDebug() << Q_FUNC_INFO << " downloading new config.";
http->downloadPOST("categoryConfig", address, xmlNameTemp, userAgent);
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/documentmaintainer.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/documentmaintainer.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/documentmaintainer.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -104,7 +104,7 @@
QString sId;
QList<int> docIDs = docsToDelete.keys();
- qDebug() << "close all";
+ //qDebug() << "close all";
foreach(id, docIDs) {
docsToDelete.remove(id);
@@ -122,7 +122,7 @@
return;
}
- qDebug() << "closing document" << toId << doc;
+ //qDebug() << "closing document" << toId << doc;
if (doc->isZoomed()) {
doc->setZoomable(false);
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/dynamictext.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/dynamictext.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/dynamictext.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -112,7 +112,7 @@
}
_name = name;
- qDebug() << "LOADING DYNAMIC TEEEEEXT:" << _name;
+ //qDebug() << "LOADING DYNAMIC TEEEEEXT:" << _name;
text = _name;
manageFont();
secondText = false;
Modified: branches/client/pdf-presentation-branch/elvys-client/src/elvys.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/elvys.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/elvys.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -30,7 +30,7 @@
Elvys::Elvys() {
- qDebug() << "Creating elvys class...";
+ //qDebug() << "Creating elvys class...";
layout = new QVBoxLayout();
appMaint = new AppMaintainer();
@@ -46,7 +46,7 @@
this->setLayout(layout);
- qDebug() << "current thread (GUI):" << QThread::currentThread();
+ //qDebug() << "current thread (GUI):" << QThread::currentThread();
//documentMaint->maintain();
@@ -82,7 +82,7 @@
void Elvys::keyPressEvent ( QKeyEvent * event ) {
switch( event->key()) {
case Qt::Key_Q:
- qDebug() << "Quit requested, closing";
+ //qDebug() << "Quit requested, closing";
exit(0);
break;
default:
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/filecachemaintainer.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/filecachemaintainer.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/filecachemaintainer.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -52,7 +52,7 @@
}
//zkusim znovu sosnout novy document
- qDebug() << Q_FUNC_INFO << " downloading new config.";
+ //qDebug() << Q_FUNC_INFO << " downloading new config.";
http->downloadPOST("fileCacheConfig", address, xmlNameTemp, userAgent);
}
Modified: branches/client/pdf-presentation-branch/elvys-client/src/http.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/http.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/http.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -74,7 +74,7 @@
}
http->setHost(address.host, address.port);
- qDebug() << "downloading document " << id;
+ //qDebug() << "downloading document " << id;
tmpFile = new QFile(realFileName);
@@ -106,14 +106,14 @@
void Http::downloadPOST(const QString & id, const HttpAddress & address,
QString & fileName, QString & userAgent) {
mtx.lock();
if (transfers.contains(id)) { //transfer for this file already exists
- qDebug() << "HTTP: transfer for id" << id << "already exists"
<< "(downloading to " << transfers[id]->fileName() << ")";
+ //qDebug() << "HTTP: transfer for id" << id << "already exists"
<< "(downloading to " << transfers[id]->fileName() << ")";
mtx.unlock();
return;
}
mtx.unlock();
if (numDownloads() > MAX_DOWNLOADS) {
- qDebug() << Q_FUNC_INFO << "There are too many transfers at the
moment (" << numDownloads() << "), queueing.";
+ //qDebug() << Q_FUNC_INFO << "There are too many transfers at
the moment (" << numDownloads() << "), queueing.";
HttpReq req;
req.address = address;
req.fileName = fileName;
@@ -159,7 +159,7 @@
uploadsCount++;
- qDebug() << "uploading document " << id;
+ //qDebug() << "uploading document " << id;
QHttpRequestHeader header("POST", address.path);
@@ -186,7 +186,7 @@
mtx.lock();
if (transfers.contains(id)) { //transfer for this file already exists
- qDebug() << "HTTP: transfer for id" << id << "already exists";
+ //qDebug() << "HTTP: transfer for id" << id << "already exists";
mtx.unlock();
return;
}
@@ -194,7 +194,7 @@
if (numUploads() > MAX_DOWNLOADS) {
- qDebug() << Q_FUNC_INFO << "There are too many transfers at the
moment (" << numUploads() << "), queueing.";
+ //qDebug() << Q_FUNC_INFO << "There are too many transfers at
the moment (" << numUploads() << "), queueing.";
HttpReq req;
req.address = address;
req.id = id;
@@ -226,7 +226,7 @@
void Http::reqTimeout() {
if ( state() == QHttp::Connected && docDownloads.count() == 0) {
- qDebug() << "HTTPP: Everything went ok, closing" ;
+ //qDebug() << "HTTPP: Everything went ok, closing" ;
close();
return;
}
@@ -242,7 +242,7 @@
*/
void Http::stateChanged(int state) {
- //qDebug() << "state changed:" << state;
+ ////qDebug() << "state changed:" << state;
}
void Http::getDocumentReal(docIdentifier & docIdent) {
@@ -273,11 +273,11 @@
downloadsCount++;
- qDebug() << "getting document " << filename;
+ //qDebug() << "getting document " << filename;
http->setHost(address.host, address.port);
- qDebug()<< Q_FUNC_INFO << "Host:" << address.host;
- qDebug() << Q_FUNC_INFO << "path: " << address.path;
+ //qDebug()<< Q_FUNC_INFO << "Host:" << address.host;
+ //qDebug() << Q_FUNC_INFO << "path: " << address.path;
reqId = http->get(QString(address.path) + "/" + filename, file);
@@ -294,7 +294,7 @@
mtx.lock();
if (transfers.contains(filename)) { //transfer for this file already
exists
- qDebug() << Q_FUNC_INFO << "Transfer for " << filename <<
"already exists.";
+ //qDebug() << Q_FUNC_INFO << "Transfer for " << filename <<
"already exists.";
mtx.unlock();
return;
}
@@ -305,7 +305,7 @@
docIdent.docId = docId;
if (numDownloads() > MAX_DOWNLOADS) {
- qDebug() << Q_FUNC_INFO << "There are too many transfers at the
moment (" << numDownloads() << "), queueing.";
+ //qDebug() << Q_FUNC_INFO << "There are too many transfers at
the moment (" << numDownloads() << "), queueing.";
HttpReq req;
req.address = AppConfig::getInstance()->getDataAddress();
req.fileName = filename;
@@ -369,8 +369,8 @@
if ( docDownloads.find(id) != docDownloads.end()) {
if (error || (responseHeader.statusCode() != 200)) { //error
file = docDownloads[id].file;
- qDebug() << Q_FUNC_INFO << "Error downloading document
filename:" << file->fileName() << "." << http->errorString();
- qDebug() << Q_FUNC_INFO << "http status code:" <<
responseHeader.statusCode();
+ //qDebug() << Q_FUNC_INFO << "Error downloading
document filename:" << file->fileName() << "." << http->errorString();
+ //qDebug() << Q_FUNC_INFO << "http status code:" <<
responseHeader.statusCode();
file->remove();
file->close();
delete file;
@@ -395,7 +395,7 @@
file = transfers[downloads[id]];
file->close();
if (error || (responseHeader.statusCode() != 200)) {
- qDebug() << Q_FUNC_INFO << "Error downloading" <<
http->errorString() << ". HTTP code:" << responseHeader.statusCode();
+ //qDebug() << Q_FUNC_INFO << "Error downloading" <<
http->errorString() << ". HTTP code:" << responseHeader.statusCode();
file->remove();
delete file;
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/layoutmaintainer.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/layoutmaintainer.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/layoutmaintainer.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -48,7 +48,7 @@
return;
}
newLayoutAllowed = true;
- qDebug() << "layout maintainer allowed" ;
+ //qDebug() << "layout maintainer allowed" ;
connect((XMLLayoutParser *)parser, SIGNAL(newDocument(QString
&, QRectF &)), docuManager, SLOT(addLayoutDocument(QString &, QRectF &)));
@@ -76,20 +76,20 @@
void LayoutMaintainer::manageIdRevision(int id, int revision) {
if ( id == layoutID && revision == layoutRevision ) { // seems like
layout we already have
- qDebug() << "layout stejne ID a revize" ;
+ //qDebug() << "layout stejne ID a revize" ;
parser->stopReading(true);
} else if ( id != layoutID && revision != layoutRevision ) { // new
layout
- qDebug() << "layout jine ID i revize" ;
+ //qDebug() << "layout jine ID i revize" ;
emit layoutAboutToChange();
emit newIdRevision(id, revision);
} else if ( id != layoutID ) { //revisions match, but it is just a
chance
- qDebug() << "layout jine ID" ;
+ //qDebug() << "layout jine ID" ;
emit layoutAboutToChange();
emit newId(id);
} else if ( revision != layoutRevision ) { //only revision numbers
are not the same
//but we will still change
whole layout
- qDebug() << "layout jina revize" ;
+ //qDebug() << "layout jina revize" ;
emit layoutAboutToChange();
emit newRevision(revision);
}
Modified: branches/client/pdf-presentation-branch/elvys-client/src/main.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/main.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/main.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -61,8 +61,8 @@
QString fileName = "data/style.css";
QFile file(fileName);
- qDebug() << "Starting...";
- qDebug() << "Setting style sheet";
+ //qDebug() << "Starting...";
+ //qDebug() << "Setting style sheet";
if ( ! file.open(QFile::ReadOnly)) {
qWarning() << "Cannot open file:" << fileName;
} else {
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/modechanger.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/modechanger.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/modechanger.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -31,7 +31,7 @@
QTime smallerTime = dayMode <= nightMode ? dayMode : nightMode;
- qDebug() << "Checking mode change..." ;
+ //qDebug() << "Checking mode change..." ;
if (smallerTime == dayMode) {
if ( currTime >= dayMode && currTime <= nightMode ) {
AppConfig::getInstance()->setCurrentMode(Day);
Modified: branches/client/pdf-presentation-branch/elvys-client/src/panel.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/panel.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/panel.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -235,12 +235,12 @@
int docCount = documents.count();
int i = 0;
- qDebug() << "destroying current layout" ;
+ //qDebug() << "destroying current layout" ;
while (it != documents.end() ) {
doc = *it;
if ( ! doc->isZoomed() ) {
- qDebug() << "destroying document no." <<
doc->objectName();
+ //qDebug() << "destroying document no." <<
doc->objectName();
delete doc;
documents.erase(it);
i++;
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/pdfdocument.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/pdfdocument.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/pdfdocument.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -101,7 +101,7 @@
for (int i = 0; i < _pageNumbers.size(); ++i) {
if ( pages.at(i)!= _pageNumbers[i]) {
same = false;
- qDebug() << "PDFFiller Nestejne cisla stranek";
+ //qDebug() << "PDFFiller Nestejne cisla
stranek";
break;
}
}
@@ -136,7 +136,7 @@
void PDFDocument::mutexLock() {
if (imgMtx.tryLock() == false) {
- qDebug() << Q_FUNC_INFO <<
"...........................................POTENTIONAL DEAD LOCK
PREVENTED!!!!.......................................";
+ //qDebug() << Q_FUNC_INFO <<
"...........................................POTENTIONAL DEAD LOCK
PREVENTED!!!!.......................................";
imgMtx.lock();
}
}
Modified: branches/client/pdf-presentation-branch/elvys-client/src/pdffiller.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/pdffiller.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/pdffiller.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -52,7 +52,7 @@
delete pageNormal;
}
cache.clear();
- qDebug() << "pdffiller deleted";
+ //qDebug() << "pdffiller deleted";
}
@@ -65,10 +65,10 @@
void PDFFiller::loadPage(int pageNum, QSize size, QString desc) {
PageSelector selector;
- qDebug() << "load page triggered" << pageNum << "size" << size <<
"desc:" << desc;
+ //qDebug() << "load page triggered" << pageNum << "size" << size <<
"desc:" << desc;
if (pdf == NULL) {
- qDebug() << Q_FUNC_INFO << "pdf is not load yet, so I can't
load requested page no." << pageNum;
+ //qDebug() << Q_FUNC_INFO << "pdf is not load yet, so I can't
load requested page no." << pageNum;
return;
}
@@ -122,7 +122,7 @@
void PDFFiller::clearCache() {
mutexCond.lock();
- qDebug() << "cache size" << cache.keys().size();
+ //qDebug() << "cache size" << cache.keys().size();
cache.clear();
mutexCond.unlock();
}
@@ -137,20 +137,24 @@
int limit;
QString fullname = QString(AppConfig::getInstance()->getLocalDataDir())
+ filename;
-
+ mutexCond.lock();
+
mutexPDF.lock();
err = pdfLoadFile(&pdf, fullname.toLocal8Bit());
mutexPDF.unlock();
if (err != pdfOk) {
- qDebug() << "Cannot load PDF file" << fullname << ". Is path
ok?";
+ //qDebug() << "Cannot load PDF file" << fullname << ". Is path
ok?";
if (QFile::exists(fullname)) {
QFile::remove(fullname);
- }
+ }
+ mutexToLoad.lock();
toLoadList.clear();
+ mutexToLoad.unlock();
ready = false;
emit badPDF(filename);
close();
+ mutexCond.unlock();
return false;
}
@@ -180,6 +184,7 @@
// mutexPages->unlock();
restart = false;
+ mutexCond.unlock();
condition.wakeOne();
return true;
}
@@ -211,14 +216,14 @@
int toLoad = -1; ///< page sequence number
int toLoadReal = -1; ///< real page number in document
- qDebug() << "tread jede " << endl;
+ //qDebug() << "tread jede " << endl;
restart = false;
if ( ! makeInit() ) {
QThread::exit();
return;
}
- qDebug() << "za initem";
+ //qDebug() << "za initem";
forever {
mutexCond.lock();
// i am woken up here
@@ -226,7 +231,7 @@
if ( !ready ) {
rendering = false;
if (quit) {
- qDebug() << "PDFFiller: Real quit of working
thread";
+ //qDebug() << "PDFFiller: Real quit of working
thread";
mutexCond.unlock();
QThread::exit();
return;
@@ -252,7 +257,7 @@
// lets recognize the reason why we were waken up
if (restart) {
if (isRunning()) { // we should clean up after ourselfs
- qDebug() << "running - uklidim po sobe" ;
+ //qDebug() << "running - uklidim po sobe" ;
mutexPages->lock();
pages.clear();
@@ -281,7 +286,7 @@
mutexCond.unlock();
continue;
} else if (quit) {
- qDebug() << "REAL QUIT";
+ //qDebug() << "REAL QUIT";
rendering = false;
mutexCond.unlock();
QThread::exit();
@@ -298,10 +303,10 @@
toLoadReal = pages[toLoad];
- qDebug() << "Rendering PAGE no." << toLoad << "at size"
<<selector.desSize << "from " << filename;
+ //qDebug() << "Rendering PAGE no." << toLoad << "at size"
<<selector.desSize << "from " << filename;
if ( ( page = cache[selector] ) == 0 && !
pagesNotCached.contains(selector)) { // still dont have this page loaded
- qDebug() << "neni, nacitam " << toLoad ;
+ //qDebug() << "neni, nacitam " << toLoad ;
pageSt = zoom(selector.desSize.width(),
selector.desSize.height(), Page, toLoadReal);
if ( pageSt.qImg != NULL ) { //loading was sucessfull
page = new PDFPage(pageSt.qImg, pageSt.docW,
pageSt.docH);
@@ -312,7 +317,7 @@
if (page == 0) { // the page is in pagesNotCached
hashMap:
page = pagesNotCached[selector];
}
- qDebug() << "je." ;
+ //qDebug() << "je." ;
emit pageLoaded(selector, page);
}
toLoadList.remove(toLoad);
@@ -375,7 +380,7 @@
docW = (int) ((docW72/proportion) + 0.5);
docH = (int) ((docH72/proportion) + 0.5);
- qDebug() << "new docW x docH:" << docW << "x" << docH;
+ //qDebug() << "new docW x docH:" << docW << "x" << docH;
}
@@ -441,7 +446,7 @@
for (int i = 0; i < _pages.size(); ++i) {
if ( pages.at(i)!= _pages[i]) {
same = false;
- qDebug() << "PDFFiller Nestejne cisla stranek";
+ //qDebug() << "PDFFiller Nestejne cisla
stranek";
break;
}
}
@@ -545,7 +550,7 @@
if (docH > maxHeight) {
maxHeight = docH;
}
- //qDebug() << "Page dimension " << i << docW << docH;
+ ////qDebug() << "Page dimension " << i << docW << docH;
emit pageDimension(i, docZoomedW, docZoomedH);
}
mutexPDF.unlock();
@@ -604,7 +609,7 @@
mutexCond.lock(); //wait for worker thread to pause
- qDebug() << "loading..." << name;
+ //qDebug() << "loading..." << name;
emit changeReady(false);
filename = name;
ready = true;
Modified: branches/client/pdf-presentation-branch/elvys-client/src/pdfpage.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/pdfpage.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/pdfpage.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -40,7 +40,7 @@
*/
PDFPage::~PDFPage() {
- qDebug() << "DELETING PAGE";
+ //qDebug() << "DELETING PAGE";
delete image;
pdfFreeMemory(qImg);
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/pdfpresentationdocument.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/pdfpresentationdocument.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/pdfpresentationdocument.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -74,7 +74,7 @@
for (int i = 0; i < _pageNumbers.size(); ++i) {
if ( pages.at(i)!= _pageNumbers[i]) {
same = false;
- qDebug() << "PDFFiller Nestejne cisla stranek";
+ //qDebug() << "PDFFiller Nestejne cisla
stranek";
break;
}
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/pdfpresentationviewer.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/pdfpresentationviewer.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/pdfpresentationviewer.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -230,7 +230,7 @@
return;
}
- qDebug() << Q_FUNC_INFO << selector.desc << selector.desSize <<
selector.pageNum;
+ //qDebug() << Q_FUNC_INFO << selector.desc << selector.desSize <<
selector.pageNum;
if (selector.desc.contains(pageKeyCur)) {
key = getPageKey(size(), pageKeyCur);
@@ -240,9 +240,10 @@
key = getPageKey(size(), pageKeyCur);
}
- if (QPixmapCache::find(key, myPixmap) == true) { //we have it already
+/* if (QPixmapCache::find(key, myPixmap) == true) { //we have it already
return;
}
+*/
emit imageGenerationStarted();
myPixmap = QPixmap::fromImage(*page->getImage()); ///< @todo better
observe this place, as it may fail here (image inside page could have already
been deleted)
@@ -362,10 +363,10 @@
}
if (zoomH < AppConfig::getInstance()->getZoomHeight(parW) ) {
- qDebug() << QRect(newX, newY, zoomW, zoomH);
+ //qDebug() << QRect(newX, newY, zoomW, zoomH);
return QRect(newX, newY, zoomW, zoomH);
} else {
- qDebug() << QRect(newX, newY, zoomW, zoomH);
+ //qDebug() << QRect(newX, newY, zoomW, zoomH);
return QRect(newX, newY, zoomW,
AppConfig::getInstance()->getZoomHeight(parW));
}
}
@@ -490,7 +491,7 @@
void PDFPresentationViewer::zoom() {
if ( ! zoomed ) {
if ( ! zoomable ) {
- qDebug() << "Nemuzu zvetsovat, nejsem ve stavu
zoomable" ;
+ //qDebug() << "Nemuzu zvetsovat, nejsem ve stavu
zoomable" ;
return;
}
emit zoomEvent();
@@ -581,7 +582,7 @@
if ( zoomed ) {
setFocus();
}
- qDebug() << event->reason();
+ //qDebug() << event->reason();
}
void PDFPresentationViewer::doFadeEffect() {
Modified: branches/client/pdf-presentation-branch/elvys-client/src/pdfviewer.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/pdfviewer.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/pdfviewer.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -83,7 +83,7 @@
return;
}
- qDebug() << Q_FUNC_INFO << selector.desc << selector.desSize <<
selector.pageNum;
+ //qDebug() << Q_FUNC_INFO << selector.desc << selector.desSize <<
selector.pageNum;
emit imageGenerationStarted();
myPixmap = QPixmap::fromImage(*page->getImage()); ///< @todo better
observe this place, as it fails here
@@ -226,7 +226,7 @@
if ( ! zoomed ) {
if ( event->key() == Qt::Key_Return) {
- qDebug() << "nekdo mi tu zmackl enter!!!" ;
+ //qDebug() << "nekdo mi tu zmackl enter!!!" ;
zoom();
} else {
event->ignore(); // required step, so we can navigate
in whole kiosk
@@ -308,13 +308,13 @@
void PDFViewer::zoom() {
if (pdfZoomed == NULL ) {
- qDebug() << "Nemuzu zvetsovat, neni nastaveny widget PDFZoomed"
;
+ //qDebug() << "Nemuzu zvetsovat, neni nastaveny widget
PDFZoomed" ;
return;
}
if ( ! zoomed ) {
if ( ! zoomable ) {
- qDebug() << "Nemuzu zvetsovat, nejsem ve stavu
zoomable" ;
+ //qDebug() << "Nemuzu zvetsovat, nejsem ve stavu
zoomable" ;
return;
}
emit zoomEvent();
@@ -327,7 +327,7 @@
}
scaled++;
emit scale(SCALE_FACTOR);
- qDebug() << "vertical slider poss:" <<
scroll->verticalScrollBar()->sliderPosition();
+ //qDebug() << "vertical slider poss:" <<
scroll->verticalScrollBar()->sliderPosition();
//let's take care of image position - we will try to keep focus
on the middle of an image
adjustScrollBar(scroll->verticalScrollBar(), SCALE_FACTOR);
adjustScrollBar(scroll->horizontalScrollBar(), SCALE_FACTOR);
Modified: branches/client/pdf-presentation-branch/elvys-client/src/pdfzoomed.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/pdfzoomed.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/pdfzoomed.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -281,12 +281,12 @@
mtx.lock();
if ( QPixmapCache::find ( key, pixmap ) == true ) { // pixmap
is already there!
- qDebug() << "pixmap for" << pageNum << "is already
there!";
+ //qDebug() << "pixmap for" << pageNum << "is already
there!";
mtx.unlock();
return;
}
- qDebug() << "pixmap for" << pageNum << "is not yet there";
+ //qDebug() << "pixmap for" << pageNum << "is not yet there";
QImage * image = page->getImage();
pixmap = QPixmap::fromImage(*image);
if ( ! QPixmapCache::insert(key, pixmap)) {
@@ -334,14 +334,14 @@
for (int i = 0; i < _pageNumbers.size(); ++i) {
if ( pages.at(i).num != _pageNumbers[i]) {
same = false;
- qDebug() << "Nestejne cisla stranek";
+ //qDebug() << "Nestejne cisla stranek";
break;
}
}
}
if (same) {
- qDebug() << "Stejne cisla stranek";
+ //qDebug() << "Stejne cisla stranek";
return;
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/screenshooter.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/screenshooter.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/screenshooter.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -45,7 +45,7 @@
QByteArray bytes;
QBuffer buffer(&bytes);
- qDebug() << "MAKING screenshot!!! " ;
+ //qDebug() << "MAKING screenshot!!! " ;
buffer.open(QIODevice::WriteOnly);
pixmap = QPixmap::grabWindow(QApplication::desktop()->winId());
pixmap = pixmap.scaled (pixmap.size() / 2, Qt::KeepAspectRatio,
Qt::SmoothTransformation);
@@ -59,6 +59,6 @@
QString userAgent = QString("Screenshot") +
QString("%1").arg(AppConfig::getInstance()->getMachineID());
HttpAddress address = AppConfig::getInstance()->getScreenshotAddress();
- qDebug() << data.size();
+ //qDebug() << data.size();
uploader->upload(httpId, address, data, userAgent);
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/serialcontrols.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/serialcontrols.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/serialcontrols.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -22,7 +22,7 @@
bool succ = serialPort.open(QIODevice::ReadOnly);
if ( ! succ ) {
- qDebug() << "Nemuzu otevrit zarizeni " <<
AppConfig::getInstance()->getSerialPortName().toLocal8Bit().constData() ;
+ //qDebug() << "Nemuzu otevrit zarizeni " <<
AppConfig::getInstance()->getSerialPortName().toLocal8Bit().constData() ;
quit = true;
return;
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/statisticsdata.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/statisticsdata.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/statisticsdata.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -20,7 +20,7 @@
ok = db.open();
if ( ! ok ) {
- qDebug() << "Fatal error: Unable to open database " <<
DATABASE_NAME << ":" << db.lastError().text();
+ //qDebug() << "Fatal error: Unable to open database " <<
DATABASE_NAME << ":" << db.lastError().text();
exit(1);
}
@@ -30,7 +30,7 @@
//make sure right table exists:
ok = query.exec(CREATE_TABLE_QUERY);
if ( ! ok ) {
- qDebug() << "Fatal error: Unable to create table " <<
TABLE_NAME << ":" << query.lastError().text();
+ //qDebug() << "Fatal error: Unable to create table " <<
TABLE_NAME << ":" << query.lastError().text();
exit(1);
}
@@ -40,8 +40,8 @@
ok = queryUpdate.exec();
if ( ! ok ) {
- qDebug() << "Query execution failed: " <<
queryUpdate.lastError();
- qDebug() << queryUpdate.executedQuery();
+ //qDebug() << "Query execution failed: " <<
queryUpdate.lastError();
+ //qDebug() << queryUpdate.executedQuery();
}
@@ -139,8 +139,8 @@
ok = query.exec();
if ( !ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
}
@@ -171,8 +171,8 @@
ok = query.exec();
if ( !ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.lastQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.lastQuery();
}
}
@@ -201,8 +201,8 @@
ok = query.exec();
if ( !ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
}
@@ -225,8 +225,8 @@
ok = query.exec();
if ( !ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
}
@@ -254,8 +254,8 @@
ok = query.exec();
if ( !ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
}
@@ -279,13 +279,13 @@
ok = query.exec();
if ( !ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
if ( ! query.first() ) { //empty query
- qDebug() << query.executedQuery();
- qDebug() << documentId << layoutId << layoutPosition <<
AppConfig::getInstance()->getCurrentModeString();
+ //qDebug() << query.executedQuery();
+ //qDebug() << documentId << layoutId << layoutPosition <<
AppConfig::getInstance()->getCurrentModeString();
query.prepare("INSERT INTO " TABLE_NAME " VALUES "
INSERT_BINDING);
query.bindValue(":elvys_id",
AppConfig::getInstance()->getMachineID());
query.bindValue(":layout_id", layoutId);
@@ -316,8 +316,8 @@
}
if ( !ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
}
@@ -335,8 +335,8 @@
ok = query.exec("SELECT * FROM " TABLE_NAME " WHERE ( action_end != 0
OR action_type =\"" EXHIBIT_EVENT "\" ) AND uploading = 0");
if ( ! ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
if ( query.next() == false ) {
@@ -371,14 +371,14 @@
ok = queryUpdate.exec();
if ( ! ok ) {
- qDebug() << "Query execution failed: " <<
queryUpdate.lastError();
- qDebug() << queryUpdate.executedQuery();
+ //qDebug() << "Query execution failed: " <<
queryUpdate.lastError();
+ //qDebug() << queryUpdate.executedQuery();
}
HttpAddress address = AppConfig::getInstance()->getStatisticsAddress();
QString userAgent = QString("Statistic") +
QString("%1").arg(AppConfig::getInstance()->getMachineID());
uploader->upload(httpId, address, *array, userAgent);
- qDebug() << array->data();
+ //qDebug() << array->data();
delete array;
delete xmlWriter;
}
@@ -396,8 +396,8 @@
ok = query.exec();
if ( ! ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
}
@@ -414,7 +414,7 @@
ok = query.exec();
if ( ! ok ) {
- qDebug() << "Query execution failed: " << query.lastError();
- qDebug() << query.executedQuery();
+ //qDebug() << "Query execution failed: " << query.lastError();
+ //qDebug() << query.executedQuery();
}
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/xmlabstractparser.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/xmlabstractparser.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/xmlabstractparser.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -62,7 +62,7 @@
emit readCompleted();
}
if ( !stopped && error() ) {
- qDebug() << "ERROR:" << errorString();
+ //qDebug() << "ERROR:" << errorString();
emit readFailed();
}
if ( /* ! error() && */ ! stopped ) { // Bug v Qt 4.3.2 [179320]
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/xmlappparser.cpp
===================================================================
--- branches/client/pdf-presentation-branch/elvys-client/src/xmlappparser.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++ branches/client/pdf-presentation-branch/elvys-client/src/xmlappparser.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -18,7 +18,7 @@
bool XMLAppParser::readXML() {
- qDebug() << "CTU APP XML" ;
+ //qDebug() << "CTU APP XML" ;
while (!atEnd()) {
readNext();
@@ -32,14 +32,14 @@
break;
}
} else {
- qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
- qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name();
- qDebug() << attributes().value("elvysVersion");
+ //qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
+ //qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name();
+ //qDebug() <<
attributes().value("elvysVersion");
raiseError(QString("Tenhle soubor neni
AppConfig XML pro Elvys v") + ELVYS_VERSION);
}
}
}
- qDebug() << Q_FUNC_INFO << "XML APP docten" ;
+ //qDebug() << Q_FUNC_INFO << "XML APP docten" ;
return !error();
}
@@ -53,7 +53,7 @@
readNext();
if (isEndElement()) {
- qDebug() << "endelement:" << name();
+ //qDebug() << "endelement:" << name();
break;
}
@@ -64,22 +64,22 @@
}
} else if (name() == "machine_id") {
if ( ! readMachineId() ) { //spatne rozliseni
- readNext();qDebug() << "Chyba pri
nacitani machine_id!" ;
+ readNext();//qDebug() << "Chyba pri
nacitani machine_id!" ;
return false;
}
} else if (name() == "data_url") {
if ( ! readDataUrl() ) {
- qDebug() << "Chyba pri nacitani
data_dir!" ;
+ //qDebug() << "Chyba pri nacitani
data_dir!" ;
return false;
}
} else if (name() == "screenshot") {
if ( ! readScreenshot() ) {
- qDebug() << "Chyba pri nacitani
elementu screenshot!" ;
+ //qDebug() << "Chyba pri nacitani
elementu screenshot!" ;
return false;
}
} else if (name() == "statistics") {
if ( ! readStatistics() ) {
- qDebug() << "Chyba pri nacitani
elementu screenshot!" ;
+ //qDebug() << "Chyba pri nacitani
elementu screenshot!" ;
return false;
}
} else if (name() == "category_config") {
@@ -100,7 +100,7 @@
}
} else if (name() == "night_mode") {
if ( ! readNightMode() ) {
- qDebug() << "Chyba pri nacitani
elementu night_mode!" ;
+ //qDebug() << "Chyba pri nacitani
elementu night_mode!" ;
return false;
}
} else if (name() == "background") {
@@ -108,7 +108,7 @@
skipElement();
//skipCurrentElement();
} else {
- qDebug() << Q_FUNC_INFO << "NOT IMPLEMENTED???
" << name();
+ //qDebug() << Q_FUNC_INFO << "NOT
IMPLEMENTED??? " << name();
return false;
}
}
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/xmlcatdocparser.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/xmlcatdocparser.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/xmlcatdocparser.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -5,7 +5,7 @@
bool XMLCatDocParser::readXML() {
- qDebug() << "Ctu Category Doc XML" ;
+ //qDebug() << "Ctu Category Doc XML" ;
while (!atEnd()) {
readNext();
if (isEndElement()) {
@@ -19,13 +19,13 @@
break;
}
} else {
- qDebug() << Q_FUNC_INFO << ":WTF, jinej XML
dokument " ;
- qDebug() << Q_FUNC_INFO << ":Jmeno hlavniho
elementu: " << name().toString().toLocal8Bit().constData() ;
+ //qDebug() << Q_FUNC_INFO << ":WTF, jinej XML
dokument " ;
+ //qDebug() << Q_FUNC_INFO << ":Jmeno hlavniho
elementu: " << name().toString().toLocal8Bit().constData() ;
raiseError(QString("Tenhle soubor neni
DocumentCatConfig XML pro Elvys v") + ELVYS_VERSION);
}
}
}
- qDebug() << Q_FUNC_INFO<< ":XML docten";
+ //qDebug() << Q_FUNC_INFO<< ":XML docten";
if (error()) {
qWarning() << Q_FUNC_INFO << errorString() <<
characterOffset();
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/xmlcatlayoutparser.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/xmlcatlayoutparser.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/xmlcatlayoutparser.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -5,7 +5,7 @@
bool XMLCatLayoutParser::readXML() {
- qDebug() << "Ctu Category Layout XML" ;
+ //qDebug() << "Ctu Category Layout XML" ;
while (!atEnd()) {
readNext();
if (isEndElement()) {
@@ -19,13 +19,13 @@
break;
}
} else {
- qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
- qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name().toString().toLocal8Bit().constData() ;
+ //qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
+ //qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name().toString().toLocal8Bit().constData() ;
raiseError(QString("Tenhle soubor neni
LayoutCatConfig XML pro Elvys v") + ELVYS_VERSION);
}
}
}
- qDebug() << Q_FUNC_INFO << "XML file docten";
+ //qDebug() << Q_FUNC_INFO << "XML file docten";
if (error()) {
qWarning() << errorString();
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/xmldocumentparser.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/xmldocumentparser.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/xmldocumentparser.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -22,7 +22,7 @@
while (!atEnd()) {
readNext();
if (isEndElement()) {
- qDebug() << Q_FUNC_INFO << "error? :END DOCUMENT:" <<
name().toString().toLocal8Bit().constData() ;
+ //qDebug() << Q_FUNC_INFO << "error? :END DOCUMENT:" <<
name().toString().toLocal8Bit().constData() ;
break;
}
if (isStartElement()) {
@@ -31,7 +31,7 @@
emit haveLayoutId(layoutId);
if ( ! stopped ) { // predchozi commit mohl
vyvolat stopnuti
if ( ! readDocument()) {
- qDebug() << Q_FUNC_INFO <<
":chyba cteni XML DOC!!!" ;
+ //qDebug() << Q_FUNC_INFO <<
":chyba cteni XML DOC!!!" ;
raiseError(QObject::tr("Doslo k
chybe..."));
break;
} else { // everything goes right, stop
reading explicitly
@@ -42,13 +42,13 @@
break;
}
} else {
- qDebug() << "WTF, jinej XML dokument " <<
name().toString();
+ //qDebug() << "WTF, jinej XML dokument " <<
name().toString();
QString err = "Tenhle soubor neni Document XML
pro Elvys v" + QString(ELVYS_VERSION);
raiseError(QObject::tr(err.toLocal8Bit()));
}
}
}
- qDebug() << "XML DOC docten" ;
+ //qDebug() << "XML DOC docten" ;
return !error();
}
@@ -83,7 +83,7 @@
emit noneDocument(toId);
readNext(); // prectu end element
} else {
- qDebug() << "XMLDocumentParser - NOT
IMPLEMENTED??? " << name().toString();
+ //qDebug() << "XMLDocumentParser - NOT
IMPLEMENTED??? " << name().toString();
return false;
}
}
@@ -100,7 +100,7 @@
bool autoStart = false;
toId = attributes().value("to_id").toString();
- qDebug() << "ID Video dokumentu je " << toId ;
+ //qDebug() << "ID Video dokumentu je " << toId ;
while (!atEnd()) {
readNext();
@@ -138,7 +138,7 @@
startAt = readElementText().toLongLong();
emit setStartAt(toId, startAt);
} else {
- qDebug() << Q_FUNC_INFO << "NOT IMPLEMENTED???"
<< name().toString();
+ //qDebug() << Q_FUNC_INFO << "NOT
IMPLEMENTED???" << name().toString();
return false;
}
}
@@ -153,7 +153,7 @@
Q_ASSERT(isStartElement() && name() == "pdf_doc");
toId = attributes().value("to_id").toString();
- qDebug() << "ID PDF dokumentu je " << toId ;
+ //qDebug() << "ID PDF dokumentu je " << toId ;
while (!atEnd()) {
readNext();
@@ -182,7 +182,7 @@
readElementText();
readNext(); // end element
} else {
- qDebug() << Q_FUNC_INFO << "NOT IMPLEMENTED???"
<< name().toString();
+ //qDebug() << Q_FUNC_INFO << "NOT
IMPLEMENTED???" << name().toString();
return false;
}
}
@@ -198,7 +198,7 @@
Q_ASSERT(isStartElement() && name() == "pdf_presentation");
toId = attributes().value("to_id").toString();
- qDebug() << "ID PDF presentation is " << toId ;
+ //qDebug() << "ID PDF presentation is " << toId ;
while (!atEnd()) {
readNext();
@@ -233,7 +233,7 @@
readElementText();
readNext(); // end element
} else {
- qDebug() << Q_FUNC_INFO << "NOT IMPLEMENTED???"
<< name().toString();
+ //qDebug() << Q_FUNC_INFO << "NOT
IMPLEMENTED???" << name().toString();
return false;
}
}
@@ -278,7 +278,7 @@
mainPage = readElementText().toInt();
readNext(); //end element
} else {
- qDebug() << "XMLDocumentParser - NOT
IMPLEMENTED - readpages ??? " << name().toString().toLocal8Bit().constData() ;
+ //qDebug() << "XMLDocumentParser - NOT
IMPLEMENTED - readpages ??? " << name().toString().toLocal8Bit().constData() ;
return false;
}
}
@@ -340,12 +340,12 @@
if (! attributes().value("bgcolor").isNull()) {
colorNameBg = attributes().value("bgcolor").toString();
}
- qDebug() << "ID Static textu je " << toId ;
+ //qDebug() << "ID Static textu je " << toId ;
text = readElementText();
readNext();
- qDebug() << "emiting loadstatictext" ;
+ //qDebug() << "emiting loadstatictext" ;
emit newStaticText(toId, text, fontName, size, colorName, colorNameBg);
return true;
}
@@ -379,7 +379,7 @@
if (! attributes().value("order").isNull()) {
order = attributes().value("order").toString();
}
- qDebug() << "ID Dynamic textu je " << toId ;
+ //qDebug() << "ID Dynamic textu je " << toId ;
text = readElementText();
readNext();
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/xmlfilecacheparser.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/xmlfilecacheparser.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/xmlfilecacheparser.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -9,7 +9,7 @@
}
bool XMLFileCacheParser::readXML() {
- qDebug() << "CTU APP XML" ;
+ //qDebug() << "CTU APP XML" ;
while (!atEnd()) {
readNext();
@@ -20,14 +20,14 @@
if (name() == "file-cache-config" &&
attributes().value("elvysVersion") == ELVYS_VERSION ) {
readFileCacheConfig();
} else {
- qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
- qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name();
- qDebug() << attributes().value("elvysVersion");
+ //qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
+ //qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name();
+ //qDebug() <<
attributes().value("elvysVersion");
raiseError(QString("Tenhle soubor neni
AppConfig XML pro Elvys v") + ELVYS_VERSION);
}
}
}
- qDebug() << Q_FUNC_INFO << "XML APP docten" ;
+ //qDebug() << Q_FUNC_INFO << "XML APP docten" ;
return !error();
}
@@ -47,7 +47,7 @@
if (name() == "file") {
readFile();
} else {
- qDebug() << Q_FUNC_INFO << "NOT IMPLEMENTED???
" << name();
+ //qDebug() << Q_FUNC_INFO << "NOT
IMPLEMENTED??? " << name();
QString errMsg = "Unexpected element: ";
errMsg.append(name());
raiseError(errMsg);
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/xmllayoutparser.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/xmllayoutparser.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/xmllayoutparser.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -40,7 +40,7 @@
emit haveIdRevision(id, revision);
if ( ! stopped ) { // somebody might stop me
based on same ID
if ( ! readLayout()) {
- qDebug() << "LayoutParser:
doslo k chybe..." ;
+ //qDebug() << "LayoutParser:
doslo k chybe..." ;
raiseError(QObject::tr("Blize
nespecifikovana chyba ;-)"));
break;
} else { // everything goes right, stop
reading explicitly
@@ -48,15 +48,15 @@
}
}
} else {
- qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
- qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name();
+ //qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
+ //qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name();
QString err = "Tenhle soubor neni Layout XML
pro Elvys v" + QString(ELVYS_VERSION);
raiseError(QObject::tr(err.toLocal8Bit()));
}
}
}
- qDebug() << Q_FUNC_INFO << "xml docteno";
+ //qDebug() << Q_FUNC_INFO << "xml docteno";
if ( !stopped && error() ) {
qWarning() << Q_FUNC_INFO << errorString();
@@ -72,20 +72,20 @@
readNext();
if (isEndElement()) {
- qDebug() << Q_FUNC_INFO << "end element: " << name();
+ //qDebug() << Q_FUNC_INFO << "end element: " << name();
break;
}
if (isStartElement()) {
if (name() == "aspect-ratio") {
if ( ! readAspectRatio() ) { //spatne rozliseni
- qDebug() << "WARNING Spatne rozliseni
layoutu, nesedi to na moje rozliseni!" ;
+ //qDebug() << "WARNING Spatne rozliseni
layoutu, nesedi to na moje rozliseni!" ;
//return false;
}
} else if (name() == "doc") {
readDocument();
} else {
- qDebug() << "XMLLayoutParser - NOT
IMPLEMENTED??? " << name().toString().toLocal8Bit().constData();
+ //qDebug() << "XMLLayoutParser - NOT
IMPLEMENTED??? " << name().toString().toLocal8Bit().constData();
return false;
}
}
@@ -95,7 +95,7 @@
bool XMLLayoutParser::readAspectRatio() {
bool returnValue;
- qDebug() << "App width: " <<
QString("%1").arg(AppConfig::getInstance()->getAppWidth()).toLocal8Bit().constData();
+ //qDebug() << "App width: " <<
QString("%1").arg(AppConfig::getInstance()->getAppWidth()).toLocal8Bit().constData();
Q_ASSERT(isStartElement() && name() == "aspect-ratio");
double aspectR = AppConfig::getInstance()->getAppWidth() /
(double)AppConfig::getInstance()->getAppHeight();
Modified:
branches/client/pdf-presentation-branch/elvys-client/src/xmlpaneldocparser.cpp
===================================================================
---
branches/client/pdf-presentation-branch/elvys-client/src/xmlpaneldocparser.cpp
2010-02-15 07:22:11 UTC (rev 1726)
+++
branches/client/pdf-presentation-branch/elvys-client/src/xmlpaneldocparser.cpp
2010-02-15 07:44:43 UTC (rev 1727)
@@ -5,7 +5,7 @@
bool XMLPanelDocParser::readXML() {
- qDebug() << "Ctu Panel Doc XML" ;
+ ////qDebug() << "Ctu Panel Doc XML" ;
while (!atEnd()) {
readNext();
@@ -22,13 +22,13 @@
break;
}
} else {
- qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
- qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name().toString().toLocal8Bit().constData() ;
+ ////qDebug() << Q_FUNC_INFO << "WTF, jinej XML
dokument " ;
+ ////qDebug() << Q_FUNC_INFO << "Jmeno hlavniho
elementu: " << name().toString().toLocal8Bit().constData() ;
raiseError(QString("Tenhle soubor neni
DocumentCatPanelConfig XML pro Elvys v") + ELVYS_VERSION);
}
}
}
- qDebug() << "XML Panel Doc docten";
+ ////qDebug() << "XML Panel Doc docten";
if (error()) {
qWarning() << Q_FUNC_INFO << errorString();
Other related posts:
- » [elvystrac] r1727 - All debug messages commented out - now rock stable. To be further investigated! - elvys
