annotate historywidget.cpp @ 139:e8a481789607

* Avoid unnecessary duplicate layout; fix off-by-one in resetting changeset children
author Chris Cannam
date Tue, 30 Nov 2010 14:27:34 +0000
parents a7dbc8e5b69d
children e6c6b88d19b9
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@134 37 m_uncommittedVisible = false;
Chris@116 38
Chris@116 39 QGridLayout *layout = new QGridLayout;
Chris@116 40 layout->addWidget(m_panned, 0, 0);
Chris@116 41 layout->addWidget(m_panner, 0, 1);
Chris@116 42 m_panner->setMaximumWidth(80);
Chris@116 43 m_panner->connectToPanned(m_panned);
Chris@116 44
Chris@116 45 setLayout(layout);
Chris@116 46 }
Chris@116 47
Chris@116 48 HistoryWidget::~HistoryWidget()
Chris@116 49 {
Chris@116 50 clearChangesets();
Chris@134 51 if (!m_uncommittedVisible) delete m_uncommitted;
Chris@116 52 }
Chris@116 53
Chris@116 54 void HistoryWidget::clearChangesets()
Chris@116 55 {
Chris@116 56 foreach (Changeset *cs, m_changesets) delete cs;
Chris@116 57 m_changesets.clear();
Chris@116 58 }
Chris@128 59
Chris@128 60 void HistoryWidget::setCurrent(QStringList ids)
Chris@128 61 {
Chris@128 62 if (m_currentIds == ids) return;
Chris@128 63 DEBUG << "HistoryWidget::setCurrent: " << ids.size() << " ids" << endl;
Chris@133 64 m_currentIds.clear();
Chris@133 65 foreach (QString id, ids) {
Chris@133 66 m_currentIds.push_back(id);
Chris@133 67 }
Chris@133 68 updateNewAndCurrentItems();
Chris@128 69 }
Chris@128 70
Chris@128 71 void HistoryWidget::showUncommittedChanges(bool show)
Chris@128 72 {
Chris@139 73 if (m_uncommittedVisible == show) return;
Chris@134 74 m_uncommittedVisible = show;
Chris@139 75 QGraphicsScene *scene = m_panned->scene();
Chris@139 76 if (!scene) return;
Chris@139 77 if (m_uncommittedVisible) {
Chris@139 78 scene->addItem(m_uncommitted);
Chris@139 79 } else {
Chris@139 80 scene->removeItem(m_uncommitted);
Chris@139 81 }
Chris@128 82 }
Chris@116 83
Chris@120 84 void HistoryWidget::parseNewLog(QString log)
Chris@120 85 {
Chris@120 86 DEBUG << "HistoryWidget::parseNewLog: log has " << log.length() << " chars" << endl;
Chris@122 87 Changesets csets = Changeset::parseChangesets(log);
Chris@120 88 DEBUG << "HistoryWidget::parseNewLog: log has " << csets.size() << " changesets" << endl;
Chris@133 89 replaceChangesets(csets);
Chris@120 90 layoutAll();
Chris@120 91 }
Chris@120 92
Chris@120 93 void HistoryWidget::parseIncrementalLog(QString log)
Chris@120 94 {
Chris@120 95 DEBUG << "HistoryWidget::parseIncrementalLog: log has " << log.length() << " chars" << endl;
Chris@122 96 Changesets csets = Changeset::parseChangesets(log);
Chris@120 97 DEBUG << "HistoryWidget::parseIncrementalLog: log has " << csets.size() << " changesets" << endl;
Chris@120 98 if (!csets.empty()) {
Chris@133 99 addChangesets(csets);
Chris@120 100 layoutAll();
Chris@120 101 }
Chris@120 102 }
Chris@120 103
Chris@133 104 void HistoryWidget::replaceChangesets(Changesets csets)
Chris@133 105 {
Chris@133 106 QSet<QString> oldIds;
Chris@133 107 foreach (Changeset *cs, m_changesets) {
Chris@133 108 oldIds.insert(cs->id());
Chris@133 109 }
Chris@133 110
Chris@133 111 QSet<QString> newIds;
Chris@133 112 foreach (Changeset *cs, csets) {
Chris@133 113 if (!oldIds.contains(cs->id())) {
Chris@133 114 newIds.insert(cs->id());
Chris@133 115 }
Chris@133 116 }
Chris@133 117
Chris@133 118 if (newIds.size() == csets.size()) {
Chris@133 119 // completely new set, unrelated to the old: don't mark new
Chris@133 120 m_newIds.clear();
Chris@133 121 } else {
Chris@133 122 m_newIds = newIds;
Chris@133 123 }
Chris@133 124
Chris@133 125 clearChangesets();
Chris@133 126 m_changesets = csets;
Chris@133 127 }
Chris@133 128
Chris@133 129 void HistoryWidget::addChangesets(Changesets csets)
Chris@133 130 {
Chris@133 131 m_newIds.clear();
Chris@138 132
Chris@138 133 if (csets.empty()) return;
Chris@138 134
Chris@133 135 foreach (Changeset *cs, csets) {
Chris@133 136 m_newIds.insert(cs->id());
Chris@133 137 }
Chris@133 138
Chris@138 139 DEBUG << "addChangesets: " << csets.size() << " new changesets" << endl;
Chris@138 140
Chris@133 141 csets << m_changesets;
Chris@133 142 m_changesets = csets;
Chris@133 143 }
Chris@133 144
Chris@120 145 void HistoryWidget::layoutAll()
Chris@116 146 {
Chris@122 147 setChangesetParents();
Chris@122 148
Chris@119 149 ChangesetScene *scene = new ChangesetScene();
Chris@116 150 ChangesetItem *tipItem = 0;
Chris@116 151
Chris@138 152 QGraphicsScene *oldScene = m_panned->scene();
Chris@138 153
Chris@138 154 // detach m_uncommitted from old scene so it doesn't get deleted
Chris@138 155 if (oldScene && (m_uncommitted->scene() == oldScene)) {
Chris@138 156 oldScene->removeItem(m_uncommitted);
Chris@138 157 }
Chris@138 158
Chris@138 159 m_panned->setScene(0);
Chris@138 160 m_panner->setScene(0);
Chris@138 161
Chris@138 162 delete oldScene;
Chris@138 163
Chris@120 164 if (!m_changesets.empty()) {
Chris@116 165 Grapher g(scene);
Chris@116 166 try {
Chris@120 167 g.layout(m_changesets);
Chris@116 168 } catch (std::string s) {
Chris@116 169 std::cerr << "Internal error: Layout failed: " << s << std::endl;
Chris@116 170 }
Chris@120 171 tipItem = g.getItemFor(m_changesets[0]);
Chris@120 172 DEBUG << "tipItem is " << tipItem << " for tip changeset "
Chris@120 173 << m_changesets[0]->id() << endl;
Chris@116 174 }
Chris@116 175
Chris@134 176 if (m_uncommittedVisible) {
Chris@134 177 scene->addItem(m_uncommitted);
Chris@134 178 }
Chris@134 179
Chris@116 180 m_panned->setScene(scene);
Chris@116 181 m_panner->setScene(scene);
Chris@116 182
Chris@133 183 updateNewAndCurrentItems();
Chris@134 184
Chris@134 185 if (m_uncommittedVisible) {
Chris@134 186 m_uncommitted->ensureVisible();
Chris@134 187 } else if (tipItem) {
Chris@134 188 DEBUG << "asking tip item to be visible" << endl;
Chris@134 189 tipItem->ensureVisible();
Chris@134 190 }
Chris@116 191 }
Chris@116 192
Chris@122 193 void HistoryWidget::setChangesetParents()
Chris@116 194 {
Chris@139 195 for (int i = 0; i < m_changesets.size(); ++i) {
Chris@122 196 Changeset *cs = m_changesets[i];
Chris@123 197 // Need to reset this, as Grapher::layout will recalculate it
Chris@123 198 // and we don't want to end up with twice the children for
Chris@123 199 // each parent...
Chris@123 200 cs->setChildren(QStringList());
Chris@139 201 }
Chris@139 202 for (int i = 0; i+1 < m_changesets.size(); ++i) {
Chris@139 203 Changeset *cs = m_changesets[i];
Chris@116 204 if (cs->parents().empty()) {
Chris@116 205 QStringList list;
Chris@122 206 list.push_back(m_changesets[i+1]->id());
Chris@116 207 cs->setParents(list);
Chris@116 208 }
Chris@116 209 }
Chris@116 210 }
Chris@128 211
Chris@133 212 void HistoryWidget::updateNewAndCurrentItems()
Chris@128 213 {
Chris@128 214 QGraphicsScene *scene = m_panned->scene();
Chris@128 215 if (!scene) return;
Chris@133 216
Chris@128 217 QList<QGraphicsItem *> items = scene->items();
Chris@128 218 foreach (QGraphicsItem *it, items) {
Chris@133 219
Chris@128 220 ChangesetItem *csit = dynamic_cast<ChangesetItem *>(it);
Chris@133 221 if (!csit) continue;
Chris@133 222
Chris@133 223 QString id = csit->getChangeset()->id();
Chris@133 224
Chris@133 225 bool current = m_currentIds.contains(id);
Chris@133 226 if (current) {
Chris@133 227 DEBUG << "id " << id << " is current" << endl;
Chris@133 228 }
Chris@133 229 bool newid = m_newIds.contains(id);
Chris@133 230 if (newid) {
Chris@133 231 DEBUG << "id " << id << " is new" << endl;
Chris@133 232 }
Chris@133 233
Chris@133 234 csit->setCurrent(current);
Chris@133 235 csit->setNew(newid);
Chris@133 236
Chris@133 237 if (current) {
Chris@129 238 m_uncommitted->setRow(csit->row() - 1);
Chris@129 239 m_uncommitted->setColumn(csit->column());
Chris@129 240 m_uncommitted->setWide(csit->isWide());
Chris@129 241 m_uncommitted->setBranch(csit->getChangeset()->branch());
Chris@128 242 }
Chris@128 243 }
Chris@128 244 }