HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r13:4680bac36b29

Updated lab name!

Jeandet Alexis -

r13:4680bac36b29 default

parent child

Context file:

r13:4680bac36b29

Expand all files

.hgignore +1 0

             src/plugins/common/.preprocessed.tmp
             *.exe
             src/common/.preprocessed.tmp
+            */.cccc/*
             syntax: regexp
             bin/*

.hgsubstate +1 -1

	@@ -1,1 +1,1
	1	e3a98a04d9ec8685bf222f8d687a614a71927549 src/SocExplorerEngine/PeripheralWidget		1	2c82d72694590cbc2aebb946667f11f60ea89afe src/SocExplorerEngine/PeripheralWidget

build_cfg/socexplorer.pri +1 -1

             metrics_cccc.target = metrics_cccc
-            metrics_cccc.commands = cccc $$SOURCES $$HEADERS
+            metrics_cccc.commands = cccc $(SOURCES) $(HEADERS)
             QMAKE_EXTRA_TARGETS += metrics_cccc

src/PyWdgt/pythonconsole.h +2 -2

             /*------------------------------------------------------------------------------
             --  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
             #include "pythonqtscriptingconsoledandd.h"
             #include <QMainWindow>
             #include "../proxy/socexplorerproxy.h"
-            class LPMONMainWindow;
+            class SocExplorerMainWindow;
             class PythonConsole : public QWidget
             {
                 Q_OBJECT

src/PyWdgt/pythonqtscriptingconsoledandd.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/SOC/registerdata.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/SOC/registerdata.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/SOC/socclk.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/SOC/socclk.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/SOC/socexplorerenumdevice.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/SOC/socexplorerenumdevice.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/SOC/socmodel.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/SOC/socmodel.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/XmlEngine/XMLdata.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/XmlEngine/XMLdata.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/XmlEngine/XMLmodel.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/XmlEngine/XMLmodel.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/engine/socexplorerengine.cpp +8 -1

             /*------------------------------------------------------------------------------
             --  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
                     qDebug()<< QTime::currentTime().toString()+" " + sender->instanceName()+":"+message;
             }
+            void SocExplorerEngine::setLogLevel(int level)
+            {
+                if(!_self)
+                    init();
+                loglvl = level;
+            }

src/SocExplorerEngine/engine/socexplorerengine.h +2 -1

             /*------------------------------------------------------------------------------
             --  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
                  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:

src/SocExplorerEngine/engine/socexplorerxmlfile.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/engine/socexplorerxmlfile.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginManagerWdgt/plugininfoswdgt.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginManagerWdgt/pluginlist.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginManagerWdgt/pluginlist.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginManagerWdgt/plugintree.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginloader/pluginloader.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginloader/pluginscache.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/plugins/genericPySysdriver.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/plugins/socexplorerplugin.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/plugins/socexplorerplugin.h +1 -1

             ╚══════╝ ╚═════╝  ╚═════╝    ╚══════╝╚═╝  ╚═╝╚═╝     ╚══════╝ ╚═════╝ ╚═╝  ╚═╝╚══════╝╚═╝  ╚═╝
             --  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

src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/pluginsInterface/socexplorerplugininterface_global.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/proxy/socexplorerproxy.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/SocExplorerEngine/proxy/socexplorerproxy.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/aboutsocexplorer.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/aboutsocexplorer.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/abstractexecfile.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/abstractexecfile.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/elf/elffile.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/elf/elffile.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/elf/elfinfowdgt.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/elf/elfinfowdgt.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/elf/elfparser.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/elf/elfparser.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/memsizewdgt.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/qhexspinbox.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/qipdialogbox.cpp +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/qipdialogbox.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/common/qsvgicon.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/dockablepluginmanager.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/main.cpp +11 -3

             /*------------------------------------------------------------------------------
             --  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
                 QStringList args= a.arguments();
                 for(int i=0;i<args.count()-1;i++)
                 {
-                    if((args.at(i).compare("&")==0) || (args.at(i).compare("--execute")==0))
+                    if((args.at(i).compare("-e")==0) || (args.at(i).compare("--execute")==0))
                     {
                         scriptToEval = args.at(i+1);
                         if(!QFile::exists(scriptToEval))
                             qDebug() << "Will execute" << scriptToEval;
                         break;
                     }
+                    if((args.at(i).compare("-d")==0) || (args.at(i).compare("--debug-level")==0))
+                    {
+                        bool success;
+                        int lvl;
+                        lvl = args.at(i+1).toInt(&success,10);
+                        if(success)
+                            SocExplorerEngine::setLogLevel(lvl);
+                    }
                 }
-                LPMONMainWindow w(scriptToEval);
+                SocExplorerMainWindow w(scriptToEval);
                 w.show();
                 return a.exec();
             }

src/mainwindow.cpp +17 -17

             /*------------------------------------------------------------------------------
             --  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
             #include "mainwindow.h"
             #include <QDockWidget>
-            LPMONMainWindow::LPMONMainWindow(QString ScriptToEval, QWidget *parent)
+            SocExplorerMainWindow::SocExplorerMainWindow(QString ScriptToEval, QWidget *parent)
                 : QMainWindow(parent)
             {
                 QCoreApplication::setApplicationName("SocExplorer");
             }
-            void LPMONMainWindow::makeObjects(QString ScriptToEval)
+            void SocExplorerMainWindow::makeObjects(QString ScriptToEval)
             {
                 Q_UNUSED(ScriptToEval)
                 this->p_pluginGUIlist = new QList<QDockWidget*>();
             }
-            void LPMONMainWindow::makeLayout()
+            void SocExplorerMainWindow::makeLayout()
             {
                 this->mainWidget->addWidget(pluginsDockContainer);
                 this->mainWidget->addWidget(this->PythonConsoleInst);
             }
-            void LPMONMainWindow::makeConnections()
+            void SocExplorerMainWindow::makeConnections()
             {
                 connect(socexplorerproxy::self(),SIGNAL(clearMenu()),this,SLOT(clearMenu()));
                 connect(this,SIGNAL(translateSig()),socexplorerproxy::self(),SLOT(updateText()));
             }
-            void LPMONMainWindow::launchPluginManager()
+            void SocExplorerMainWindow::launchPluginManager()
             {
                 if(this->pluginManager->isHidden())
             }
-            void LPMONMainWindow::addPluginInterface(QDockWidget *plugin)
+            void SocExplorerMainWindow::addPluginInterface(QDockWidget *plugin)
             {
                 plugin->setAllowedAreas(Qt::AllDockWidgetAreas);
                 this->pluginsDockContainer->addDockWidget(Qt::TopDockWidgetArea,plugin);
             }
-            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"));
             }
-            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();
             }
-            void LPMONMainWindow::createLangMenu()
+            void SocExplorerMainWindow::createLangMenu()
             {
                 this->langMenu = menuBar()->addMenu(tr("&Langue"));
                 this->langActionGrp = new QActionGroup(this);
             }
-            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)
-            void LPMONMainWindow::closeEvent(QCloseEvent *event)
+            void SocExplorerMainWindow::closeEvent(QCloseEvent *event)
             {
                 socexplorerproxy::self()->close();
                 qApp->closeAllWindows();

src/mainwindow.h +4 -4

             /*------------------------------------------------------------------------------
             --  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
             #include "toolbar.h"
             #include "regsExplorer/regsexplorer.h"
-            class LPMONMainWindow : public QMainWindow
+            class SocExplorerMainWindow : public QMainWindow
             {
                 Q_OBJECT
             public:
-                LPMONMainWindow(QString ScriptToEval,QWidget *parent = 0);
+                SocExplorerMainWindow(QString ScriptToEval,QWidget *parent = 0);
-                ~LPMONMainWindow();
+                ~SocExplorerMainWindow();
                 QAction* Quit,*LoadPlugin,*ManagePlugins,*help,*regsManager,*exploreRegs,*about,*translateAction;
                 QActionGroup*langActionGrp;
                 QMenu* FileMenu,*PluginsMenu,*ToolsMenu,*langMenu,*helpMenu;

src/regsExplorer/regsexplorer.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/regsExplorer/regsviewer.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/socexplorer.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/toolbar.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

src/toolbarcontainer.h +1 -1

             /*------------------------------------------------------------------------------
             --  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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages