##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » LPPMON_PLUGINS_PAUL
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/LPPMON_GROUP/LPPMON_PLUGINS_PAUL

Minor bugs corrected in wfdisplay
leroy -
r43:570fea6226a1 default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 #############################################################################
1 #############################################################################
2 # Makefile for building: lfrsgse
2 # Makefile for building: lfrsgse
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Jul 8 14:12:04 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Jul 12 07:38:59 2013
4 # Project: gselesia.pro
4 # Project: gselesia.pro
5 # Template: app
5 # Template: app
6 # Command: /usr/bin/qmake-qt4 -o Makefile gselesia.pro
6 # Command: /usr/bin/qmake-qt4 -o Makefile gselesia.pro
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 #############################################################################
1 #############################################################################
2 # Makefile for building: libwfdisplay.so.1.0.0
2 # Makefile for building: libwfdisplay.so.1.0.0
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Tue Jul 9 12:19:41 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Jul 12 07:38:20 2013
4 # Project: wfdisplay.pro
4 # Project: wfdisplay.pro
5 # Template: lib
5 # Template: lib
6 # Command: /usr/bin/qmake-qt4 -o Makefile wfdisplay.pro
6 # Command: /usr/bin/qmake-qt4 -o Makefile wfdisplay.pro
@@ -301,11 +301,11 moc_qcustomplot.o: moc_qcustomplot.cpp
301
301
302 install_header: first FORCE
302 install_header: first FORCE
303 @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ || $(MKDIR) $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
303 @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/ || $(MKDIR) $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
304 -$(INSTALL_FILE) /home/admin/opt/LPPMON_PLUGINS_PLE/wfdisplay/wfdisplay/wfdisplay.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
304 -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfdisplay.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
305 -$(INSTALL_FILE) /home/admin/opt/LPPMON_PLUGINS_PLE/wfdisplay/wfdisplay/wfdisplay_global.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
305 -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfdisplay_global.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
306 -$(INSTALL_FILE) /home/admin/opt/LPPMON_PLUGINS_PLE/wfdisplay/wfdisplay/wfpage.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
306 -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfpage.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
307 -$(INSTALL_FILE) /home/admin/opt/LPPMON_PLUGINS_PLE/wfdisplay/wfdisplay/wfplot.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
307 -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfplot.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
308 -$(INSTALL_FILE) /home/admin/opt/LPPMON_PLUGINS_PLE/wfdisplay/wfdisplay/wfdisplay_params.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
308 -$(INSTALL_FILE) /opt/LPPMON_PLUGINS_PAUL/wfdisplay/wfdisplay/wfdisplay_params.h $(INSTALL_ROOT)/usr/include/lppmon/wfdisplay/
309
309
310
310
311 uninstall_header: FORCE
311 uninstall_header: FORCE
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE QtCreatorProject>
2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by Qt Creator 2.4.1, 2013-07-09T15:49:44. -->
3 <!-- Written by Qt Creator 2.4.1, 2013-07-12T07:39:41. -->
4 <qtcreator>
4 <qtcreator>
5 <data>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -56,7 +56,7
56 <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
56 <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
57 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
57 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
58 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
58 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
59 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
59 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/lib64/ccache/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
60 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
60 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
61 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
61 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
62 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
62 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
@@ -205,7 +205,7
205 </data>
205 </data>
206 <data>
206 <data>
207 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
207 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
208 <value type="QString">{cdbf9cdc-1e84-406e-889b-c4feef49e75c}</value>
208 <value type="QString">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value>
209 </data>
209 </data>
210 <data>
210 <data>
211 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
211 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
Show file before | Show file after | Hide comments
@@ -40,6 +40,7 WFPage::WFPage(QWidget *parent) :
40 titleWidgetB3 = new QWidget();
40 titleWidgetB3 = new QWidget();
41
41
42 logFileName = new QLabel();
42 logFileName = new QLabel();
43 logFile = new QFile();
43 logFileV = new QFile();
44 logFileV = new QFile();
44 logFileE1 = new QFile();
45 logFileE1 = new QFile();
45 logFileE2 = new QFile();
46 logFileE2 = new QFile();
@@ -498,13 +499,13 void WFPage::chooseLogFile()
498 this->logFile->close();
499 this->logFile->close();
499 }
500 }
500
501
501 this->logFile->setFileName(QDir::homePath()
502 /*this->logFile->setFileName(QDir::homePath()
502 + "/"
503 + "/"
503 + QDate::currentDate().toString()
504 + QDate::currentDate().toString()
504 + "_"
505 + "_"
505 + QTime::currentTime().toString()
506 + QTime::currentTime().toString()
506 + "_rmapPluginUI.log",
507 + "_rmapPluginUI.log",
507 tr("Log Files (*.txt *.log)"));
508 tr("Log Files (*.txt *.log)"));*/
508 this->logFile->setFileName(QFileDialog::getSaveFileName(this,tr("Open Log file"),
509 this->logFile->setFileName(QFileDialog::getSaveFileName(this,tr("Open Log file"),
509 QDir::homePath()
510 QDir::homePath()
510 + "/"
511 + "/"
Show file before | Show file after | Hide comments
@@ -71,6 +71,7 public:
71 WFPlot *wfPlot_b2;
71 WFPlot *wfPlot_b2;
72 WFPlot *wfPlot_b3;
72 WFPlot *wfPlot_b3;
73
73
74 QFile *logFile;
74 QFile *logFileV;
75 QFile *logFileV;
75 QFile *logFileE1;
76 QFile *logFileE1;
76 QFile *logFileE2;
77 QFile *logFileE2;
@@ -78,6 +79,7 public:
78 QFile *logFileB2;
79 QFile *logFileB2;
79 QFile *logFileB3;
80 QFile *logFileB3;
80
81
82 QTextStream *logFileStrm;
81 QTextStream *logFileStrmV;
83 QTextStream *logFileStrmV;
82 QTextStream *logFileStrmE1;
84 QTextStream *logFileStrmE1;
83 QTextStream *logFileStrmE2;
85 QTextStream *logFileStrmE2;
General Comments 0
You need to be logged in to leave comments. Login now