added auto grabbing status of camera in plugin's context menu

itom-project · Oct 22, 2013 · 24c0a9c · 24c0a9c
1 parent afda90d
commit 24c0a9c
Show file tree

Hide file tree

Showing 8 changed files with 247 additions and 250 deletions.
diff --git a/Qitom/organizer/addInManager.cpp b/Qitom/organizer/addInManager.cpp
@@ -500,7 +500,6 @@ namespace ito
             pluginLoadStatus.messages.append(QPair<ito::tPluginLoadStatusFlag, QString>(ito::plsfWarning, QObject::tr("Plugin %1 (DataIO) already exists. Duplicate rejected.").arg(plugin->objectName())));
             return retWarning;
         }
-
     }
 
     //----------------------------------------------------------------------------------------------------------------------------------
@@ -517,7 +516,6 @@ namespace ito
             pluginLoadStatus.messages.append(QPair<ito::tPluginLoadStatusFlag, QString>(ito::plsfWarning, QObject::tr("Plugin %1 (Actuator) already exists. Duplicate rejected.").arg(plugin->objectName())));
             return retWarning;
         }
-        return retOk;
     }
 
     //----------------------------------------------------------------------------------------------------------------------------------

diff --git a/Qitom/python/pythonPlugins.cpp b/Qitom/python/pythonPlugins.cpp
@@ -859,7 +859,7 @@ template<typename _Tp> PyObject* setParam(_Tp *addInObj, PyObject *args)
         {
             if (!addInObj->isAlive())
             {
-                ret += ito::RetVal(ito::retError, 0, "timeout.");
+                ret += ito::RetVal(ito::retError, 0, QObject::tr("timeout.").toAscii().data());
                 timeout = true;
                 break;
             }