Skip to content

Commit

Permalink
Merge pull request #139 from softvis-research/development
Browse files Browse the repository at this point in the history
v1.3.1
  • Loading branch information
naraesk authored Feb 8, 2020
2 parents e78e175 + 1f28394 commit bedc8b9
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 100 deletions.
6 changes: 6 additions & 0 deletions ui/scripts/HelpController/HelpController.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ var helpController = (function() {
createPopupContent()
});
};

if(controllerConfig.metaphor=="RD C") {
$.getScript("scripts/HelpController/HelpRDC.js", function(){
createPopupContent()
});
};
}

function createPopupContent(){
Expand Down
51 changes: 51 additions & 0 deletions ui/scripts/HelpController/HelpRDC.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
var metaphor =(function(){

function legend(){
var legend_RD = `
<div class='legend_Div jqxTabs_Div helpController'>
<p>The Recursive Disk (RD) metaphor is designed to visualize the structure of imperative programming languages, with an emphasis on object-oriented languages. As the name indicates, an RD visualization consists of nested disks, where each disk represents a package or a class. All disks are ordered by size and then placed spiral-shaped clockwise around the largest disk. Although at first glance it seems chaotic, the emerging visual patterns and empty spaces give each disk a unique appearance and help the user to recognize specific disks.</p>
<img src='scripts/HelpController/images/RD.PNG'>
<div class='legend_Describe helpController'>
<h2>Gray Disk</h2>
<img src='scripts/HelpController/images/RD_package.png'>
<p>Gray disks represent <span class='legend_Represent helpController'>translation units</span>. The nested disks represent its components, i.e., types. The size of a disk depends on the size of the nested disks.</p>
</div>
<div class='legend_Describe helpController'>
<h2>Purple Disk</h2>
<img src='scripts/HelpController/images/RD_type.png'>
<p>Purple disks represent <span class='legend_Represent helpController'>types</span>. The size of a disk depends on the size of the nested disks and segments.</p>
</div>
<div class='legend_Describe helpController'>
<h2>Blue Segment</h2>
<img src='scripts/HelpController/images/RD_method.png'>
<p>Blue segments represent <span class='legend_Represent helpController'>functions</span>. The area of a blue segment is based on the functions lines of code.</p>
</div>
<div class='legend_Describe helpController'>
<h2>Yellow Segment</h2>
<img src='scripts/HelpController/images/RD_field.png'>
<p>Yellow segements represent <span class='legend_Represent helpController'>variables</span>. The area of a yellow segment is fixed and does not represent a metric.</p>
</div>
</div>`;
return legend_RD;
};

function relationships(){
var relationships_RD= `
<div class='relationships_Div jqxTabs_Div helpController'>
<h2>Variable accesses</h2>
<p>Click on a variable to show connections to accessing functions.</p>
<p>Click on a function to show connections to accessed variables.</p>
<img src='scripts/HelpController/images/RD_void.png'>
<h2>Function calls</h2>
<p>Click on a function to show in- and outgoing function calls.</p>
<img src='scripts/HelpController/images/RD_voidrun.png'>
</div>`;

return relationships_RD;
};

return {
relationships: relationships,
legend: legend
};
})();
112 changes: 12 additions & 100 deletions ui/setups/web/c.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,16 @@
name: "relationHighlightController"
},
{
name: "systeminfoController",
system: "BusyBox",
version: "1.18.5",
not: true,
name: 'infoController',
system: "Busybox",
noc: false,
not: true,
loc: 192000
},
{
name: 'helpController',
metaphor: "RD C"
},
{
name: "menuController",
menuMapping: [
Expand Down Expand Up @@ -182,41 +185,6 @@
},
]
},
{
name: "legendController",
entries: [{
name: "Translation unit",
icon: "grayCircle"
}, {
name: "Struct/Union/Enum",
icon: "purpleCircle",
}, {
name: "Function",
icon: "lightBlueCircle",
}, {
name: "Variable/Enum constant",
icon: "yellowCircle",
}, {
name: "Selection",
icon: "orangeCircle",
},
{
name: "Navigation",
icon: "navigation",
entries: [
{
name: "Rotate",
icon: "leftMouseButton"
}, {
name: "Move",
icon: "midMouseButton"
}, {
name: "Zoom",
icon: "scrolling"
}]
}
],
}
],


Expand All @@ -233,36 +201,16 @@
resizable: false,
collapsible: false,
first: {
size: "25px",
size: "75px",
resizable: false,
collapsible: false,
controllers: [
{name: "menuController"},
// {name: "searchController"},
{name: "searchController"},
{name: "emailController"},
],
},
second: {
size: "100%",
resizable: false,
collapsible: false,
area: {
orientation: "horizontal",
name: "searchPanel",
size: "35px",
collapsible: false,
resizable: false,
first: {
size: "35px",
collapsible: false,
resizable: false,
controllers: [
// {name: "menuController"},
{name: "searchController"}
// {name: "emailController"},
],
},
second: {
size: "80%",
resizable: false,
collapsible: false,
Expand Down Expand Up @@ -304,7 +252,7 @@
size: "50%",
collapsible: false,
first: {
size: "55%",
size: "100%",
expanders: [
{
name: "packageExplorer",
Expand All @@ -316,27 +264,6 @@
]
},
second: {
size: "45%",
area: {
orientation: "horizontal",
name: "legendPanel2",
size: "100%",
collapsible: false,
first: {
size: "100%",
expanders: [
{
name: "legend",
title: "Legend",

controllers: [
{name: "legendController"}
],
},
]
},
second: {}
},
},
}
},
Expand All @@ -362,6 +289,7 @@
{name: "canvasHoverController"},
{name: "canvasFilterController"},
{name: "canvasFlyToController"},
{name: "infoController"}, {name: "helpController"},
{name: "relationConnectorController"},
// {name: "relationTransparencyController"},
{name: "relationHighlightController"}, {name: "generationFormController"}
Expand All @@ -377,7 +305,7 @@
name: "rightPael",
size: "80%",
first: {
size: "85%",
size: "100%",
min: "200",
collapsible: false,
// resizable: false,
Expand All @@ -393,28 +321,12 @@
],
},
second: {
size: "15%",
// collapsible: false,
// resizable: false,
// min: "200",
oriontation: "horizontal",
expanders: [
{
name: "systeminfo",
title: "Info",
controllers: [
{name: "systeminfoController"}
],
},
],
}
}
}
}
}
}
}
}
}
}
}
Expand Down

0 comments on commit bedc8b9

Please sign in to comment.