Add logs if emscripted failed. Updated emscripten.

core/config/main.php

@@ -93,5 +93,5 @@
     $g_config['vote']                   = "./tmp/vote/vote.txt";
     $g_config['voteTopics']             = "./tmp/vote/voteTopics.txt_";
     $g_config['use_js_cache']           = true;
-    $g_config['engine_version']         = 88;
+    $g_config['engine_version']         = 89;
 ?>

script/features/algorithms/model/Algorithms.js

@@ -282,6 +282,7 @@ BaseAlgorithmEx.prototype.CalculateAlgorithm = function(algorithmName, otherPara
             res = this.app.processEmscripten(processData);
         }
         catch (error) {
+            userAction("emscripten_error_" + algorithmName);
             console.log("Error on Emscripten: " + error + "\n" + error.stack);
             callCGIAlgorithms();
             return true;

script/pages/create_graph_by_edge_list/api/index.js.cache

@@ -1,4 +1,4 @@
-moduleLoader.beginCacheLoading(["/script/entities/graph/api/index.js?v=88","/script/shared/point.js?v=88","/script/entities/edge/api/index.js?v=88","/script/entities/edge/model/BaseEdge.js?v=88","/script/entities/edge/model/EdgeModel.js?v=88","/script/entities/vertex/api/index.js?v=88","/script/entities/vertex/model/BaseVertex.js?v=88","/script/entities/vertex/model/VertexModel.js?v=88","/script/entities/graph/model/Graph.js?v=88",]);{let modulDir="pages/create_graph_by_edge_list/";doInclude([include("entities/graph/api/index.js")]);}
+moduleLoader.beginCacheLoading(["/script/entities/graph/api/index.js?v=89","/script/shared/point.js?v=89","/script/entities/edge/api/index.js?v=89","/script/entities/edge/model/BaseEdge.js?v=89","/script/entities/edge/model/EdgeModel.js?v=89","/script/entities/vertex/api/index.js?v=89","/script/entities/vertex/model/BaseVertex.js?v=89","/script/entities/vertex/model/VertexModel.js?v=89","/script/entities/graph/model/Graph.js?v=89",]);{let modulDir="pages/create_graph_by_edge_list/";doInclude([include("entities/graph/api/index.js")]);}
 {let modulDir="entities/graph/";doInclude([include("shared/point.js"),include("entities/edge/api/index.js"),include("entities/vertex/api/index.js"),include("model/Graph.js",modulDir)])}function Point(x,y){this.x=x||0;this.y=y||0;};Point.prototype.x=null;Point.prototype.y=null;Point.prototype.add=function(v){return new Point(this.x+v.x,this.y+v.y);};Point.prototype.addValue=function(v){return new Point(this.x+v,this.y+v);};Point.prototype.clone=function(){return new Point(this.x,this.y);};Point.prototype.degreesTo=function(v){var dx=this.x-v.x;var dy=this.y-v.y;var angle=Math.atan2(dy,dx);return angle*(180/Math.PI);};Point.prototype.distance=function(v){return Math.sqrt(this.distanceSqr(v));};Point.prototype.distanceSqr=function(v){var x=this.x-v.x;var y=this.y-v.y;return x*x+y*y;};Point.prototype.equals=function(toCompare){return this.x==toCompare.x&&this.y==toCompare.y;};Point.prototype.interpolate=function(v,f){return new Point((this.x+v.x)*f,(this.y+v.y)*f);};Point.prototype.length=function(){return Math.sqrt(this.x*this.x+this.y*this.y);};Point.prototype.normalize=function(thickness){var l=this.length();this.x=this.x/l*thickness;this.y=this.y/l*thickness;return new Point(this.x,this.y);};Point.prototype.normalizeCopy=function(thickness){var l=this.length();return new Point(this.x/l*thickness,this.y/l*thickness);};Point.prototype.orbit=function(origin,arcWidth,arcHeight,degrees){var radians=degrees*(Math.PI/180);this.x=origin.x+arcWidth*Math.cos(radians);this.y=origin.y+arcHeight*Math.sin(radians);};Point.prototype.rotate=function(center,degrees){var radians=degrees*(Math.PI/180);offset=this.subtract(center);this.x=offset.x*Math.cos(radians)-offset.y*Math.sin(radians);this.y=offset.x*Math.sin(radians)+offset.y*Math.cos(radians);this.x=this.x+center.x;this.y=this.y+center.y;return this;};Point.prototype.offset=function(dx,dy){this.x+=dx;this.y+=dy;};Point.prototype.subtract=function(v){return new Point(this.x-v.x,this.y-v.y);};Point.prototype.subtractValue=function(value){return new Point(this.x-value,this.y-value);};Point.prototype.multiply=function(value){return new Point(this.x*value,this.y*value);};Point.prototype.toString=function(){return"(x="+this.x+", y="+this.y+")";};Point.prototype.normal=function(){return new Point(-this.y,this.x);};Point.prototype.min=function(point)
 {return new Point(Math.min(this.x,point.x),Math.min(this.y,point.y));};Point.prototype.max=function(point)
 {return new Point(Math.max(this.x,point.x),Math.max(this.y,point.y));};Point.prototype.inverse=function()

script/pages/create_graph_by_incidence_matrix/api/index.js.cache

@@ -1,4 +1,4 @@
-moduleLoader.beginCacheLoading(["/script/entities/graph/api/index.js?v=88","/script/shared/point.js?v=88","/script/entities/edge/api/index.js?v=88","/script/entities/edge/model/BaseEdge.js?v=88","/script/entities/edge/model/EdgeModel.js?v=88","/script/entities/vertex/api/index.js?v=88","/script/entities/vertex/model/BaseVertex.js?v=88","/script/entities/vertex/model/VertexModel.js?v=88","/script/entities/graph/model/Graph.js?v=88",]);{let modulDir="pages/create_graph_by_matrix/";doInclude([include("entities/graph/api/index.js")]);}
+moduleLoader.beginCacheLoading(["/script/entities/graph/api/index.js?v=89","/script/shared/point.js?v=89","/script/entities/edge/api/index.js?v=89","/script/entities/edge/model/BaseEdge.js?v=89","/script/entities/edge/model/EdgeModel.js?v=89","/script/entities/vertex/api/index.js?v=89","/script/entities/vertex/model/BaseVertex.js?v=89","/script/entities/vertex/model/VertexModel.js?v=89","/script/entities/graph/model/Graph.js?v=89",]);{let modulDir="pages/create_graph_by_matrix/";doInclude([include("entities/graph/api/index.js")]);}
 {let modulDir="entities/graph/";doInclude([include("shared/point.js"),include("entities/edge/api/index.js"),include("entities/vertex/api/index.js"),include("model/Graph.js",modulDir)])}function Point(x,y){this.x=x||0;this.y=y||0;};Point.prototype.x=null;Point.prototype.y=null;Point.prototype.add=function(v){return new Point(this.x+v.x,this.y+v.y);};Point.prototype.addValue=function(v){return new Point(this.x+v,this.y+v);};Point.prototype.clone=function(){return new Point(this.x,this.y);};Point.prototype.degreesTo=function(v){var dx=this.x-v.x;var dy=this.y-v.y;var angle=Math.atan2(dy,dx);return angle*(180/Math.PI);};Point.prototype.distance=function(v){return Math.sqrt(this.distanceSqr(v));};Point.prototype.distanceSqr=function(v){var x=this.x-v.x;var y=this.y-v.y;return x*x+y*y;};Point.prototype.equals=function(toCompare){return this.x==toCompare.x&&this.y==toCompare.y;};Point.prototype.interpolate=function(v,f){return new Point((this.x+v.x)*f,(this.y+v.y)*f);};Point.prototype.length=function(){return Math.sqrt(this.x*this.x+this.y*this.y);};Point.prototype.normalize=function(thickness){var l=this.length();this.x=this.x/l*thickness;this.y=this.y/l*thickness;return new Point(this.x,this.y);};Point.prototype.normalizeCopy=function(thickness){var l=this.length();return new Point(this.x/l*thickness,this.y/l*thickness);};Point.prototype.orbit=function(origin,arcWidth,arcHeight,degrees){var radians=degrees*(Math.PI/180);this.x=origin.x+arcWidth*Math.cos(radians);this.y=origin.y+arcHeight*Math.sin(radians);};Point.prototype.rotate=function(center,degrees){var radians=degrees*(Math.PI/180);offset=this.subtract(center);this.x=offset.x*Math.cos(radians)-offset.y*Math.sin(radians);this.y=offset.x*Math.sin(radians)+offset.y*Math.cos(radians);this.x=this.x+center.x;this.y=this.y+center.y;return this;};Point.prototype.offset=function(dx,dy){this.x+=dx;this.y+=dy;};Point.prototype.subtract=function(v){return new Point(this.x-v.x,this.y-v.y);};Point.prototype.subtractValue=function(value){return new Point(this.x-value,this.y-value);};Point.prototype.multiply=function(value){return new Point(this.x*value,this.y*value);};Point.prototype.toString=function(){return"(x="+this.x+", y="+this.y+")";};Point.prototype.normal=function(){return new Point(-this.y,this.x);};Point.prototype.min=function(point)
 {return new Point(Math.min(this.x,point.x),Math.min(this.y,point.y));};Point.prototype.max=function(point)
 {return new Point(Math.max(this.x,point.x),Math.max(this.y,point.y));};Point.prototype.inverse=function()

script/pages/create_graph_by_matrix/api/index.js.cache

@@ -1,4 +1,4 @@
-moduleLoader.beginCacheLoading(["/script/entities/graph/api/index.js?v=88","/script/shared/point.js?v=88","/script/entities/edge/api/index.js?v=88","/script/entities/edge/model/BaseEdge.js?v=88","/script/entities/edge/model/EdgeModel.js?v=88","/script/entities/vertex/api/index.js?v=88","/script/entities/vertex/model/BaseVertex.js?v=88","/script/entities/vertex/model/VertexModel.js?v=88","/script/entities/graph/model/Graph.js?v=88","/script/pages/create_graph_by_matrix/model/createByMatrixMain.js?v=88","/script/pages/create_graph_by_matrix/model/main.js?v=88",]);{let modulDir="pages/create_graph_by_matrix/";doInclude([include("entities/graph/api/index.js"),include("model/createByMatrixMain.js",modulDir),include("model/main.js",modulDir)]);}
+moduleLoader.beginCacheLoading(["/script/entities/graph/api/index.js?v=89","/script/shared/point.js?v=89","/script/entities/edge/api/index.js?v=89","/script/entities/edge/model/BaseEdge.js?v=89","/script/entities/edge/model/EdgeModel.js?v=89","/script/entities/vertex/api/index.js?v=89","/script/entities/vertex/model/BaseVertex.js?v=89","/script/entities/vertex/model/VertexModel.js?v=89","/script/entities/graph/model/Graph.js?v=89","/script/pages/create_graph_by_matrix/model/createByMatrixMain.js?v=89","/script/pages/create_graph_by_matrix/model/main.js?v=89",]);{let modulDir="pages/create_graph_by_matrix/";doInclude([include("entities/graph/api/index.js"),include("model/createByMatrixMain.js",modulDir),include("model/main.js",modulDir)]);}
 {let modulDir="entities/graph/";doInclude([include("shared/point.js"),include("entities/edge/api/index.js"),include("entities/vertex/api/index.js"),include("model/Graph.js",modulDir)])}function Point(x,y){this.x=x||0;this.y=y||0;};Point.prototype.x=null;Point.prototype.y=null;Point.prototype.add=function(v){return new Point(this.x+v.x,this.y+v.y);};Point.prototype.addValue=function(v){return new Point(this.x+v,this.y+v);};Point.prototype.clone=function(){return new Point(this.x,this.y);};Point.prototype.degreesTo=function(v){var dx=this.x-v.x;var dy=this.y-v.y;var angle=Math.atan2(dy,dx);return angle*(180/Math.PI);};Point.prototype.distance=function(v){return Math.sqrt(this.distanceSqr(v));};Point.prototype.distanceSqr=function(v){var x=this.x-v.x;var y=this.y-v.y;return x*x+y*y;};Point.prototype.equals=function(toCompare){return this.x==toCompare.x&&this.y==toCompare.y;};Point.prototype.interpolate=function(v,f){return new Point((this.x+v.x)*f,(this.y+v.y)*f);};Point.prototype.length=function(){return Math.sqrt(this.x*this.x+this.y*this.y);};Point.prototype.normalize=function(thickness){var l=this.length();this.x=this.x/l*thickness;this.y=this.y/l*thickness;return new Point(this.x,this.y);};Point.prototype.normalizeCopy=function(thickness){var l=this.length();return new Point(this.x/l*thickness,this.y/l*thickness);};Point.prototype.orbit=function(origin,arcWidth,arcHeight,degrees){var radians=degrees*(Math.PI/180);this.x=origin.x+arcWidth*Math.cos(radians);this.y=origin.y+arcHeight*Math.sin(radians);};Point.prototype.rotate=function(center,degrees){var radians=degrees*(Math.PI/180);offset=this.subtract(center);this.x=offset.x*Math.cos(radians)-offset.y*Math.sin(radians);this.y=offset.x*Math.sin(radians)+offset.y*Math.cos(radians);this.x=this.x+center.x;this.y=this.y+center.y;return this;};Point.prototype.offset=function(dx,dy){this.x+=dx;this.y+=dy;};Point.prototype.subtract=function(v){return new Point(this.x-v.x,this.y-v.y);};Point.prototype.subtractValue=function(value){return new Point(this.x-value,this.y-value);};Point.prototype.multiply=function(value){return new Point(this.x*value,this.y*value);};Point.prototype.toString=function(){return"(x="+this.x+", y="+this.y+")";};Point.prototype.normal=function(){return new Point(-this.y,this.x);};Point.prototype.min=function(point)
 {return new Point(Math.min(this.x,point.x),Math.min(this.y,point.y));};Point.prototype.max=function(point)
 {return new Point(Math.max(this.x,point.x),Math.max(this.y,point.y));};Point.prototype.inverse=function()

script/pages/editor/api/index.js.cache

@@ -1,4 +1,4 @@
-moduleLoader.beginCacheLoading(["/script/shared/utils.js?v=88","/script/entities/graph/api/index.js?v=88","/script/shared/point.js?v=88","/script/entities/edge/api/index.js?v=88","/script/entities/edge/model/BaseEdge.js?v=88","/script/entities/edge/model/EdgeModel.js?v=88","/script/entities/vertex/api/index.js?v=88","/script/entities/vertex/model/BaseVertex.js?v=88","/script/entities/vertex/model/VertexModel.js?v=88","/script/entities/graph/model/Graph.js?v=88","/script/features/draw_graph/api/index.js?v=88","/script/features/draw_graph/model/BaseBackgroundDrawer.js?v=88","/script/features/draw_graph/model/EdgeStyle.js?v=88","/script/features/draw_graph/model/BaseEdgeDrawer.js?v=88","/script/features/draw_graph/model/VertexShape.js?v=88","/script/features/draw_graph/model/VertexStyle.js?v=88","/script/features/draw_graph/model/BaseVertexDrawer.js?v=88","/script/features/algorithms/api/index.js?v=88","/script/features/algorithms/model/Algorithms.js?v=88","/script/features/algorithms/model/BaseTraversal.js?v=88","/script/features/base_handler/index.js?v=88","/script/features/default_handler/index.js?v=88","/script/features/add_vertices_handler/index.js?v=88","/script/features/connect_vertices_handler/index.js?v=88","/script/features/delete_objects_handler/index.js?v=88","/script/features/algorithm_handler/index.js?v=88","/script/features/serialization/api/index.js?v=88","/script/features/serialization/model/GraphMLCreator.js?v=88","/script/features/enum_vertices/EnumVertices.js?v=88","/script/pages/editor/model/texts.js?v=88","/script/pages/editor/model/UndoStack.js?v=88","/script/pages/editor/model/DiskSaveLoad.js?v=88","/script/pages/editor/model/Application.js?v=88","/script/pages/editor/ui/ya_metrika.js?v=88","/script/pages/editor/ui/editor.js?v=88","/script/pages/editor/ui/main.js?v=88",]);{function onloadEditor(){console.log("onload() call");doIncludeAsync([include("shared/canvas2svg.js"),include("features/group_rename_handler/index.js"),include("features/saved_graph_handler/index.js"),include("features/saved_graph_image_handler/index.js"),include("features/show_adjacency_matrix/index.js"),include("features/show_distance_matrix/index.js"),include("features/show_incidence_matrix/index.js"),include("features/setup_background_style/index.js"),include("features/setup_edge_style/index.js"),include("features/setup_vertex_style/index.js"),]);postLoadPage();}
+moduleLoader.beginCacheLoading(["/script/shared/utils.js?v=89","/script/entities/graph/api/index.js?v=89","/script/shared/point.js?v=89","/script/entities/edge/api/index.js?v=89","/script/entities/edge/model/BaseEdge.js?v=89","/script/entities/edge/model/EdgeModel.js?v=89","/script/entities/vertex/api/index.js?v=89","/script/entities/vertex/model/BaseVertex.js?v=89","/script/entities/vertex/model/VertexModel.js?v=89","/script/entities/graph/model/Graph.js?v=89","/script/features/draw_graph/api/index.js?v=89","/script/features/draw_graph/model/BaseBackgroundDrawer.js?v=89","/script/features/draw_graph/model/EdgeStyle.js?v=89","/script/features/draw_graph/model/BaseEdgeDrawer.js?v=89","/script/features/draw_graph/model/VertexShape.js?v=89","/script/features/draw_graph/model/VertexStyle.js?v=89","/script/features/draw_graph/model/BaseVertexDrawer.js?v=89","/script/features/algorithms/api/index.js?v=89","/script/features/algorithms/model/Algorithms.js?v=89","/script/features/algorithms/model/BaseTraversal.js?v=89","/script/features/base_handler/index.js?v=89","/script/features/default_handler/index.js?v=89","/script/features/add_vertices_handler/index.js?v=89","/script/features/connect_vertices_handler/index.js?v=89","/script/features/delete_objects_handler/index.js?v=89","/script/features/algorithm_handler/index.js?v=89","/script/features/serialization/api/index.js?v=89","/script/features/serialization/model/GraphMLCreator.js?v=89","/script/features/enum_vertices/EnumVertices.js?v=89","/script/pages/editor/model/texts.js?v=89","/script/pages/editor/model/UndoStack.js?v=89","/script/pages/editor/model/DiskSaveLoad.js?v=89","/script/pages/editor/model/Application.js?v=89","/script/pages/editor/ui/ya_metrika.js?v=89","/script/pages/editor/ui/editor.js?v=89","/script/pages/editor/ui/main.js?v=89",]);{function onloadEditor(){console.log("onload() call");doIncludeAsync([include("shared/canvas2svg.js"),include("features/group_rename_handler/index.js"),include("features/saved_graph_handler/index.js"),include("features/saved_graph_image_handler/index.js"),include("features/show_adjacency_matrix/index.js"),include("features/show_distance_matrix/index.js"),include("features/show_incidence_matrix/index.js"),include("features/setup_background_style/index.js"),include("features/setup_edge_style/index.js"),include("features/setup_vertex_style/index.js"),]);postLoadPage();}
 let modulDir="pages/editor/";doInclude([include("shared/utils.js"),include("entities/graph/api/index.js"),include("features/draw_graph/api/index.js"),include("features/algorithms/api/index.js"),include("features/base_handler/index.js"),include("features/default_handler/index.js"),include("features/add_vertices_handler/index.js"),include("features/connect_vertices_handler/index.js"),include("features/delete_objects_handler/index.js"),include("features/algorithm_handler/index.js"),include("features/serialization/api/index.js"),include("features/enum_vertices/EnumVertices.js"),include("model/texts.js",modulDir),include("model/UndoStack.js",modulDir),include("model/DiskSaveLoad.js",modulDir),include("model/Application.js",modulDir),include("ui/ya_metrika.js",modulDir),include("ui/editor.js",modulDir),include("ui/main.js",modulDir)],onloadEditor);}
 function gEncodeToHTML(str)
 {if(typeof str!=='string')
@@ -926,7 +926,7 @@ properties[edge.id][$(this).attr('key')]=$(this).text();});});console.log(result
 {var queryString=algorithmName+"=cgiInput&report=xml";otherParams.forEach((param)=>queryString+="&"+param.name+"="+param.value);$.ajax({type:"POST",url:"/"+SiteDir+"cgi-bin/GraphCGI.exe?"+queryString,data:xml,dataType:"text",}).done(function(msg)
 {processResult(msg);});};if(this.app.isSupportEmscripten()){console.log("Use Emscripten");var delimiter="<s\\emscript_split\\s>";var processData=algorithmName+delimiter+xml+
 delimiter+"report"+delimiter+"xml";otherParams.forEach((param)=>processData+=delimiter+param.name+delimiter+param.value);var res={};try{res=this.app.processEmscripten(processData);}
-catch(error){console.log("Error on Emscripten: "+error+"\n"+error.stack);callCGIAlgorithms();return true;}
+catch(error){userAction("emscripten_error_"+algorithmName);console.log("Error on Emscripten: "+error+"\n"+error.stack);callCGIAlgorithms();return true;}
 processResult(res);}else{console.log("Use new CGI");callCGIAlgorithms();}
 return true;}
 BaseAlgorithmEx.prototype.GetNodesPath=function(array,start,count)