Added context menu.

This commit is contained in:
Oleg Sh 2022-03-08 14:20:19 +02:00
parent 5ae3760ba8
commit 02ee85a6e7
16 changed files with 353 additions and 89 deletions

View File

@ -399,4 +399,10 @@
text-align: left;
border: none;
border-radius: 0px
}
#contextMenu {
position: absolute;
display: none;
border: 2px solid #CCCCCC;
}

View File

@ -275,4 +275,6 @@ We have added Dutch translation 🇳🇱. Thank you Willie de Wit</a>";
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -275,4 +275,6 @@
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -238,4 +238,6 @@
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -276,4 +276,6 @@
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -274,5 +274,7 @@ We have added Dutch translation 🇳🇱. Thank you Willie de Wit</a>";
$g_lang['path_to'] = "Path to ";
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -275,4 +275,6 @@ Tenemos traducciones en griego 🇬🇷.</a> <a href=\"https://github.com/UnickS
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -243,4 +243,6 @@
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -239,5 +239,7 @@
$g_lang['path_to'] = "Path to ";
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -240,5 +240,7 @@
$g_lang['path_to'] = "Path to ";
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -277,4 +277,5 @@
$g_lang['search_pathes'] = "Поиск путей";
$g_lang['other_algorithms'] = "Другие алгоритмы";
$g_lang['use_context_menu'] = "Используйте контекстное меню для дополнительных действий.";
?>

View File

@ -237,4 +237,6 @@
$g_lang['search_pathes'] = "Search paths";
$g_lang['other_algorithms'] = "Other algorithms";
$g_lang['use_context_menu'] = "Use context menu for additional actions.";
?>

View File

@ -466,6 +466,9 @@ Application.prototype.CanvasOnMouseMove = function(e)
Application.prototype.CanvasOnMouseDown = function(e)
{
// Skip non left button.
if(e.which !== 1) return;
var pos = this.getMousePos(this.canvas, e); /// provide this canvas and event
this.handler.MouseDown(pos);
@ -480,6 +483,9 @@ Application.prototype.CanvasOnMouseDown = function(e)
Application.prototype.CanvasOnMouseUp = function(e)
{
// Skip non left button.
if(e.which !== 1) return;
// this.dragObject = -1;
var pos = this.getMousePos(this.canvas, e);

View File

@ -10,11 +10,16 @@
*
*/
function BaseHandler(app)
function BaseHandler(app, removeStack)
{
this.app = app;
this.app.setRenderPath([]);
if (removeStack) {
this.removeContextMenu();
}
this.contextMenuObject = null;
this.contextMenuPoint = null;
//this.app.ClearUndoStack();
}
@ -66,7 +71,6 @@ BaseHandler.prototype.GetSelectedArc = function(pos)
if (edge.HitTest(new Point(pos.x, pos.y)))
return edge;
}
return null;
}
@ -196,6 +200,261 @@ BaseHandler.prototype.SelectSecondVertexMenu = function(vertex2Text, vertex)
BaseHandler.prototype.UpdateSecondVertexMenu = function()
{}
BaseHandler.prototype.GetSelectedVertex = function()
{
return null;
}
BaseHandler.prototype.addContextMenu = function()
{
var $contextMenu = $("#contextMenu");
var handler = this;
$("#Context_Delete").click(function() {
if (handler.contextMenuObject != null) {
handler.app.PushToStack("DeleteObject");
handler.app.DeleteObject(handler.contextMenuObject);
handler.app.redrawGraph();
userAction("DeleteObject_contextMenu");
}
});
$("#Context_Rename").click(function() {
if (handler.contextMenuObject != null) {
var callback = function (enumType) {
handler.RenameVertex(enumType.GetVertexText(0), handler.contextMenuObject);
userAction("RenameVertex_contextMenu");
};
var customEnum = new TextEnumVertexsCustom(handler.app);
customEnum.ShowDialog(callback, g_rename, g_renameVertex, handler.contextMenuObject.mainText);
}
});
$("#Context_Connect").click(function() {
if (handler.contextMenuObject != null && handler.GetSelectedVertex() != null) {
var addFunc = function(firstVertex, secondVertex, direct) {
handler.app.CreateNewArc(firstVertex, secondVertex, direct,
document.getElementById('EdgeWeight').value,
$("#RadiosReplaceEdge").prop("checked"),
document.getElementById('EdgeLable').value);
handler.app.redrawGraph();
}
handler.ShowCreateEdgeDialog(handler.GetSelectedVertex(), handler.contextMenuObject, addFunc);
}
});
$("#Context_Delete_Edge").click(function() {
if (handler.contextMenuObject != null) {
handler.app.PushToStack("DeleteObject");
handler.app.DeleteObject(handler.contextMenuObject);
handler.app.redrawGraph();
userAction("DeleteObject_contextMenu");
}
});
$("#Context_Edit_Edge").click(function() {
if (handler.contextMenuObject != null) {
handler.ShowEditEdgeDialog(handler.contextMenuObject);
}
});
$("#Context_Add_Edge").click(function() {
handler.app.PushToStack("Add");
handler.app.CreateNewGraph(handler.contextMenuPoint.x, handler.contextMenuPoint.y);
handler.app.redrawGraph();
});
$("#Context_Back_Color").click(function() {
var setupBackgroundStyle = new SetupBackgroundStyle(handler.app);
setupBackgroundStyle.show();
});
$("body").on("contextmenu", "canvas", function(e) {
handler.contextMenuPoint = {x: e.offsetX, y: e.offsetY};
handler.contextMenuObject = handler.GetSelectedObject(handler.contextMenuPoint);
if (handler.contextMenuObject instanceof BaseVertex) {
$("#edgeContextMenu").hide();
$("#backgroundContextMenu").hide();
$("#vertexContextMenu").show();
if (handler.GetSelectedVertex() == null) {
$("#Context_Connect").hide();
} else {
$("#Context_Connect").show();
}
} else if (handler.contextMenuObject instanceof BaseEdge) {
$("#vertexContextMenu").hide();
$("#backgroundContextMenu").hide();
$("#edgeContextMenu").show();
} else {
$("#vertexContextMenu").hide();
$("#edgeContextMenu").hide();
$("#backgroundContextMenu").show();
}
$contextMenu.css({
display: "block",
left: e.offsetX,
top: e.offsetY
});
return false;
});
$("body").click(function() {
$contextMenu.hide();
});
}
BaseHandler.prototype.removeContextMenu = function()
{
$("body").off("contextmenu");
$("#Context_Delete").off("click");
$("#Context_Rename").off("click");
$("#Context_Connect").off("click");
$("#Context_Delete_Edge").off("click");
$("#Context_Edit_Edge").off("click");
$("#Context_Add_Edge").off("click");
$("#Context_Back_Color").off("click");
}
BaseHandler.prototype.RenameVertex = function(text, object)
{
if (object != null && (object instanceof BaseVertex))
{
this.app.PushToStack("RenameVertex");
object.mainText = text;
this.app.redrawGraph();
}
}
BaseHandler.prototype.ShowCreateEdgeDialog = function(firstVertex, secondVertex, addEdgeCallBack) {
if (!this.app.graph.isMulti())
{
var hasEdge = this.app.graph.FindEdgeAny(firstVertex.id, secondVertex.id);
var hasReverseEdge = this.app.graph.FindEdgeAny(secondVertex.id, firstVertex.id);
if (hasEdge == null && hasReverseEdge == null)
{
$("#RadiosReplaceEdge").prop("checked", true);
$("#NewEdgeAction" ).hide();
}
else {
$( "#NewEdgeAction" ).show();
}
}
else
{
$("#RadiosAddEdge").prop("checked", true);
$("#NewEdgeAction" ).hide();
}
var dialogButtons = {};
var handler = this;
dialogButtons[g_orintEdge] = function() {
handler.app.PushToStack("Connect");
addEdgeCallBack(firstVertex, secondVertex, true);
//handler.AddNewEdge(selectedObject, true);
$( this ).dialog( "close" );
};
dialogButtons[g_notOrintEdge] = function() {
handler.app.PushToStack("Connect");
addEdgeCallBack(firstVertex, secondVertex, false);
//handler.AddNewEdge(selectedObject, false);
$( this ).dialog( "close" );
};
var edgePresets = this.app.GetEdgePresets();
var presetsStr = "<span onClick=\"document.getElementById('EdgeWeight').value='" + g_DefaultWeightPreset
+ "'; document.getElementById('EdgeWeightSlider').value='" + g_DefaultWeightPreset
+ "';\" style=\"cursor: pointer\" class=\"defaultWeigth\">" + g_DefaultWeightPreset + "</span>";
for(var i = 0; i < edgePresets.length; i ++)
{
var edgePreset = edgePresets[i];
presetsStr += "<span onClick=\"document.getElementById('EdgeWeight').value='" + edgePreset
+ "'; document.getElementById('EdgeWeightSlider').value=" + edgePreset
+ ";\" style=\"cursor: pointer\" class=\"defaultWeigth\">" + edgePreset + "</span>";
}
document.getElementById("EdgesPresets").innerHTML = presetsStr;
document.getElementById('EdgeLable').value = "";
$( "#addEdge" ).dialog({
resizable: false,
height: "auto",
width: "auto",
modal: true,
title: g_addEdge,
buttons: dialogButtons,
dialogClass: 'EdgeDialog',
open: function () {
$(this).off('submit').on('submit', function () {
return false;
});
// Focues weight
setTimeout(function(){
const weightInput = document.getElementById('EdgeWeight');
if(weightInput)
{
weightInput.focus();
weightInput.select();
}
},0);
}
});
}
BaseHandler.prototype.ShowEditEdgeDialog = function(edgeObject) {
var dialogButtons = {};
var handler = this;
dialogButtons[g_save] = function() {
handler.app.PushToStack("ChangeEdge");
edgeObject.SetWeight(document.getElementById('EdgeWeight').value);
edgeObject.SetUpText(document.getElementById('EdgeLable').value);
handler.needRedraw = true;
handler.app.redrawGraph();
userAction("ChangeWeight");
$( this ).dialog( "close" );
};
document.getElementById('EdgeWeight').value = edgeObject.useWeight ? edgeObject.weight : g_noWeight;
document.getElementById('EdgeWeightSlider').value = edgeObject.useWeight ? edgeObject.weight : 0;
var edgePresets = handler.app.GetEdgePresets();
var presetsStr = "<span onClick=\"document.getElementById('EdgeWeight').value='" + g_DefaultWeightPreset + "'; document.getElementById('EdgeWeightSlider').value='" +
g_DefaultWeightPreset + "';\" style=\"cursor: pointer\" class=\"defaultWeigth\">" + g_DefaultWeightPreset + "</span>";
for(var i = 0; i < edgePresets.length; i ++)
{
var edgePreset = edgePresets[i];
presetsStr += "<span onClick=\"document.getElementById('EdgeWeight').value='" + edgePreset + "'; document.getElementById('EdgeWeightSlider').value=" +
edgePreset + ";\" style=\"cursor: pointer\" class=\"defaultWeigth\">" + edgePreset + "</span>";
}
document.getElementById("EdgesPresets").innerHTML = presetsStr;
document.getElementById('EdgeLable').value = edgeObject.upText;
$( "#addEdge" ).dialog({
resizable: false,
height: "auto",
width: "auto",
modal: true,
title: g_editWeight,
buttons: dialogButtons,
dialogClass: 'EdgeDialog',
open: function () {
$(handler).off('submit').on('submit', function () {
return false;
});
}
});
}
/**
* Default handler.
* Select using mouse, drag.
@ -203,8 +462,8 @@ BaseHandler.prototype.UpdateSecondVertexMenu = function()
*/
function DefaultHandler(app)
{
BaseHandler.apply(this, arguments);
this.message = g_textsSelectAndMove + " <span class=\"hidden-phone\">" + g_selectGroupText + "</span>";
BaseHandler.apply(this, arguments, true);
this.message = g_textsSelectAndMove + " <span class=\"hidden-phone\">" + g_selectGroupText + "</span>" + " <span class=\"hidden-phone\">" + g_useContextMenuText + "</span>";
this.selectedObjects = [];
this.dragObject = null;
this.selectedObject = null;
@ -213,6 +472,8 @@ function DefaultHandler(app)
this.selectedLogRect = false;
this.selectedLogCtrl = false;
this.saveUndo = false;
this.addContextMenu();
}
// inheritance.
@ -222,6 +483,11 @@ DefaultHandler.prototype.pressed = false;
// Cuvled change value.
DefaultHandler.prototype.curvedValue = 0.1;
DefaultHandler.prototype.GetSelectedVertex = function()
{
return (this.selectedObject instanceof BaseVertex) ? this.selectedObject : null;
}
DefaultHandler.prototype.MouseMove = function(pos)
{
if (this.dragObject)
@ -334,19 +600,10 @@ DefaultHandler.prototype.MouseDown = function(pos)
this.app.canvas.style.cursor = "move";
}
DefaultHandler.prototype.RenameVertex = function(text)
{
if (this.selectedObject != null && (this.selectedObject instanceof BaseVertex))
{
this.selectedObject.mainText = text;
this.app.redrawGraph();
}
}
DefaultHandler.prototype.MouseUp = function(pos)
{
this.saveUndo = false;
this.message = g_textsSelectAndMove + " <span class=\"hidden-phone\">" + g_selectGroupText + "</span>";
this.message = g_textsSelectAndMove + " <span class=\"hidden-phone\">" + g_selectGroupText + "</span>" + " <span class=\"hidden-phone\">" + g_useContextMenuText + "</span>";
this.dragObject = null;
this.pressed = false;
this.app.canvas.style.cursor = "auto";
@ -370,7 +627,7 @@ DefaultHandler.prototype.MouseUp = function(pos)
var handler = this;
var callback = function (enumType) {
handler.RenameVertex(enumType.GetVertexText(0));
handler.RenameVertex(enumType.GetVertexText(0, handler.selectedObject));
userAction("RenameVertex");
};
$('#message').unbind();
@ -675,8 +932,9 @@ DefaultHandler.prototype.SelectObjectInRect = function (rect)
*/
function AddGraphHandler(app)
{
BaseHandler.apply(this, arguments);
BaseHandler.apply(this, arguments, true);
this.message = g_clickToAddVertex;
this.addContextMenu();
}
// inheritance.
@ -731,8 +989,9 @@ AddGraphHandler.prototype.ChangedType = function()
*/
function ConnectionGraphHandler(app)
{
BaseHandler.apply(this, arguments);
this.SelectFirst();
BaseHandler.apply(this, arguments, true);
this.SelectFirst();
this.addContextMenu();
}
// inheritance.
@ -740,6 +999,11 @@ ConnectionGraphHandler.prototype = Object.create(BaseHandler.prototype);
// First selected.
ConnectionGraphHandler.prototype.firstObject = null;
ConnectionGraphHandler.prototype.GetSelectedVertex = function()
{
return (this.firstObject instanceof BaseVertex) ? this.firstObject : null;
}
ConnectionGraphHandler.prototype.AddNewEdge = function(selectedObject, isDirect)
{
this.app.CreateNewArc(this.firstObject, selectedObject, isDirect, document.getElementById('EdgeWeight').value, $("#RadiosReplaceEdge").prop("checked"), document.getElementById('EdgeLable').value);
@ -754,72 +1018,9 @@ ConnectionGraphHandler.prototype.SelectVertex = function(selectedObject)
{
var direct = false;
var handler = this;
var dialogButtons = {};
if (!this.app.graph.isMulti())
{
var hasEdge = this.app.graph.FindEdgeAny(this.firstObject.id, selectedObject.id);
var hasReverseEdge = this.app.graph.FindEdgeAny(selectedObject.id, this.firstObject.id);
if (hasEdge == null && hasReverseEdge == null)
{
$("#RadiosReplaceEdge").prop("checked", true);
$("#NewEdgeAction" ).hide();
}
else
$( "#NewEdgeAction" ).show();
}
else
{
$("#RadiosAddEdge").prop("checked", true);
$("#NewEdgeAction" ).hide();
}
dialogButtons[g_orintEdge] = function() {
handler.app.PushToStack("Connect");
handler.AddNewEdge(selectedObject, true);
$( this ).dialog( "close" );
};
dialogButtons[g_notOrintEdge] = function() {
handler.app.PushToStack("Connect");
handler.AddNewEdge(selectedObject, false);
$( this ).dialog( "close" );
};
var edgePresets = this.app.GetEdgePresets();
var presetsStr = "<span onClick=\"document.getElementById('EdgeWeight').value='" + g_DefaultWeightPreset + "'; document.getElementById('EdgeWeightSlider').value='" + g_DefaultWeightPreset + "';\" style=\"cursor: pointer\" class=\"defaultWeigth\">" + g_DefaultWeightPreset + "</span>";
for(var i = 0; i < edgePresets.length; i ++)
{
var edgePreset = edgePresets[i];
presetsStr += "<span onClick=\"document.getElementById('EdgeWeight').value='" + edgePreset + "'; document.getElementById('EdgeWeightSlider').value=" + edgePreset + ";\" style=\"cursor: pointer\" class=\"defaultWeigth\">" + edgePreset + "</span>";
}
document.getElementById("EdgesPresets").innerHTML = presetsStr;
document.getElementById('EdgeLable').value = "";
$( "#addEdge" ).dialog({
resizable: false,
height: "auto",
width: "auto",
modal: true,
title: g_addEdge,
buttons: dialogButtons,
dialogClass: 'EdgeDialog',
open: function () {
$(this).off('submit').on('submit', function () {
return false;
});
// Focues weight
setTimeout(function(){
const weightInput = document.getElementById('EdgeWeight');
if(weightInput)
{
weightInput.focus();
weightInput.select();
}
},0);
}
this.ShowCreateEdgeDialog(this.firstObject, selectedObject, function (firstVertex, secondVertex, direct) {
handler.AddNewEdge(secondVertex, direct);
});
}
else
@ -893,8 +1094,9 @@ ConnectionGraphHandler.prototype.UpdateSecondVertexMenu = function(vertex2Text)
*/
function DeleteGraphHandler(app)
{
BaseHandler.apply(this, arguments);
BaseHandler.apply(this, arguments, true);
this.message = g_selectObjectToDelete;
this.addContextMenu();
}
// inheritance.
@ -1268,7 +1470,7 @@ SavedDialogGraphImageHandler.prototype.showPrint = function()
*/
function AlgorithmGraphHandler(app, algorithm)
{
BaseHandler.apply(this, arguments);
BaseHandler.apply(this, arguments, true);
this.algorithm = algorithm;
this.SaveUpText();

View File

@ -184,6 +184,8 @@ var g_findAllPathesFromVertex = "Find all shortest paths from vertex";
var g_distanceFrom = "Distance from ";
var g_pathTo = "Path to ";
var g_useContextMenuText = "Use context menu for addition actions."
function loadTexts()
{
g_textsSelectAndMove = document.getElementById("SelectAndMoveObject").innerHTML;
@ -375,4 +377,6 @@ function loadTexts()
g_findAllPathesFromVertex = document.getElementById("findAllPathsFromVertex").innerHTML;
g_distanceFrom = document.getElementById("distanceFrom").innerHTML;
g_pathTo = document.getElementById("pathTo").innerHTML;
g_useContextMenuText = document.getElementById("UseContextMenuText").innerHTML;
}

View File

@ -10,7 +10,7 @@
<script src="<?= Root('i/js/dev/jquery-ui.js')?>"></script>
<script src="<?= Root('i/js/dev/jquery.feedback_me.js')?>"></script>
<script src="<?= Root("script/example.js?v=58")?>" ></script>
<script src="<?= Root("script/example.js?v=59")?>" ></script>
<!-- Yandex.RTB -->
<script>window.yaContextCb=window.yaContextCb||[]</script>
@ -182,6 +182,29 @@
<input type="button" value="<?= L('developer_tools_run')?>" id="runUserScript" class="btn btn-success btn-sm"/>
<input type="button" value="<?= L('developer_tools_submit')?>" id="submitUserScript" class="btn btn-default btn-sm" style="float: right;"/>
</div>
<div id="contextMenu" class="dropdown clearfix">
<div id="edgeContextMenu">
<div class="btn-group btn-group-vertical">
<button type="button" class="btn btn-default btn-sm btn-submenu" id="Context_Edit_Edge"><?= L('edit_weight')?></button>
<button type="button" class="btn btn-default btn-sm btn-submenu" id="Context_Delete_Edge"><?= L('delete')?></button>
</div>
</div>
<div id="vertexContextMenu">
<div class="btn-group btn-group-vertical">
<button type="button" class="btn btn-default btn-sm btn-submenu" id="Context_Connect"><?= L('connect_nodes')?></button>
<button type="button" class="btn btn-default btn-sm btn-submenu" id="Context_Rename"><?= L('rename_vertex')?></button>
<button type="button" class="btn btn-default btn-sm btn-submenu" id="Context_Delete"><?= L('delete')?></button>
</div>
</div>
<div id="backgroundContextMenu">
<div class="btn-group btn-group-vertical">
<button type="button" class="btn btn-default btn-sm btn-submenu" id="Context_Add_Edge"><?= L('add_node')?></button>
<button type="button" class="btn btn-default btn-sm btn-submenu" id="Context_Back_Color"><?= L('background_style') ?></button>
</div>
</div>
</div>
</div>
</section>
<?php if (L('current_language') == "en" && false): ?>
@ -812,6 +835,8 @@
<p id="findAllPathsFromVertex" class="translation"><?= L('find_all_paths_from_vertex')?></p>
<p id="distanceFrom" class="translation"><?= L('distance_from')?></p>
<p id="pathTo" class="translation"><?= L('path_to')?></p>
<p id="UseContextMenuText" class="translation"><?= L('use_context_menu')?></p>
</section>
<!--
<script>