comparison grapher.h @ 145:644bd31e8301

* Include the uncommitted item in general graph layout (in case it is not at the head, when other items will need to avoid it)

 #ifndef GRAPHER_H
 #define GRAPHER_H
 
 #include "changeset.h"
 #include "changesetitem.h"
+#include "uncommitteditem.h"
 #include "changesetscene.h"
 
 #include <QSet>
 #include <QMap>
 #include <QPair>

 class Grapher
 {
 public:
     Grapher(ChangesetScene *scene) { m_scene = scene; }
 
-    void layout(Changesets csets);
+    void layout(Changesets csets, QString uncommittedSproutsFrom = "");
 
     ChangesetItem *getItemFor(Changeset *cs);
+
+    UncommittedItem *getUncommittedItem() { return m_uncommitted; }
 
     class LayoutException : public std::exception {
     public:
 	LayoutException(QString message) throw() : m_message(message) { }
 	virtual ~LayoutException() throw() { }

     IdSet m_handled;
 
     typedef QMap<int, QString> RowDateMap;
     RowDateMap m_rowDates;
 
+    QString m_uncommittedParentId;
+    int m_uncommittedParentRow;
+    UncommittedItem *m_uncommitted;
+    bool m_haveAllocatedUncommittedColumn;
+
     void layoutRow(QString id);
     void layoutCol(QString id);
     void allocateBranchHomes(Changesets csets);
     bool rangesConflict(const Range &r1, const Range &r2);
     int findAvailableColumn(int row, int parent, bool preferParentCol);
+    bool isAvailable(int row, int col);
 };
 
 #endif