diff --git a/lang/de/home.php b/lang/de/home.php index 41bc909..44bd6ca 100644 --- a/lang/de/home.php +++ b/lang/de/home.php @@ -224,7 +224,7 @@ //FindAllPatches.js $g_lang['find_all_pathes'] = "Find all paths"; - $g_lang['number_of_pathes_from'] = "Number of pathes from "; + $g_lang['number_of_pathes_from'] = "Number of paths from "; $g_lang['to'] = " to "; $g_lang['are'] = " is "; $g_lang['path_n'] = "Path #"; diff --git a/lang/el/home.php b/lang/el/home.php index bb0759d..dc3bbc2 100644 --- a/lang/el/home.php +++ b/lang/el/home.php @@ -262,7 +262,7 @@ //FindAllPatches.js $g_lang['find_all_pathes'] = "Find all paths"; - $g_lang['number_of_pathes_from'] = "Number of pathes from "; + $g_lang['number_of_pathes_from'] = "Number of paths from "; $g_lang['to'] = " to "; $g_lang['are'] = " is "; $g_lang['path_n'] = "Path #"; diff --git a/lang/en/home.php b/lang/en/home.php index 1ca56c0..73e352e 100755 --- a/lang/en/home.php +++ b/lang/en/home.php @@ -261,7 +261,7 @@ We have added Dutch translation 🇳🇱. Thank you Willie de Wit"; //FindAllPatches.js $g_lang['find_all_pathes'] = "Find all paths"; - $g_lang['number_of_pathes_from'] = "Number of pathes from "; + $g_lang['number_of_pathes_from'] = "Number of paths from "; $g_lang['to'] = " to "; $g_lang['are'] = " is "; $g_lang['path_n'] = "Path #"; diff --git a/lang/es/home.php b/lang/es/home.php index cd79a41..b3b1fb1 100755 --- a/lang/es/home.php +++ b/lang/es/home.php @@ -261,7 +261,7 @@ Tenemos traducciones en griego 🇬🇷. 0) { + var currentPath = ""; + var first = true; + this.foundPaths[this.nSubgraphIndex].forEach((nodeId) => { + currentPath += (first ? "" : "⇒") + this.graph.FindVertex(nodeId).mainText; + first = false; + }); + this.message = g_numberOfPathesFrom + this.firstObject.mainText + g_to + this.secondObject.mainText + g_are + - this.nSubGraphCount + " "; + this.nSubGraphCount + ". " + g_pathN + (1 + parseInt(this.nSubgraphIndex)) + ": " + currentPath + + " "; } else { @@ -92,12 +101,12 @@ FindAllPathes.prototype.resultCallback = function(pathObjects, properties, resul { this.nSubGraphCount = results.length > 0 && results[0].type == 1 ? results[0].value : 0; - this.setResultMessage(); - this.foundSubGraphs = {}; + this.foundPaths = {}; for (var i = 0; i < this.nSubGraphCount; i++) { this.foundSubGraphs[i] = {}; + this.foundPaths[i] = []; } var subGraphIndex = 0; @@ -116,6 +125,8 @@ FindAllPathes.prototype.resultCallback = function(pathObjects, properties, resul var index = subGraphIndex; var subgGraph = this.foundSubGraphs[index]; subgGraph[nodeId] = true; + + this.foundPaths[index].push(nodeId); if (prevNodeId >= 0) { @@ -125,6 +136,8 @@ FindAllPathes.prototype.resultCallback = function(pathObjects, properties, resul prevNodeId = nodeId; } } + + this.setResultMessage(); } else { @@ -151,8 +164,9 @@ FindAllPathes.prototype.messageWasChanged = function() $('#enumSubgraphs').change(function () { self.nSubgraphIndex = $('#enumSubgraphs').val(); - self.app.redrawGraph(); self.setResultMessage(); + self.app.redrawGraph(); + self.app.updateMessage(); }); } } diff --git a/tpl/home.php b/tpl/home.php index b7d40db..9293d10 100755 --- a/tpl/home.php +++ b/tpl/home.php @@ -10,7 +10,7 @@ - +