mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 16:08:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

have HEAD working

Browse source
This commit is contained in:
Peter Cottle 2012-09-29 11:52:18 -07:00
parent 3b58cf2912
commit f78e77e5c6
4 changed files with 116 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/visuals.js
View file

@ -5,8 +5,8 @@ function GitVisuals(options) {
this.edgeCollection = new VisEdgeCollection();
this.visBranchCollection = new VisBranchCollection();
this.commitMap = {};
this.rootCommit = null;
this.branchStackMap = null;
this.upstreamBranchSet = null;
@ -30,8 +30,16 @@ function GitVisuals(options) {
events.on('refreshTree', _.bind(
this.refreshTree, this
));
events.on('gitEngineReady', this.whenGitEngineReady, this);
}
GitVisuals.prototype.whenGitEngineReady = function(gitEngine) {
// seed this with the HEAD pseudo-branch
this.visBranchCollection.add(new VisBranch({
branch: gitEngine.HEAD
}));
};
GitVisuals.prototype.getScreenBounds = function() {
// for now we return the node radius subtracted from the walls
return {
@ -57,7 +65,7 @@ GitVisuals.prototype.toScreenCoords = function(pos) {
};
/***************************************
== Tree Calculation Parts ==
== BEGIN Tree Calculation Parts ==
_ __ __ _
\\/ / \ \//_
\ \ / __| __
@ -101,11 +109,11 @@ GitVisuals.prototype.calcTreeCoords = function() {
throw new Error('grr, no root commit!');
}
this.calcUpstreamSets();
this.calcBranchStacks();
this.calcDepth();
this.calcWidth();
this.calcBranchStacks();
this.calcUpstreamSets();
};
GitVisuals.prototype.calcGraphicsCoords = function() {
@ -116,7 +124,6 @@ GitVisuals.prototype.calcGraphicsCoords = function() {
GitVisuals.prototype.calcUpstreamSets = function() {
this.upstreamBranchSet = gitEngine.getUpstreamBranchSet();
this.upstreamHeadSet = gitEngine.getUpstreamHeadSet();
};
@ -193,7 +200,7 @@ GitVisuals.prototype.assignBoundsRecursive = function(commit, min, max) {
var totalFlex = 0;
var children = commit.get('children');
_.each(children, function(child) {
totalFlex += child.get('visNode').get('maxWidth');
totalFlex += child.get('visNode').getMaxWidthScaled();
}, this);
var prevBound = min;
@ -201,7 +208,7 @@ GitVisuals.prototype.assignBoundsRecursive = function(commit, min, max) {
// now go through and do everything
// TODO: order so the max width children are in the middle!!
_.each(children, function(child) {
var flex = child.get('visNode').get('maxWidth');
var flex = child.get('visNode').getMaxWidthScaled();
var portion = (flex / totalFlex) * myLength;
var childMin = prevBound;
var childMax = childMin + portion;