|
@@ -7,7 +7,7 @@ import { registerUserEvent, registerSystemEvent, ActionTypes } from "./../servic
|
|
var counter_new_variables = 0;
|
|
var counter_new_variables = 0;
|
|
|
|
|
|
export function addVariable (function_obj, function_container, is_in_click = false) {
|
|
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) {
|
|
if (function_obj.variables_list == null) {
|
|
function_obj.variables_list = [];
|
|
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) {
|
|
function addHandlers (variable_obj, variable_container, function_obj) {
|
|
|
|
|
|
// Manage variable name:
|
|
// 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);
|
|
registerUserEvent(function_obj.name, ActionTypes.ENTER_CHANGE_VAR_NAME, variable_obj.name);
|
|
enableNameUpdate(variable_obj, variable_container, function_obj);
|
|
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) {
|
|
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>';
|
|
var element = '<div class="ui label variable_container pink"><i class="ui icon ellipsis vertical inverted"></i>';
|
|
|
|
|
|
element += '<div class="ui dropdown variable_type">';
|
|
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 {
|
|
} else {
|
|
element += '<div class="text">' + LocalizedStrings.getUI(new_var.type.toLowerCase()) + '</div>';
|
|
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()) {
|
|
if (tm == Types.VOID.toUpperCase()) {
|
|
continue;
|
|
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()) {
|
|
if (tm == Types.VOID.toUpperCase()) {
|
|
continue;
|
|
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></div> ';
|
|
|
|
|
|
element += '<div class="editing_name_var"><span class="span_name_variable enable_edit_name_variable">'+new_var.name+'</span> </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"> <— </span> <div class="ui div_valor_var">'+new_var.value+'</div>';
|
|
|
|
|
|
element += ' <i class="yellow inverted icon times remove_variable"></i></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) {
|
|
if (var_obj.type == Types.INTEGER) {
|
|
var n_l = [];
|
|
var n_l = [];
|
|
for (var i = 0; i < var_obj.columns; i++) {
|
|
for (var i = 0; i < var_obj.columns; i++) {
|
|
- n_l.push(1);
|
|
|
|
|
|
+ n_l.push(0);
|
|
}
|
|
}
|
|
var_obj.value.push(n_l);
|
|
var_obj.value.push(n_l);
|
|
}
|
|
}
|
|
if (var_obj.type == Types.REAL) {
|
|
if (var_obj.type == Types.REAL) {
|
|
var n_l = [];
|
|
var n_l = [];
|
|
for (i = 0; i < var_obj.columns; i++) {
|
|
for (i = 0; i < var_obj.columns; i++) {
|
|
- n_l.push(1.0);
|
|
|
|
|
|
+ n_l.push(0.0);
|
|
}
|
|
}
|
|
var_obj.value.push(n_l);
|
|
var_obj.value.push(n_l);
|
|
}
|
|
}
|
|
@@ -421,12 +434,12 @@ function addColumnMatrix (var_obj) {
|
|
|
|
|
|
if (var_obj.type == Types.INTEGER) {
|
|
if (var_obj.type == Types.INTEGER) {
|
|
for (var i = 0; i < var_obj.rows; i++) {
|
|
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) {
|
|
if (var_obj.type == Types.REAL) {
|
|
for (var i = 0; i < var_obj.rows; i++) {
|
|
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) {
|
|
if (var_obj.type == Types.TEXT) {
|
|
@@ -457,10 +470,10 @@ function addColumnVector (var_obj) {
|
|
var_obj.columns ++;
|
|
var_obj.columns ++;
|
|
|
|
|
|
if (var_obj.type == Types.INTEGER) {
|
|
if (var_obj.type == Types.INTEGER) {
|
|
- var_obj.value.push(1);
|
|
|
|
|
|
+ var_obj.value.push(0);
|
|
}
|
|
}
|
|
if (var_obj.type == Types.REAL) {
|
|
if (var_obj.type == Types.REAL) {
|
|
- var_obj.value.push(1.0);
|
|
|
|
|
|
+ var_obj.value.push(0.0);
|
|
}
|
|
}
|
|
if (var_obj.type == Types.TEXT) {
|
|
if (var_obj.type == Types.TEXT) {
|
|
var_obj.value.push(LocalizedStrings.getUI('text_start'));
|
|
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) {
|
|
function updateInitialValues (variable_obj, function_name) {
|
|
if (variable_obj.type == Types.INTEGER) {
|
|
if (variable_obj.type == Types.INTEGER) {
|
|
if (variable_obj.dimensions == 0) {
|
|
if (variable_obj.dimensions == 0) {
|
|
- variable_obj.value = 1;
|
|
|
|
|
|
+ variable_obj.value = 0;
|
|
}
|
|
}
|
|
if (variable_obj.dimensions == 1) {
|
|
if (variable_obj.dimensions == 1) {
|
|
- variable_obj.value = [1, 1];
|
|
|
|
|
|
+ variable_obj.value = [0, 0];
|
|
}
|
|
}
|
|
if (variable_obj.dimensions == 2) {
|
|
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.type == Types.REAL) {
|
|
if (variable_obj.dimensions == 0) {
|
|
if (variable_obj.dimensions == 0) {
|
|
- variable_obj.value = 1.0;
|
|
|
|
|
|
+ variable_obj.value = 0.0;
|
|
}
|
|
}
|
|
if (variable_obj.dimensions == 1) {
|
|
if (variable_obj.dimensions == 1) {
|
|
- variable_obj.value = [1.0, 1.0];
|
|
|
|
|
|
+ variable_obj.value = [0.0, 0.0];
|
|
}
|
|
}
|
|
if (variable_obj.dimensions == 2) {
|
|
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]];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|