annotate historywidget.cpp @ 133:aaeab914f2a3

* Better attempt at retaining current visible area when history scene changes; first cut at highlighting new items
author Chris Cannam
date Tue, 30 Nov 2010 12:45:34 +0000
parents 4986642800f0
children 1208d9688a8f
rev   line source
Chris@116 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@116 2
Chris@116 3 /*
Chris@116 4 EasyMercurial
Chris@116 5
Chris@116 6 Based on HgExplorer by Jari Korhonen
Chris@116 7 Copyright (c) 2010 Jari Korhonen
Chris@116 8 Copyright (c) 2010 Chris Cannam
Chris@116 9 Copyright (c) 2010 Queen Mary, University of London
Chris@116 10
Chris@116 11 This program is free software; you can redistribute it and/or
Chris@116 12 modify it under the terms of the GNU General Public License as
Chris@116 13 published by the Free Software Foundation; either version 2 of the
Chris@116 14 License, or (at your option) any later version. See the file
Chris@116 15 COPYING included with this distribution for more information.
Chris@116 16 */
Chris@116 17
Chris@116 18 #include "historywidget.h"
Chris@116 19
Chris@119 20 #include "changesetscene.h"
Chris@116 21 #include "panned.h"
Chris@116 22 #include "panner.h"
Chris@116 23 #include "grapher.h"
Chris@116 24 #include "debug.h"
Chris@129 25 #include "uncommitteditem.h"
Chris@116 26
Chris@116 27 #include <iostream>
Chris@116 28
Chris@116 29 #include <QGridLayout>
Chris@116 30
Chris@116 31 HistoryWidget::HistoryWidget()
Chris@116 32 {
Chris@116 33 m_panned = new Panned;
Chris@116 34 m_panner = new Panner;
Chris@129 35 m_uncommitted = new UncommittedItem();
Chris@129 36 m_uncommitted->setRow(-1);
Chris@116 37
Chris@116 38 QGridLayout *layout = new QGridLayout;
Chris@116 39 layout->addWidget(m_panned, 0, 0);
Chris@116 40 layout->addWidget(m_panner, 0, 1);
Chris@116 41 m_panner->setMaximumWidth(80);
Chris@116 42 m_panner->connectToPanned(m_panned);
Chris@116 43
Chris@116 44 setLayout(layout);
Chris@116 45 }
Chris@116 46
Chris@116 47 HistoryWidget::~HistoryWidget()
Chris@116 48 {
Chris@116 49 clearChangesets();
Chris@129 50 delete m_uncommitted;
Chris@116 51 }
Chris@116 52
Chris@116 53 void HistoryWidget::clearChangesets()
Chris@116 54 {
Chris@116 55 foreach (Changeset *cs, m_changesets) delete cs;
Chris@116 56 m_changesets.clear();
Chris@116 57 }
Chris@128 58
Chris@128 59 void HistoryWidget::setCurrent(QStringList ids)
Chris@128 60 {
Chris@128 61 if (m_currentIds == ids) return;
Chris@128 62 DEBUG << "HistoryWidget::setCurrent: " << ids.size() << " ids" << endl;
Chris@133 63 m_currentIds.clear();
Chris@133 64 foreach (QString id, ids) {
Chris@133 65 m_currentIds.push_back(id);
Chris@133 66 }
Chris@133 67 updateNewAndCurrentItems();
Chris@128 68 }
Chris@128 69
Chris@128 70 void HistoryWidget::showUncommittedChanges(bool show)
Chris@128 71 {
Chris@129 72 QGraphicsScene *scene = m_panned->scene();
Chris@129 73 if (!scene) return;
Chris@129 74
Chris@129 75 if (show) {
Chris@129 76 if (m_uncommitted->scene() == scene) return;
Chris@129 77 scene->addItem(m_uncommitted);
Chris@129 78 m_uncommitted->ensureVisible();
Chris@129 79 } else {
Chris@129 80 if (m_uncommitted->scene() != scene) return;
Chris@129 81 scene->removeItem(m_uncommitted);
Chris@129 82 }
Chris@128 83 }
Chris@116 84
Chris@120 85 void HistoryWidget::parseNewLog(QString log)
Chris@120 86 {
Chris@120 87 DEBUG << "HistoryWidget::parseNewLog: log has " << log.length() << " chars" << endl;
Chris@122 88 Changesets csets = Changeset::parseChangesets(log);
Chris@120 89 DEBUG << "HistoryWidget::parseNewLog: log has " << csets.size() << " changesets" << endl;
Chris@133 90 replaceChangesets(csets);
Chris@120 91 layoutAll();
Chris@120 92 }
Chris@120 93
Chris@120 94 void HistoryWidget::parseIncrementalLog(QString log)
Chris@120 95 {
Chris@120 96 DEBUG << "HistoryWidget::parseIncrementalLog: log has " << log.length() << " chars" << endl;
Chris@122 97 Changesets csets = Changeset::parseChangesets(log);
Chris@120 98 DEBUG << "HistoryWidget::parseIncrementalLog: log has " << csets.size() << " changesets" << endl;
Chris@120 99 if (!csets.empty()) {
Chris@133 100 addChangesets(csets);
Chris@120 101 layoutAll();
Chris@120 102 }
Chris@120 103 }
Chris@120 104
Chris@133 105 void HistoryWidget::replaceChangesets(Changesets csets)
Chris@133 106 {
Chris@133 107 QSet<QString> oldIds;
Chris@133 108 foreach (Changeset *cs, m_changesets) {
Chris@133 109 oldIds.insert(cs->id());
Chris@133 110 }
Chris@133 111
Chris@133 112 QSet<QString> newIds;
Chris@133 113 foreach (Changeset *cs, csets) {
Chris@133 114 if (!oldIds.contains(cs->id())) {
Chris@133 115 newIds.insert(cs->id());
Chris@133 116 }
Chris@133 117 }
Chris@133 118
Chris@133 119 if (newIds.size() == csets.size()) {
Chris@133 120 // completely new set, unrelated to the old: don't mark new
Chris@133 121 m_newIds.clear();
Chris@133 122 } else {
Chris@133 123 m_newIds = newIds;
Chris@133 124 }
Chris@133 125
Chris@133 126 clearChangesets();
Chris@133 127 m_changesets = csets;
Chris@133 128 }
Chris@133 129
Chris@133 130 void HistoryWidget::addChangesets(Changesets csets)
Chris@133 131 {
Chris@133 132 m_newIds.clear();
Chris@133 133 foreach (Changeset *cs, csets) {
Chris@133 134 m_newIds.insert(cs->id());
Chris@133 135 }
Chris@133 136
Chris@133 137 csets << m_changesets;
Chris@133 138 m_changesets = csets;
Chris@133 139 }
Chris@133 140
Chris@120 141 void HistoryWidget::layoutAll()
Chris@116 142 {
Chris@122 143 setChangesetParents();
Chris@129 144 showUncommittedChanges(false); // detach the item from our scene
Chris@122 145
Chris@119 146 ChangesetScene *scene = new ChangesetScene();
Chris@116 147 ChangesetItem *tipItem = 0;
Chris@116 148
Chris@120 149 if (!m_changesets.empty()) {
Chris@116 150 Grapher g(scene);
Chris@116 151 try {
Chris@120 152 g.layout(m_changesets);
Chris@116 153 } catch (std::string s) {
Chris@116 154 std::cerr << "Internal error: Layout failed: " << s << std::endl;
Chris@116 155 }
Chris@120 156 tipItem = g.getItemFor(m_changesets[0]);
Chris@120 157 DEBUG << "tipItem is " << tipItem << " for tip changeset "
Chris@120 158 << m_changesets[0]->id() << endl;
Chris@116 159 }
Chris@116 160
Chris@116 161 QGraphicsScene *oldScene = m_panned->scene();
Chris@116 162 m_panned->setScene(scene);
Chris@116 163 m_panner->setScene(scene);
Chris@116 164
Chris@116 165 if (oldScene) delete oldScene;
Chris@116 166 if (tipItem) tipItem->ensureVisible();
Chris@128 167
Chris@133 168 updateNewAndCurrentItems();
Chris@116 169 }
Chris@116 170
Chris@122 171 void HistoryWidget::setChangesetParents()
Chris@116 172 {
Chris@122 173 for (int i = 0; i+1 < m_changesets.size(); ++i) {
Chris@122 174 Changeset *cs = m_changesets[i];
Chris@123 175 // Need to reset this, as Grapher::layout will recalculate it
Chris@123 176 // and we don't want to end up with twice the children for
Chris@123 177 // each parent...
Chris@123 178 cs->setChildren(QStringList());
Chris@116 179 if (cs->parents().empty()) {
Chris@116 180 QStringList list;
Chris@122 181 list.push_back(m_changesets[i+1]->id());
Chris@116 182 cs->setParents(list);
Chris@116 183 }
Chris@116 184 }
Chris@116 185 }
Chris@128 186
Chris@133 187 void HistoryWidget::updateNewAndCurrentItems()
Chris@128 188 {
Chris@128 189 QGraphicsScene *scene = m_panned->scene();
Chris@128 190 if (!scene) return;
Chris@133 191
Chris@128 192 QList<QGraphicsItem *> items = scene->items();
Chris@128 193 foreach (QGraphicsItem *it, items) {
Chris@133 194
Chris@128 195 ChangesetItem *csit = dynamic_cast<ChangesetItem *>(it);
Chris@133 196 if (!csit) continue;
Chris@133 197
Chris@133 198 QString id = csit->getChangeset()->id();
Chris@133 199
Chris@133 200 bool current = m_currentIds.contains(id);
Chris@133 201 if (current) {
Chris@133 202 DEBUG << "id " << id << " is current" << endl;
Chris@133 203 }
Chris@133 204 bool newid = m_newIds.contains(id);
Chris@133 205 if (newid) {
Chris@133 206 DEBUG << "id " << id << " is new" << endl;
Chris@133 207 }
Chris@133 208
Chris@133 209 csit->setCurrent(current);
Chris@133 210 csit->setNew(newid);
Chris@133 211
Chris@133 212 if (current) {
Chris@129 213 m_uncommitted->setRow(csit->row() - 1);
Chris@129 214 m_uncommitted->setColumn(csit->column());
Chris@129 215 m_uncommitted->setWide(csit->isWide());
Chris@129 216 m_uncommitted->setBranch(csit->getChangeset()->branch());
Chris@128 217 }
Chris@128 218 }
Chris@128 219 }