added load error log

apps/opencs/model/doc/loader.cpp

@@ -3,7 +3,10 @@
 
 #include <QTimer>
 
+#include "../tools/reportmodel.hpp"
+
 #include "document.hpp"
+#include "state.hpp"
 
 CSMDoc::Loader::Stage::Stage() : mFile (0), mRecordsLeft (false) {}
 
@@ -48,13 +51,20 @@ void CSMDoc::Loader::load()
     {
         if (iter->second.mRecordsLeft)
         {
+            CSMDoc::Stage::Messages messages;
             for (int i=0; i<batchingSize; ++i) // do not flood the system with update signals
-                if (document->getData().continueLoading())
+                if (document->getData().continueLoading (messages))
                 {
                     iter->second.mRecordsLeft = false;
                     break;
                 }
 
+            CSMWorld::UniversalId log (CSMWorld::UniversalId::Type_LoadErrorLog, 0);
+
+            for (CSMDoc::Stage::Messages::const_iterator iter (messages.begin());
+                iter!=messages.end(); ++iter)
+                document->getReport (log)->add (iter->first, iter->second);
+
             emit nextRecord (document);
 
             return;

apps/opencs/model/doc/state.hpp

@@ -3,17 +3,18 @@
 
 namespace CSMDoc
 {
-        enum State
+    enum State
-        {
+    {
-                State_Modified = 1,
+        State_Modified = 1,
-                State_Locked = 2,
+        State_Locked = 2,
-                State_Operation = 4,
+        State_Operation = 4,
 
-                State_Saving = 8,
+        State_Saving = 8,
-                State_Verifying = 16,
+        State_Verifying = 16,
-                State_Compiling = 32, // not implemented yet
+        State_Compiling = 32, // not implemented yet
-                State_Searching = 64 // not implemented yet
+        State_Searching = 64, // not implemented yet
-        };
+        State_Loading = 128   // pseudo-state; can not be encountered in a loaded document
+    };
 }
 
 #endif

apps/opencs/model/tools/tools.cpp

@@ -88,6 +88,9 @@ CSMDoc::Operation *CSMTools::Tools::getVerifier()
 
 CSMTools::Tools::Tools (CSMWorld::Data& data) : mData (data), mVerifier (0), mNextReportNumber (0)
 {
+    // index 0: load error log
+    mReports.insert (std::make_pair (mNextReportNumber++, new ReportModel));
+    mActiveReports.insert (std::make_pair (CSMDoc::State_Loading, 0));
 }
 
 CSMTools::Tools::~Tools()
@@ -134,7 +137,8 @@ int CSMTools::Tools::getRunningOperations() const
 
 CSMTools::ReportModel *CSMTools::Tools::getReport (const CSMWorld::UniversalId& id)
 {
-    if (id.getType()!=CSMWorld::UniversalId::Type_VerificationResults)
+    if (id.getType()!=CSMWorld::UniversalId::Type_VerificationResults &&
+        id.getType()!=CSMWorld::UniversalId::Type_LoadErrorLog)
         throw std::logic_error ("invalid request for report model: " + id.toString());
 
     return mReports.at (id.getIndex());

apps/opencs/model/world/data.cpp

@@ -505,7 +505,7 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
     return mReader->getRecordCount();
 }
 
-bool CSMWorld::Data::continueLoading()
+bool CSMWorld::Data::continueLoading (CSMDoc::Stage::Messages& messages)
 {
     if (!mReader)
         throw std::logic_error ("can't continue loading, because no load has been started");

apps/opencs/model/world/data.hpp

@@ -24,6 +24,8 @@
 
 #include "../filter/filter.hpp"
 
+#include "../doc/stage.hpp"
+
 #include "idcollection.hpp"
 #include "universalid.hpp"
 #include "cell.hpp"
@@ -185,7 +187,7 @@ namespace CSMWorld
             ///
             ///< \return estimated number of records
 
-            bool continueLoading();
+            bool continueLoading (CSMDoc::Stage::Messages& messages);
             ///< \return Finished?
 
             bool hasId (const std::string& id) const;

apps/opencs/model/world/universalid.cpp

@@ -101,6 +101,7 @@ namespace
     static const TypeData sIndexArg[] =
     {
         { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults, "Verification Results", 0 },
+        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_LoadErrorLog, "Load Error Log", 0 },
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
     };
 }

apps/opencs/model/world/universalid.hpp

@@ -97,10 +97,11 @@ namespace CSMWorld
                 Type_JournalInfos,
                 Type_JournalInfo,
                 Type_Scene,
-                Type_Preview
+                Type_Preview,
+                Type_LoadErrorLog
             };
 
-            enum { NumberOfTypes = Type_Scene+1 };
+            enum { NumberOfTypes = Type_LoadErrorLog+1 };
 
         private:
 

apps/opencs/view/doc/view.cpp

@@ -10,9 +10,12 @@
 #include <QtGui/QApplication>
 
 #include "../../model/doc/document.hpp"
-#include "../world/subviews.hpp"
-#include "../tools/subviews.hpp"
 #include "../../model/settings/usersettings.hpp"
+
+#include "../world/subviews.hpp"
+
+#include "../tools/subviews.hpp"
+
 #include "viewmanager.hpp"
 #include "operations.hpp"
 #include "subview.hpp"
@@ -47,6 +50,10 @@ void CSVDoc::View::setupFileMenu()
     connect (mVerify, SIGNAL (triggered()), this, SLOT (verify()));
     file->addAction (mVerify);
 
+    QAction *loadErrors = new QAction (tr ("Load Error Log"), this);
+    connect (loadErrors, SIGNAL (triggered()), this, SLOT (loadErrorLog()));
+    file->addAction (loadErrors);
+
     QAction *close = new QAction (tr ("&Close"), this);
     connect (close, SIGNAL (triggered()), this, SLOT (close()));
     file->addAction(close);
@@ -502,3 +509,8 @@ void CSVDoc::View::toggleShowStatusBar (bool show)
             subView->setStatusBar (show);
     }
 }
+
+void CSVDoc::View::loadErrorLog()
+{
+    addSubView (CSMWorld::UniversalId (CSMWorld::UniversalId::Type_LoadErrorLog, 0));
+}

apps/opencs/view/doc/view.hpp

@@ -179,6 +179,8 @@ namespace CSVDoc
             void addJournalInfosSubView();
 
             void toggleShowStatusBar (bool show);
+
+            void loadErrorLog();
     };
 }
 

apps/opencs/view/tools/subviews.cpp

@@ -9,4 +9,6 @@ void CSVTools::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
 {
     manager.add (CSMWorld::UniversalId::Type_VerificationResults,
         new CSVDoc::SubViewFactory<ReportSubView>);
+    manager.add (CSMWorld::UniversalId::Type_LoadErrorLog,
+        new CSVDoc::SubViewFactory<ReportSubView>);
 }