comparison grapher.cpp @ 114:bb2d2eecdd60

* minor output fixes

 */
 
 #include "grapher.h"
 #include "connectionitem.h"
 #include "dateitem.h"
+#include "debug.h"
 
 #include <QGraphicsScene>
 
 #include <iostream>
 

     if (!m_items.contains(id)) {
         throw LayoutException(QString("Changeset %1 not in item map").arg(id));
     }
     Changeset *cs = m_changesets[id];
     ChangesetItem *item = m_items[id];
-    std::cerr << "layoutRow: Looking at " << id.toStdString() << std::endl;
+    DEBUG << "layoutRow: Looking at " << id.toStdString() << endl;
 
     int row = 0;
     int nparents = cs->parents().size();
 
     if (nparents > 0) {

 
     if (!m_rowDates.contains(row)) {
         m_rowDates[row] = date;
     }
 
-    std::cerr << "putting " << cs->id().toStdString() << " at row " << row 
-            << std::endl;
+    DEBUG << "putting " << cs->id().toStdString() << " at row " << row 
+          << endl;
 
     item->setRow(row);
     m_handled.insert(id);
 }
 
 void Grapher::layoutCol(QString id)
 {
     if (m_handled.contains(id)) {
-        std::cerr << "Already looked at " << id.toStdString() << std::endl;
+        DEBUG << "Already looked at " << id.toStdString() << endl;
         return;
     }
     if (!m_changesets.contains(id)) {
         throw LayoutException(QString("Changeset %1 not in ID map").arg(id));
     }
     if (!m_items.contains(id)) {
         throw LayoutException(QString("Changeset %1 not in item map").arg(id));
     }
 
     Changeset *cs = m_changesets[id];
-//    std::cerr << "layoutCol: Looking at " << id.toStdString() << std::endl;
+//    DEBUG << "layoutCol: Looking at " << id.toStdString() << endl;
 
     ChangesetItem *item = m_items[id];
 
     int col = 0;
     int row = item->row();

             col = findAvailableColumn(item->row(), col, false);
         }
         break;
     }
 
-//    std::cerr << "putting " << cs->id().toStdString() << " at col " << col << std::endl;
+//    DEBUG << "putting " << cs->id().toStdString() << " at col " << col << endl;
 
     m_alloc[row].insert(col);
     item->setColumn(col);
     m_handled.insert(id);
 

         }
         m_branchHomes[branch] = home;
     }
 
     foreach (QString branch, m_branchRanges.keys()) {
-        std::cerr << branch.toStdString() << ": " << m_branchRanges[branch].first << " - " << m_branchRanges[branch].second << ", home " << m_branchHomes[branch] << std::endl;
+        DEBUG << branch.toStdString() << ": " << m_branchRanges[branch].first << " - " << m_branchRanges[branch].second << ", home " << m_branchHomes[branch] << endl;
     }
 }
 
 static bool
         compareChangesetsByDate(Changeset *const &a, Changeset *const &b)

     if (csets.empty()) return;
 
     foreach (Changeset *cs, csets) {
 
         QString id = cs->id();
-        std::cerr << id.toStdString() << std::endl;
+        DEBUG << id.toStdString() << endl;
 
         if (id == "") {
             throw LayoutException("Changeset has no ID");
         }
         if (m_changesets.contains(id)) {

     // above
 
     qStableSort(csets.begin(), csets.end(), compareChangesetsByDate);
 
     foreach (Changeset *cs, csets) {
-        std::cerr << "id " << cs->id().toStdString() << ", ts " << cs->timestamp() << ", date " << cs->datetime().toStdString() << std::endl;
+        DEBUG << "id " << cs->id().toStdString() << ", ts " << cs->timestamp() << ", date " << cs->datetime().toStdString() << endl;
     }
 
     m_handled.clear();
     foreach (Changeset *cs, csets) {
         layoutRow(cs->id());