소스 검색

Finished improves and bug fixes

Igor 4 년 전
부모
커밋
f51b742269
8개의 변경된 파일153개의 추가작업 그리고 95개의 파일을 삭제
  1. 3 1
      css/ivprog-visual-1.0.css
  2. 1 0
      i18n/en/ui.json
  3. 1 0
      i18n/es/ui.json
  4. 1 0
      i18n/pt/ui.json
  5. 1 1
      js/visualUI/commands/attribution.js
  6. 55 31
      js/visualUI/functions.js
  7. 46 30
      js/visualUI/globals.js
  8. 45 32
      js/visualUI/variables.js

+ 3 - 1
css/ivprog-visual-1.0.css

@@ -484,8 +484,10 @@ div.function_name_div_updated:active,
 }
 
 .character_equals {
-	vertical-align: sub;
     font-size: 150%;
+    display: inline;
+    margin-left: 3px;
+    margin-right: -2px;
 }
 
 .yellow.icon.times.remove_global,

+ 1 - 0
i18n/en/ui.json

@@ -25,6 +25,7 @@
   "new_variable": "variable",
   "new_global": "global",
   "new_function": "new_function",
+  "matrix": "matrix",
   "vector": "vector",
   "text_comment_start": "Initial comment of function...",
   "text_comment_main": "This is the main function...",

+ 1 - 0
i18n/es/ui.json

@@ -25,6 +25,7 @@
   "new_variable": "variable",
   "new_global": "global",
   "new_function": "new_function",
+  "matrix": "matrix",
   "vector": "vector",
   "text_comment_start": "Initial comment of function...",
   "text_comment_main": "This is the main function...",

+ 1 - 0
i18n/pt/ui.json

@@ -28,6 +28,7 @@
   "new_variable": "variavel",
   "new_global": "global",
   "new_function": "nova_funcao",
+  "matrix": "matriz",
   "vector": "vetor",
   "text_comment_start": "Comentário inicial da função...",
   "text_comment_main": "Esta é a função principal...",

+ 1 - 1
js/visualUI/commands/attribution.js

@@ -6,7 +6,7 @@ import * as CommandsManagement from '../commands';
 import * as ExpressionManagement from './generic_expression';
 
 export function createFloatingCommand () {
-	return $('<div class="ui attribution created_element"> <i class="ui icon small arrow left"></i> <span> x = 1 + 1 </span></div>');
+	return $('<div class="ui attribution created_element"> <i class="ui icon small arrow left"></i> <span> x <&#8212; 1 + 1 </span></div>');
 }
 
 export function renderCommand (command, function_obj) {

+ 55 - 31
js/visualUI/functions.js

@@ -194,7 +194,7 @@ function addHandlers (function_obj, function_container) {
       selectOnKeydown: false
   });
 
-  function_container.find( ".name_function_updated" ).on('click', function(e){
+  function_container.find( ".function_name_div" ).on('click', function(e){
     enableNameFunctionUpdate(function_obj, function_container);
   });
 
@@ -252,38 +252,48 @@ function renderFunctionReturn (function_obj, function_element) {
 
   var ret = '<div class="ui dropdown function_return">';
     
-    if (function_obj.return_dimensions > 0) {
-      ret += '<div class="text">'+ LocalizedStrings.getUI("vector") +':'+ LocalizedStrings.getUI(function_obj.return_type);
-      if (function_obj.return_dimensions == 1) {
-        ret += ' [ ] ';
-      } else {
-        ret += ' [ ] [ ] ';
-      }
-      ret += '</div>';
+    if (function_obj.return_dimensions == 1) {
+      ret += '<div class="text">'+ LocalizedStrings.getUI("vector") +': '+ LocalizedStrings.getUI(function_obj.return_type);
+      ret += ' [ ] </div>';
+    } else if (function_obj.return_dimensions == 2) {
+      ret += '<div class="text">'+ LocalizedStrings.getUI("matrix") +': '+ LocalizedStrings.getUI(function_obj.return_type);
+      ret += ' [ ] [ ] </div>';
     } else {
       ret += '<div class="text">'+LocalizedStrings.getUI(function_obj.return_type)+'</div>';
     }
 
     ret += '<div class="menu">';
 
+    for (var tm in Types) {
+      ret += '<div class="item ' + (function_obj.return_type == tm.toLowerCase() && function_obj.return_dimensions < 1 ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+    }
+
+    ret += '<div class="item ' + (function_obj.return_dimensions == 1 ? ' selected ' : '') + '">'
+      + '<i class="dropdown icon"></i>' + LocalizedStrings.getUI('vector')
+      +  '<div class="menu">';
 
     for (var tm in Types) {
-      ret += '<div class="item ' + (function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions < 1 ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+      if (tm == Types.VOID.toUpperCase()) {
+        continue;
+      }
+
+      ret += '<div class="item ' + (function_obj.return_type == tm.toLowerCase() &&  function_obj.return_dimensions == 1 ? ' selected ' : '') + '" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1"> '+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
     }
+    ret += '</div></div>';
+
+
+    ret += '<div class="item ' + (function_obj.return_dimensions == 2 ? ' selected ' : '') + '">'
+      + '<i class="dropdown icon"></i>' + LocalizedStrings.getUI('matrix')
+      +  '<div class="menu">';
 
     for (var tm in Types) {
       if (tm == Types.VOID.toUpperCase()) {
         continue;
       }
-      ret += '<div class="item">'
-        + '<i class="dropdown icon"></i>'
-        +  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())
-          +  '<div class="menu">'
-            + '<div class="item '+(function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions > 0 ? ' selected ' : '')+'" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
-            + '<div class="item '+(function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions > 0 ? ' selected ' : '')+'" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
-          +  '</div>'
-        + '</div>'; 
+
+      ret += '<div class="item ' + (function_obj.return_type == tm.toLowerCase() &&  function_obj.return_dimensions == 2 ? ' selected ' : '') + '" data-text="'+ LocalizedStrings.getUI('matrix')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="2"> '+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
     }
+    ret += '</div></div>';
 
     ret += '</div></div>';
 
@@ -1089,22 +1099,36 @@ function renderParameter (function_obj, parameter_obj, function_container) {
       if (tm == Types.VOID.toUpperCase()) {
         continue;
       }
-      ret += '<div class="item ' + (parameter_obj.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+      ret += '<div class="item ' + (parameter_obj.type == tm.toLowerCase() && parameter_obj.dimensions == 0 ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
   }
 
-  for (const tm in Types) {
-    if (tm == Types.VOID.toUpperCase()) {
-      continue;
+
+  ret += '<div class="item ' + (parameter_obj.dimensions == 1 ? ' selected ' : '') + '">'
+    + '<i class="dropdown icon"></i>' + LocalizedStrings.getUI('vector')
+    +  '<div class="menu">';
+
+  for (var tm in Types) {
+      if (tm == Types.VOID.toUpperCase()) {
+        continue;
+      }
+
+      ret += '<div class="item ' + (parameter_obj.type == tm.toLowerCase() &&  parameter_obj.dimensions == 1 ? ' selected ' : '') + '" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1"> '+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
     }
-    ret += '<div class="item">'
-      + '<i class="dropdown icon"></i>'
-      +  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())
-        +  '<div class="menu">'
-          + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
-          + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
-        +  '</div>'
-      + '</div>'; 
+  ret += '</div></div>';
+
+
+  ret += '<div class="item ' + (parameter_obj.dimensions == 2 ? ' selected ' : '') + '">'
+    + '<i class="dropdown icon"></i>' + LocalizedStrings.getUI('matrix')
+    +  '<div class="menu">';
+
+  for (var tm in Types) {
+      if (tm == Types.VOID.toUpperCase()) {
+        continue;
+      }
+
+      ret += '<div class="item ' + (parameter_obj.type == tm.toLowerCase() &&  parameter_obj.dimensions == 2 ? ' selected ' : '') + '" data-text="'+ LocalizedStrings.getUI('matrix')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="2"> '+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
   }
+  ret += '</div></div>';
 
   ret += '</div></div>';
 
@@ -1131,7 +1155,7 @@ function renderParameter (function_obj, parameter_obj, function_container) {
     selectOnKeydown: false
   });
 
-  ret.find('.label_enable_name_parameter').on('click', function(e){
+  ret.find('.parameter_div_edit').on('click', function(e){
     registerUserEvent(function_obj.name, ActionTypes.ENTER_CHANGE_PARAM_NAME, parameter_obj.name);
     enableNameParameterUpdate(parameter_obj, ret, function_obj);
   });

+ 46 - 30
js/visualUI/globals.js

@@ -8,7 +8,7 @@ var counter_new_globals = 0;
 
 export function addGlobal (program, is_from_click = false) {
 
-	var new_global = new Models.Variable(Types.INTEGER, LocalizedStrings.getUI('new_global') + '_' + counter_new_globals, 1);
+	var new_global = new Models.Variable(Types.INTEGER, LocalizedStrings.getUI('new_global') + '_' + counter_new_globals, 0);
 	counter_new_globals ++;
 
 	program.addGlobal(new_global);
@@ -87,25 +87,25 @@ function removeGlobal (global_var, global_container) {
 function updateInitialValues (global_var) {
 	if (global_var.type == Types.INTEGER) {
 		if (global_var.dimensions == 0) {
-			global_var.value = 1;
+			global_var.value = 0;
 		}
 		if (global_var.dimensions == 1) {
-			global_var.value = [1, 1];
+			global_var.value = [0, 0];
 		}
 		if (global_var.dimensions == 2) {
-			global_var.value = [[1, 1], [1, 1]];
+			global_var.value = [[0, 0], [0, 0]];
 		}
 	}
 
 	if (global_var.type == Types.REAL) {
 		if (global_var.dimensions == 0) {
-			global_var.value = 1.0;
+			global_var.value = 0.0;
 		}
 		if (global_var.dimensions == 1) {
-			global_var.value = [1.0, 1.0];
+			global_var.value = [0.0, 0.0];
 		}
 		if (global_var.dimensions == 2) {
-			global_var.value = [[1.0, 1.0], [1.0, 1.0]];
+			global_var.value = [[0.0, 0.0], [0.0, 0.0]];
 		}
 	}
 
@@ -160,10 +160,10 @@ function addGlobalColumnVector (global_var) {
 	global_var.columns ++;
 
 	if (global_var.type == Types.INTEGER) {
-		global_var.value.push(1);
+		global_var.value.push(0);
 	}
 	if (global_var.type == Types.REAL) {
-		global_var.value.push(1.0);
+		global_var.value.push(0.0);
 	}
 	if (global_var.type == Types.TEXT) {
 		global_var.value.push(LocalizedStrings.getUI('text_start'));
@@ -190,12 +190,12 @@ function addColumnGlobalMatrix (global_var) {
 
 	if (global_var.type == Types.INTEGER) {
 		for (var i = 0; i < global_var.rows; i++) {
-			global_var.value[i].push(1);
+			global_var.value[i].push(0);
 		}
 	}
 	if (global_var.type == Types.REAL) {
 		for (var i = 0; i < global_var.rows; i++) {
-			global_var.value[i].push(1.0);
+			global_var.value[i].push(0.0);
 		}
 	}
 	if (global_var.type == Types.TEXT) {
@@ -225,14 +225,14 @@ function addLineGlobalMatrix (global_var) {
 	if (global_var.type == Types.INTEGER) {
 		var n_l = [];
 		for (var i = 0; i < global_var.columns; i++) {
-			n_l.push(1);
+			n_l.push(0);
 		}
 		global_var.value.push(n_l);
 	}
 	if (global_var.type == Types.REAL) {
 		var n_l = [];
 		for (i = 0; i < global_var.columns; i++) {
-			n_l.push(1.0);
+			n_l.push(0.0);
 		}
 		global_var.value.push(n_l);
 	}
@@ -436,7 +436,7 @@ function addHandlers (global_container) {
 	});
 
 	// Manage global name: 
-	global_container.find( ".enable_edit_name_parameter" ).on('click', function(e){
+	global_container.find( ".editing_name_var" ).on('click', function(e){
 		registerUserEvent(global_var.name, ActionTypes.ENTER_CHANGE_GLOBAL_NAME);
 		enableNameUpdate(global_container);
 	});
@@ -485,11 +485,13 @@ export function renderGlobal (global_var) {
  	
  	element += '<div class="ui dropdown global_type">';
 
-  	if (global_var.dimensions > 0) {
-  		element += '<div class="text">'+ LocalizedStrings.getUI('vector')+ ':' + LocalizedStrings.getUI(global_var.type);
-  		for (var i = 0; i < global_var.dimensions; i ++) {
-  			element += ' [ <span class="dimensions_'+i+'"></span> ] ';
-  		}
+  	if (global_var.dimensions == 1) {
+  		element += '<div class="text">'+ LocalizedStrings.getUI('vector')+ ': ' + LocalizedStrings.getUI(global_var.type);
+  		element += ' [ <span class="dimensions_0"></span> ] ';
+  		element += '</div>';
+  	} else if (global_var.dimensions == 2) {
+  		element += '<div class="text">'+ LocalizedStrings.getUI('matrix')+ ': ' + LocalizedStrings.getUI(global_var.type);
+  		element += ' [ <span class="dimensions_0"></span> ] [ <span class="dimensions_1"></span> ] ';
   		element += '</div>';
   	} else {
   		element += '<div class="text">' + LocalizedStrings.getUI(global_var.type.toLowerCase()) + '</div>';
@@ -500,24 +502,38 @@ export function renderGlobal (global_var) {
   		if (tm == Types.VOID.toUpperCase()) {
   			continue;
   		}
-  		element += '<div class="item ' + (global_var.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+  		element += '<div class="item ' + (global_var.type == tm.toLowerCase() && global_var.dimensions == 0 ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
 	}
 
-  	for (var tm in Types) {
+
+	element += '<div class="item ' + (global_var.dimensions == 1 ? ' selected ' : '') + '">'
+		+ '<i class="dropdown icon"></i>' + LocalizedStrings.getUI('vector')
+		+  '<div class="menu">';
+
+	for (var tm in Types) {
   		if (tm == Types.VOID.toUpperCase()) {
   			continue;
   		}
-  		element += '<div class="item">'
-	    	+ '<i class="dropdown icon"></i>'
-	    	+  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())
-	      	+  '<div class="menu">'
-		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
-		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
-	      	+  '</div>'
-	    	+ '</div>';	
+
+  		element += '<div class="item ' + (global_var.type == tm.toLowerCase() &&  global_var.dimensions == 1 ? ' selected ' : '') + '" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1"> '+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+  	}
+	element += '</div></div>';
+
+
+	element += '<div class="item ' + (global_var.dimensions == 2 ? ' selected ' : '') + '">'
+		+ '<i class="dropdown icon"></i>' + LocalizedStrings.getUI('matrix')
+		+  '<div class="menu">';
+
+	for (var tm in Types) {
+  		if (tm == Types.VOID.toUpperCase()) {
+  			continue;
+  		}
+
+  		element += '<div class="item ' + (global_var.type == tm.toLowerCase() &&  global_var.dimensions == 2 ? ' selected ' : '') + '" data-text="'+ LocalizedStrings.getUI('matrix')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="2"> '+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
   	}
+	element += '</div></div>';
 
-    element += '</div></div> <div class="editing_name_var"> <span class="span_name_variable enable_edit_name_parameter">'+global_var.name+'</span> </div> <span class="character_equals"> = </span> ';
+    element += '</div></div> <div class="editing_name_var"> <span class="span_name_variable enable_edit_name_parameter">'+global_var.name+'</span> </div> <span class="character_equals"> <&#8212; </span> ';
 
 	element += '<div class="ui div_valor_var">'+global_var.value+'</div>';    
 

+ 45 - 32
js/visualUI/variables.js

@@ -7,7 +7,7 @@ import { registerUserEvent, registerSystemEvent, ActionTypes } from "./../servic
 var counter_new_variables = 0;
 
 export function addVariable (function_obj, function_container, is_in_click = false) {
-	var new_var = new Models.Variable(Types.INTEGER, LocalizedStrings.getUI('new_variable') + '_' + counter_new_variables, 1);
+	var new_var = new Models.Variable(Types.INTEGER, LocalizedStrings.getUI('new_variable') + '_' + counter_new_variables, 0);
 	if (function_obj.variables_list == null) {
 		function_obj.variables_list = [];
 	}
@@ -99,7 +99,7 @@ function updateType (variable_obj, new_type, function_name, new_dimensions = 0)
 function addHandlers (variable_obj, variable_container, function_obj) {
 
 	// Manage variable name: 
-	variable_container.find( ".enable_edit_name_variable" ).on('click', function(e){
+	variable_container.find( ".editing_name_var" ).on('click', function(e){
 		registerUserEvent(function_obj.name, ActionTypes.ENTER_CHANGE_VAR_NAME, variable_obj.name);
 		enableNameUpdate(variable_obj, variable_container, function_obj);
 	});
@@ -125,19 +125,18 @@ function addHandlers (variable_obj, variable_container, function_obj) {
 
 }
 
-
 export function renderVariable (function_container, new_var, function_obj) {
 
 	var element = '<div class="ui label variable_container pink"><i class="ui icon ellipsis vertical inverted"></i>';
 
 	element += '<div class="ui dropdown variable_type">';
 
-  	if (new_var.dimensions > 0) {
-  		element += '<div class="text">'+ LocalizedStrings.getUI('vector') + ':' + LocalizedStrings.getUI(new_var.type.toLowerCase());
-  		for (var i = 0; i < new_var.dimensions; i ++) {
-  			element += ' [ ] ';
-  		}
-  		element += '</div>';
+  	if (new_var.dimensions == 1) {
+  		element += '<div class="text">'+ LocalizedStrings.getUI('vector') + ': ' + LocalizedStrings.getUI(new_var.type.toLowerCase());
+  		element += ' [ ] </div>';
+  	} else if (new_var.dimensions == 2) {
+  		element += '<div class="text">'+ LocalizedStrings.getUI('matrix') + ': ' + LocalizedStrings.getUI(new_var.type.toLowerCase());
+  		element += ' [ ] [ ] </div>';
   	} else {
   		element += '<div class="text">' + LocalizedStrings.getUI(new_var.type.toLowerCase()) + '</div>';
   	}
@@ -147,28 +146,42 @@ export function renderVariable (function_container, new_var, function_obj) {
   		if (tm == Types.VOID.toUpperCase()) {
   			continue;
   		}
-  		element += '<div class="item ' + (new_var.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+  		element += '<div class="item ' + (new_var.type == tm.toLowerCase() &&  new_var.dimensions == 0 ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
 	}
 
-  	for (var tm in Types) {
+
+	element += '<div class="item ' + (new_var.dimensions == 1 ? ' selected ' : '') + '">'
+		+ '<i class="dropdown icon"></i>' + LocalizedStrings.getUI('vector')
+		+  '<div class="menu">';
+
+	for (var tm in Types) {
   		if (tm == Types.VOID.toUpperCase()) {
   			continue;
   		}
-  		element += '<div class="item">'
-  			+ '<i class="dropdown icon"></i>'
-	    	+  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())
-	      	+  '<div class="menu">'
-		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
-		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
-	      	+  '</div>'
-	    	+ '</div>';	
+
+  		element += '<div class="item ' + (new_var.type == tm.toLowerCase() &&  new_var.dimensions == 1 ? ' selected ' : '') + '" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1"> '+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+  	}
+	element += '</div></div>';
+
+
+	element += '<div class="item ' + (new_var.dimensions == 2 ? ' selected ' : '') + '">'
+		+ '<i class="dropdown icon"></i>' + LocalizedStrings.getUI('matrix')
+		+  '<div class="menu">';
+
+	for (var tm in Types) {
+  		if (tm == Types.VOID.toUpperCase()) {
+  			continue;
+  		}
+
+  		element += '<div class="item ' + (new_var.type == tm.toLowerCase() &&  new_var.dimensions == 2 ? ' selected ' : '') + '" data-text="'+ LocalizedStrings.getUI('matrix')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="2"> '+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
   	}
+	element += '</div></div>';
 
     element += '</div></div> ';
 
     element += '<div class="editing_name_var"><span class="span_name_variable enable_edit_name_variable">'+new_var.name+'</span> </div>';
 
-	element += ' <span class="character_equals"> = </span> <div class="ui div_valor_var">'+new_var.value+'</div>';    
+	element += ' <span class="character_equals"> <&#8212; </span> <div class="ui div_valor_var">'+new_var.value+'</div>';    
 
 	element += ' <i class="yellow inverted icon times remove_variable"></i></div>';
 
@@ -378,14 +391,14 @@ function addLineMatrix (var_obj) {
 	if (var_obj.type == Types.INTEGER) {
 		var n_l = [];
 		for (var i = 0; i < var_obj.columns; i++) {
-			n_l.push(1);
+			n_l.push(0);
 		}
 		var_obj.value.push(n_l);
 	}
 	if (var_obj.type == Types.REAL) {
 		var n_l = [];
 		for (i = 0; i < var_obj.columns; i++) {
-			n_l.push(1.0);
+			n_l.push(0.0);
 		}
 		var_obj.value.push(n_l);
 	}
@@ -421,12 +434,12 @@ function addColumnMatrix (var_obj) {
 
 	if (var_obj.type == Types.INTEGER) {
 		for (var i = 0; i < var_obj.rows; i++) {
-			var_obj.value[i].push(1);
+			var_obj.value[i].push(0);
 		}
 	}
 	if (var_obj.type == Types.REAL) {
 		for (var i = 0; i < var_obj.rows; i++) {
-			var_obj.value[i].push(1.0);
+			var_obj.value[i].push(0.0);
 		}
 	}
 	if (var_obj.type == Types.TEXT) {
@@ -457,10 +470,10 @@ function addColumnVector (var_obj) {
 	var_obj.columns ++;
 
 	if (var_obj.type == Types.INTEGER) {
-		var_obj.value.push(1);
+		var_obj.value.push(0);
 	}
 	if (var_obj.type == Types.REAL) {
-		var_obj.value.push(1.0);
+		var_obj.value.push(0.0);
 	}
 	if (var_obj.type == Types.TEXT) {
 		var_obj.value.push(LocalizedStrings.getUI('text_start'));
@@ -492,25 +505,25 @@ function alternateBooleanVectorValue (var_obj, index, value_container) {
 function updateInitialValues (variable_obj, function_name) {
 	if (variable_obj.type == Types.INTEGER) {
 		if (variable_obj.dimensions == 0) {
-			variable_obj.value = 1;
+			variable_obj.value = 0;
 		}
 		if (variable_obj.dimensions == 1) {
-			variable_obj.value = [1, 1];
+			variable_obj.value = [0, 0];
 		}
 		if (variable_obj.dimensions == 2) {
-			variable_obj.value = [[1, 1], [1, 1]];
+			variable_obj.value = [[0, 0], [0, 0]];
 		}
 	}
 
 	if (variable_obj.type == Types.REAL) {
 		if (variable_obj.dimensions == 0) {
-			variable_obj.value = 1.0;
+			variable_obj.value = 0.0;
 		}
 		if (variable_obj.dimensions == 1) {
-			variable_obj.value = [1.0, 1.0];
+			variable_obj.value = [0.0, 0.0];
 		}
 		if (variable_obj.dimensions == 2) {
-			variable_obj.value = [[1.0, 1.0], [1.0, 1.0]];
+			variable_obj.value = [[0.0, 0.0], [0.0, 0.0]];
 		}
 	}