Fixed the names of datatip functions. 24/15024/3
Vladislav TRUBKIN [Mon, 11 Aug 2014 15:52:13 +0000 (17:52 +0200)]
*sci_datatip_set_interp should check from zero to one output
argument.

Change-Id: Idbcc8729e5139e41e2148b5b2e3ff60202195a35

scilab/modules/gui/sci_gateway/cpp/gui_gw.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_interp.cpp

index 928e1ad..bea40e1 100644 (file)
@@ -78,13 +78,13 @@ int GuiModule::Load()
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipCreate", &sci_datatipcreate, &GuiModule::LoadDeps, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipRemove", &sci_datatipremove, &GuiModule::LoadDeps, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"plotbrowser", &sci_plotbrowser, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatip_manager_mode", &sci_datatip_manager_mode, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatip_toggle", &sci_datatip_toggle, &GuiModule::LoadDeps, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipManagerMode", &sci_datatip_manager_mode, &GuiModule::LoadDeps, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipToggle", &sci_datatip_toggle, &GuiModule::LoadDeps, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipMove", &sci_datatipmove, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatip_set_style", &sci_datatip_set_style, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatip_set_display", &sci_datatip_set_display, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatip_set_interp", &sci_datatip_set_interp, &GuiModule::LoadDeps, MODULE_NAME));
-    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatip_set_orient", &sci_datatip_set_orient, &GuiModule::LoadDeps, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipSetStyle", &sci_datatip_set_style, &GuiModule::LoadDeps, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipSetDisplay", &sci_datatip_set_display, &GuiModule::LoadDeps, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipSetInterp", &sci_datatip_set_interp, &GuiModule::LoadDeps, MODULE_NAME));
+    symbol::Context::getInstance()->addFunction(Function::createFunction(L"datatipSetOrient", &sci_datatip_set_orient, &GuiModule::LoadDeps, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"figure", &sci_figure, &GuiModule::LoadDeps, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"saveGui", &sci_saveGui, &GuiModule::LoadDeps, MODULE_NAME));
     symbol::Context::getInstance()->addFunction(Function::createFunction(L"loadGui", &sci_loadGui, &GuiModule::LoadDeps, MODULE_NAME));
index f939620..d895a3f 100644 (file)
@@ -40,7 +40,7 @@ int sci_datatip_set_interp(char *fname, void* pvApiCtx)
 
     SciErr sciErr;
     CheckInputArgument(pvApiCtx, 2, 2);
-    CheckOutputArgument(pvApiCtx, 0, 0);
+    CheckOutputArgument(pvApiCtx, 0, 1);
 
     if (nbInputArgument(pvApiCtx) == 2)
     {