From: Paul Bignier Date: Mon, 8 Aug 2016 07:41:33 +0000 (+0200) Subject: Xcos MVC: loosen in_ & out_implicit fields X-Git-Tag: 6.0.0~513 X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=8061dccdf6a5aa72f5ddfb99115ee0065ac7136f Xcos MVC: loosen in_ & out_implicit fields * Accept wrongly defined blocks for backward compatibility. Namely, we want to pass CPGE compilation stage Change-Id: I018715b0a6817b24247f25a126a949e08b162d45 --- diff --git a/scilab/modules/scicos/src/cpp/view_scilab/ports_management.hxx b/scilab/modules/scicos/src/cpp/view_scilab/ports_management.hxx index a54e21c..2d18580 100644 --- a/scilab/modules/scicos/src/cpp/view_scilab/ports_management.hxx +++ b/scilab/modules/scicos/src/cpp/view_scilab/ports_management.hxx @@ -341,8 +341,8 @@ bool set_ports_property(const Adaptor& adaptor, const object_properties_t port_k { std::string adapter = adapterName

(port_kind); std::string field = adapterFieldName

(port_kind); - get_or_allocate_logger()->log(LOG_ERROR, _("Wrong value for field %s.%s: %s or %s vector expected.\n"), adapter.data(), field.data(), "'E'", "'I'"); - return false; + get_or_allocate_logger()->log(LOG_WARNING, _("Wrong value for field %s.%s: '%s' unrecognized, only expected '%s' or '%s' vector. Switching to '%s'.\n"), adapter.data(), field.data(), current->get(i), Explicit.c_str(), Implicit.c_str(), Explicit.c_str()); + controller.setObjectProperty(ids[i], PORT, p, false); } } for (i = maxSize; i < ids.size(); ++i) @@ -355,7 +355,7 @@ bool set_ports_property(const Adaptor& adaptor, const object_properties_t port_k default: std::string adapter = adapterName

(port_kind); std::string field = adapterFieldName

(port_kind); - get_or_allocate_logger()->log(LOG_ERROR, _("Wrong type for field %s.%s .\n"), adapter.data(), field.data()); + get_or_allocate_logger()->log(LOG_ERROR, _("Wrong type for field %s.%s.\n"), adapter.data(), field.data()); return false; } }