# HG changeset patch # User Jeandet Alexis # Date 2014-03-05 10:37:04 # Node ID 4680bac36b29f5288dd9d9d6851aa2e0b5adac5e # Parent a31c7daed0d6e1ac7937a1e8ed90c0c72df8625a Updated lab name! diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -32,5 +32,6 @@ src/PythonQt/generator/pythonqt_generato src/plugins/common/.preprocessed.tmp *.exe src/common/.preprocessed.tmp +*/.cccc/* syntax: regexp bin/* diff --git a/.hgsubstate b/.hgsubstate --- a/.hgsubstate +++ b/.hgsubstate @@ -1,1 +1,1 @@ -e3a98a04d9ec8685bf222f8d687a614a71927549 src/SocExplorerEngine/PeripheralWidget +2c82d72694590cbc2aebb946667f11f60ea89afe src/SocExplorerEngine/PeripheralWidget diff --git a/build_cfg/socexplorer.pri b/build_cfg/socexplorer.pri --- a/build_cfg/socexplorer.pri +++ b/build_cfg/socexplorer.pri @@ -22,6 +22,6 @@ unix:DESTDIR = $${SOCEXPLORER_ROOT}/bin/ metrics_cccc.target = metrics_cccc -metrics_cccc.commands = cccc $$SOURCES $$HEADERS +metrics_cccc.commands = cccc $(SOURCES) $(HEADERS) QMAKE_EXTRA_TARGETS += metrics_cccc diff --git a/src/PyWdgt/pythonconsole.h b/src/PyWdgt/pythonconsole.h --- a/src/PyWdgt/pythonconsole.h +++ b/src/PyWdgt/pythonconsole.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ #include "pythonqtscriptingconsoledandd.h" #include #include "../proxy/socexplorerproxy.h" -class LPMONMainWindow; +class SocExplorerMainWindow; class PythonConsole : public QWidget { Q_OBJECT diff --git a/src/PyWdgt/pythonqtscriptingconsoledandd.h b/src/PyWdgt/pythonqtscriptingconsoledandd.h --- a/src/PyWdgt/pythonqtscriptingconsoledandd.h +++ b/src/PyWdgt/pythonqtscriptingconsoledandd.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/SOC/registerdata.cpp b/src/SocExplorerEngine/SOC/registerdata.cpp --- a/src/SocExplorerEngine/SOC/registerdata.cpp +++ b/src/SocExplorerEngine/SOC/registerdata.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/SOC/registerdata.h b/src/SocExplorerEngine/SOC/registerdata.h --- a/src/SocExplorerEngine/SOC/registerdata.h +++ b/src/SocExplorerEngine/SOC/registerdata.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/SOC/socclk.cpp b/src/SocExplorerEngine/SOC/socclk.cpp --- a/src/SocExplorerEngine/SOC/socclk.cpp +++ b/src/SocExplorerEngine/SOC/socclk.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/SOC/socclk.h b/src/SocExplorerEngine/SOC/socclk.h --- a/src/SocExplorerEngine/SOC/socclk.h +++ b/src/SocExplorerEngine/SOC/socclk.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/SOC/socexplorerenumdevice.cpp b/src/SocExplorerEngine/SOC/socexplorerenumdevice.cpp --- a/src/SocExplorerEngine/SOC/socexplorerenumdevice.cpp +++ b/src/SocExplorerEngine/SOC/socexplorerenumdevice.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/SOC/socexplorerenumdevice.h b/src/SocExplorerEngine/SOC/socexplorerenumdevice.h --- a/src/SocExplorerEngine/SOC/socexplorerenumdevice.h +++ b/src/SocExplorerEngine/SOC/socexplorerenumdevice.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/SOC/socmodel.cpp b/src/SocExplorerEngine/SOC/socmodel.cpp --- a/src/SocExplorerEngine/SOC/socmodel.cpp +++ b/src/SocExplorerEngine/SOC/socmodel.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/SOC/socmodel.h b/src/SocExplorerEngine/SOC/socmodel.h --- a/src/SocExplorerEngine/SOC/socmodel.h +++ b/src/SocExplorerEngine/SOC/socmodel.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/XmlEngine/XMLdata.cpp b/src/SocExplorerEngine/XmlEngine/XMLdata.cpp --- a/src/SocExplorerEngine/XmlEngine/XMLdata.cpp +++ b/src/SocExplorerEngine/XmlEngine/XMLdata.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/XmlEngine/XMLdata.h b/src/SocExplorerEngine/XmlEngine/XMLdata.h --- a/src/SocExplorerEngine/XmlEngine/XMLdata.h +++ b/src/SocExplorerEngine/XmlEngine/XMLdata.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/XmlEngine/XMLmodel.cpp b/src/SocExplorerEngine/XmlEngine/XMLmodel.cpp --- a/src/SocExplorerEngine/XmlEngine/XMLmodel.cpp +++ b/src/SocExplorerEngine/XmlEngine/XMLmodel.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/XmlEngine/XMLmodel.h b/src/SocExplorerEngine/XmlEngine/XMLmodel.h --- a/src/SocExplorerEngine/XmlEngine/XMLmodel.h +++ b/src/SocExplorerEngine/XmlEngine/XMLmodel.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/engine/socexplorerengine.cpp b/src/SocExplorerEngine/engine/socexplorerengine.cpp --- a/src/SocExplorerEngine/engine/socexplorerengine.cpp +++ b/src/SocExplorerEngine/engine/socexplorerengine.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -220,5 +220,12 @@ void SocExplorerEngine::message(socexplo qDebug()<< QTime::currentTime().toString()+" " + sender->instanceName()+":"+message; } +void SocExplorerEngine::setLogLevel(int level) +{ + if(!_self) + init(); + loglvl = level; +} + diff --git a/src/SocExplorerEngine/engine/socexplorerengine.h b/src/SocExplorerEngine/engine/socexplorerengine.h --- a/src/SocExplorerEngine/engine/socexplorerengine.h +++ b/src/SocExplorerEngine/engine/socexplorerengine.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -80,6 +80,7 @@ public: static void addSOC(socexplorerplugin* rootPlugin); static void removeSOC(socexplorerplugin* rootPlugin); static void message(socexplorerplugin* sender,const QString& message,int debugLevel=0); + static void setLogLevel(int level); signals: void enumDeviceAdded(socExplorerEnumDevice* device); public slots: diff --git a/src/SocExplorerEngine/engine/socexplorerxmlfile.cpp b/src/SocExplorerEngine/engine/socexplorerxmlfile.cpp --- a/src/SocExplorerEngine/engine/socexplorerxmlfile.cpp +++ b/src/SocExplorerEngine/engine/socexplorerxmlfile.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/engine/socexplorerxmlfile.h b/src/SocExplorerEngine/engine/socexplorerxmlfile.h --- a/src/SocExplorerEngine/engine/socexplorerxmlfile.h +++ b/src/SocExplorerEngine/engine/socexplorerxmlfile.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.cpp b/src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.cpp --- a/src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.cpp +++ b/src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.h b/src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.h --- a/src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.h +++ b/src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginManagerWdgt/pluginlist.cpp b/src/SocExplorerEngine/pluginManagerWdgt/pluginlist.cpp --- a/src/SocExplorerEngine/pluginManagerWdgt/pluginlist.cpp +++ b/src/SocExplorerEngine/pluginManagerWdgt/pluginlist.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginManagerWdgt/pluginlist.h b/src/SocExplorerEngine/pluginManagerWdgt/pluginlist.h --- a/src/SocExplorerEngine/pluginManagerWdgt/pluginlist.h +++ b/src/SocExplorerEngine/pluginManagerWdgt/pluginlist.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp b/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp --- a/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp +++ b/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h b/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h --- a/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h +++ b/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginManagerWdgt/plugintree.h b/src/SocExplorerEngine/pluginManagerWdgt/plugintree.h --- a/src/SocExplorerEngine/pluginManagerWdgt/plugintree.h +++ b/src/SocExplorerEngine/pluginManagerWdgt/plugintree.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginloader/pluginloader.h b/src/SocExplorerEngine/pluginloader/pluginloader.h --- a/src/SocExplorerEngine/pluginloader/pluginloader.h +++ b/src/SocExplorerEngine/pluginloader/pluginloader.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginloader/pluginscache.h b/src/SocExplorerEngine/pluginloader/pluginscache.h --- a/src/SocExplorerEngine/pluginloader/pluginscache.h +++ b/src/SocExplorerEngine/pluginloader/pluginscache.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/plugins/genericPySysdriver.h b/src/SocExplorerEngine/plugins/genericPySysdriver.h --- a/src/SocExplorerEngine/plugins/genericPySysdriver.h +++ b/src/SocExplorerEngine/plugins/genericPySysdriver.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/plugins/socexplorerplugin.cpp b/src/SocExplorerEngine/plugins/socexplorerplugin.cpp --- a/src/SocExplorerEngine/plugins/socexplorerplugin.cpp +++ b/src/SocExplorerEngine/plugins/socexplorerplugin.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/plugins/socexplorerplugin.h b/src/SocExplorerEngine/plugins/socexplorerplugin.h --- a/src/SocExplorerEngine/plugins/socexplorerplugin.h +++ b/src/SocExplorerEngine/plugins/socexplorerplugin.h @@ -7,7 +7,7 @@ ╚══════╝ ╚═════╝ ╚═════╝ ╚══════╝╚═╝ ╚═╝╚═╝ ╚══════╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ -- This file is a part of the SOC Explorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.cpp b/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.cpp --- a/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.cpp +++ b/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.h b/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.h --- a/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.h +++ b/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the socexplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface_global.h b/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface_global.h --- a/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface_global.h +++ b/src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface_global.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/proxy/socexplorerproxy.cpp b/src/SocExplorerEngine/proxy/socexplorerproxy.cpp --- a/src/SocExplorerEngine/proxy/socexplorerproxy.cpp +++ b/src/SocExplorerEngine/proxy/socexplorerproxy.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/SocExplorerEngine/proxy/socexplorerproxy.h b/src/SocExplorerEngine/proxy/socexplorerproxy.h --- a/src/SocExplorerEngine/proxy/socexplorerproxy.h +++ b/src/SocExplorerEngine/proxy/socexplorerproxy.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/aboutsocexplorer.cpp b/src/aboutsocexplorer.cpp --- a/src/aboutsocexplorer.cpp +++ b/src/aboutsocexplorer.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/aboutsocexplorer.h b/src/aboutsocexplorer.h --- a/src/aboutsocexplorer.h +++ b/src/aboutsocexplorer.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/abstractexecfile.cpp b/src/common/abstractexecfile.cpp --- a/src/common/abstractexecfile.cpp +++ b/src/common/abstractexecfile.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/abstractexecfile.h b/src/common/abstractexecfile.h --- a/src/common/abstractexecfile.h +++ b/src/common/abstractexecfile.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/elf/elffile.cpp b/src/common/elf/elffile.cpp --- a/src/common/elf/elffile.cpp +++ b/src/common/elf/elffile.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/elf/elffile.h b/src/common/elf/elffile.h --- a/src/common/elf/elffile.h +++ b/src/common/elf/elffile.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/elf/elfinfowdgt.cpp b/src/common/elf/elfinfowdgt.cpp --- a/src/common/elf/elfinfowdgt.cpp +++ b/src/common/elf/elfinfowdgt.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/elf/elfinfowdgt.h b/src/common/elf/elfinfowdgt.h --- a/src/common/elf/elfinfowdgt.h +++ b/src/common/elf/elfinfowdgt.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/elf/elfparser.cpp b/src/common/elf/elfparser.cpp --- a/src/common/elf/elfparser.cpp +++ b/src/common/elf/elfparser.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/elf/elfparser.h b/src/common/elf/elfparser.h --- a/src/common/elf/elfparser.h +++ b/src/common/elf/elfparser.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/memsizewdgt.h b/src/common/memsizewdgt.h --- a/src/common/memsizewdgt.h +++ b/src/common/memsizewdgt.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/qhexspinbox.h b/src/common/qhexspinbox.h --- a/src/common/qhexspinbox.h +++ b/src/common/qhexspinbox.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/qipdialogbox.cpp b/src/common/qipdialogbox.cpp --- a/src/common/qipdialogbox.cpp +++ b/src/common/qipdialogbox.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/qipdialogbox.h b/src/common/qipdialogbox.h --- a/src/common/qipdialogbox.h +++ b/src/common/qipdialogbox.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/common/qsvgicon.h b/src/common/qsvgicon.h --- a/src/common/qsvgicon.h +++ b/src/common/qsvgicon.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/dockablepluginmanager.h b/src/dockablepluginmanager.h --- a/src/dockablepluginmanager.h +++ b/src/dockablepluginmanager.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) QStringList args= a.arguments(); for(int i=0;i -LPMONMainWindow::LPMONMainWindow(QString ScriptToEval, QWidget *parent) +SocExplorerMainWindow::SocExplorerMainWindow(QString ScriptToEval, QWidget *parent) : QMainWindow(parent) { QCoreApplication::setApplicationName("SocExplorer"); @@ -39,7 +39,7 @@ LPMONMainWindow::LPMONMainWindow(QString } -void LPMONMainWindow::makeObjects(QString ScriptToEval) +void SocExplorerMainWindow::makeObjects(QString ScriptToEval) { Q_UNUSED(ScriptToEval) this->p_pluginGUIlist = new QList(); @@ -71,7 +71,7 @@ void LPMONMainWindow::makeObjects(QStrin } -void LPMONMainWindow::makeLayout() +void SocExplorerMainWindow::makeLayout() { this->mainWidget->addWidget(pluginsDockContainer); this->mainWidget->addWidget(this->PythonConsoleInst); @@ -82,7 +82,7 @@ void LPMONMainWindow::makeLayout() } -void LPMONMainWindow::makeConnections() +void SocExplorerMainWindow::makeConnections() { connect(socexplorerproxy::self(),SIGNAL(clearMenu()),this,SLOT(clearMenu())); connect(this,SIGNAL(translateSig()),socexplorerproxy::self(),SLOT(updateText())); @@ -108,7 +108,7 @@ void LPMONMainWindow::makeConnections() } -void LPMONMainWindow::launchPluginManager() +void SocExplorerMainWindow::launchPluginManager() { if(this->pluginManager->isHidden()) @@ -119,7 +119,7 @@ void LPMONMainWindow::launchPluginManage } -void LPMONMainWindow::addPluginInterface(QDockWidget *plugin) +void SocExplorerMainWindow::addPluginInterface(QDockWidget *plugin) { plugin->setAllowedAreas(Qt::AllDockWidgetAreas); this->pluginsDockContainer->addDockWidget(Qt::TopDockWidgetArea,plugin); @@ -129,21 +129,21 @@ void LPMONMainWindow::addPluginInterface } -void LPMONMainWindow::removePluginInterface(QDockWidget *plugin) +void SocExplorerMainWindow::removePluginInterface(QDockWidget *plugin) { p_pluginGUIlist->removeOne(plugin); this->pluginsDockContainer->removeDockWidget(plugin); } -void LPMONMainWindow::clearMenu() +void SocExplorerMainWindow::clearMenu() { this->menuBar()->clear(); this->makeMenu(); } -void LPMONMainWindow::makeMenu() +void SocExplorerMainWindow::makeMenu() { this->FileMenu = menuBar()->addMenu(tr("&File")); this->PluginsMenu = menuBar()->addMenu(tr("&Plugins")); @@ -160,14 +160,14 @@ void LPMONMainWindow::makeMenu() } -LPMONMainWindow::~LPMONMainWindow() +SocExplorerMainWindow::~SocExplorerMainWindow() { delete this->p_about; delete this->p_pluginGUIlist; } -void LPMONMainWindow::setLangage(QAction *action) +void SocExplorerMainWindow::setLangage(QAction *action) { QString local = action->data().toString(); QString qmPath = QDir(QString("translations")).absolutePath(); @@ -177,7 +177,7 @@ void LPMONMainWindow::setLangage(QAction } -void LPMONMainWindow::createLangMenu() +void SocExplorerMainWindow::createLangMenu() { this->langMenu = menuBar()->addMenu(tr("&Langue")); this->langActionGrp = new QActionGroup(this); @@ -203,19 +203,19 @@ void LPMONMainWindow::createLangMenu() } -void LPMONMainWindow::updateText() +void SocExplorerMainWindow::updateText() { emit this->translateSig(); } -void LPMONMainWindow::showAboutBox() +void SocExplorerMainWindow::showAboutBox() { p_about->show(); } -void LPMONMainWindow::pluginselected(const QString &instanceName) +void SocExplorerMainWindow::pluginselected(const QString &instanceName) { socexplorerplugin* drv=socexplorerproxy::self()->getSysDriver(instanceName); if(drv) @@ -224,7 +224,7 @@ void LPMONMainWindow::pluginselected(con -void LPMONMainWindow::closeEvent(QCloseEvent *event) +void SocExplorerMainWindow::closeEvent(QCloseEvent *event) { socexplorerproxy::self()->close(); qApp->closeAllWindows(); diff --git a/src/mainwindow.h b/src/mainwindow.h --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -39,13 +39,13 @@ #include "toolbar.h" #include "regsExplorer/regsexplorer.h" -class LPMONMainWindow : public QMainWindow +class SocExplorerMainWindow : public QMainWindow { Q_OBJECT public: - LPMONMainWindow(QString ScriptToEval,QWidget *parent = 0); - ~LPMONMainWindow(); + SocExplorerMainWindow(QString ScriptToEval,QWidget *parent = 0); + ~SocExplorerMainWindow(); QAction* Quit,*LoadPlugin,*ManagePlugins,*help,*regsManager,*exploreRegs,*about,*translateAction; QActionGroup*langActionGrp; QMenu* FileMenu,*PluginsMenu,*ToolsMenu,*langMenu,*helpMenu; diff --git a/src/regsExplorer/regsexplorer.h b/src/regsExplorer/regsexplorer.h --- a/src/regsExplorer/regsexplorer.h +++ b/src/regsExplorer/regsexplorer.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/regsExplorer/regsviewer.h b/src/regsExplorer/regsviewer.h --- a/src/regsExplorer/regsviewer.h +++ b/src/regsExplorer/regsviewer.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/socexplorer.h b/src/socexplorer.h --- a/src/socexplorer.h +++ b/src/socexplorer.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2013, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/toolbar.h b/src/toolbar.h --- a/src/toolbar.h +++ b/src/toolbar.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/src/toolbarcontainer.h b/src/toolbarcontainer.h --- a/src/toolbarcontainer.h +++ b/src/toolbarcontainer.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------------ -- This file is a part of the SocExplorer Software --- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS +-- Copyright (C) 2012, Plasma Physics Laboratory - CNRS -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by