History

logging groups for library/shared and interface

Seth Alves committed 11 years ago

Commit fb607e21 parent cd5245d30 files · +255 −172Browse files

Showing the changes to interface/src/ModelPackager.cpp (1 of 30 files). Show all

Unified · Split

interface/src/ModelPackager.cpp+6−5
@@ -18,6 +18,7 @@ · 17 unmodified lines
18 18
19#include "ModelSelector.h"19#include "ModelSelector.h"
20#include "ModelPropertiesDialog.h"20#include "ModelPropertiesDialog.h"
21#include "InterfaceLogging.h"
21 22
22#include "ModelPackager.h"23#include "ModelPackager.h"
23 24
@@ -84,7 +85,7 @@ bool ModelPackager::loadModel() { · 60 unmodified lines
84 qWarning() << QString("ModelPackager::loadModel(): Could not open FST file %1").arg(_modelFile.filePath());85 qWarning() << QString("ModelPackager::loadModel(): Could not open FST file %1").arg(_modelFile.filePath());
85 return false;86 return false;
86 }87 }
87 qDebug() << "Reading FST file : " << _modelFile.filePath();88 qCDebug(interface) << "Reading FST file : " << _modelFile.filePath();
88 _mapping = FSTReader::readMapping(fst.readAll());89 _mapping = FSTReader::readMapping(fst.readAll());
89 fst.close();90 fst.close();
90 91
@@ -103,7 +104,7 @@ bool ModelPackager::loadModel() { · 12 unmodified lines
103 qWarning() << QString("ModelPackager::loadModel(): Could not open FBX file %1").arg(_fbxInfo.filePath());104 qWarning() << QString("ModelPackager::loadModel(): Could not open FBX file %1").arg(_fbxInfo.filePath());
104 return false;105 return false;
105 }106 }
106 qDebug() << "Reading FBX file : " << _fbxInfo.filePath();107 qCDebug(interface) << "Reading FBX file : " << _fbxInfo.filePath();
107 QByteArray fbxContents = fbx.readAll();108 QByteArray fbxContents = fbx.readAll();
108 _geometry = readFBX(fbxContents, QVariantHash());109 _geometry = readFBX(fbxContents, QVariantHash());
109 110
@@ -188,7 +189,7 @@ bool ModelPackager::zipModel() { · 78 unmodified lines
188 fst.write(FSTReader::writeMapping(_mapping));189 fst.write(FSTReader::writeMapping(_mapping));
189 fst.close();190 fst.close();
190 } else {191 } else {
191 qDebug() << "Couldn't write FST file" << fst.fileName();192 qCDebug(interface) << "Couldn't write FST file" << fst.fileName();
192 return false;193 return false;
193 }194 }
194 195
@@ -196,7 +197,7 @@ bool ModelPackager::zipModel() { · 1 unmodified line
196 QString saveDirPath = QFileDialog::getExistingDirectory(nullptr, "Save Model",197 QString saveDirPath = QFileDialog::getExistingDirectory(nullptr, "Save Model",
197 "", QFileDialog::ShowDirsOnly);198 "", QFileDialog::ShowDirsOnly);
198 if (saveDirPath.isEmpty()) {199 if (saveDirPath.isEmpty()) {
199 qDebug() << "Invalid directory" << saveDirPath;200 qCDebug(interface) << "Invalid directory" << saveDirPath;
200 return false;201 return false;
201 }202 }
202 203
@@ -404,7 +405,7 @@ bool ModelPackager::copyTextures(const QString& oldDir, const QDir& newDir) { · 201 unmodified lines
404 if (!errors.isEmpty()) {405 if (!errors.isEmpty()) {
405 QMessageBox::warning(nullptr, "ModelPackager::copyTextures()",406 QMessageBox::warning(nullptr, "ModelPackager::copyTextures()",
406 "Missing textures:" + errors);407 "Missing textures:" + errors);
407 qDebug() << "ModelPackager::copyTextures():" << errors;408 qCDebug(interface) << "ModelPackager::copyTextures():" << errors;
408 return false;409 return false;
409 }410 }
410 411