Commit 78f94272 authored by Locatelli's avatar Locatelli
Browse files

Implement save states of GUI in a config file (use QSetting)

parent b669d05c
......@@ -28,7 +28,6 @@ PLOT = \
plot/Plot1D.cpp \
plot/Plot2D.cpp \
plot/PlotHisto.cpp \
plot/PlotToolBar.cpp \
plot/PlotWindow.cpp \
plot/offscreen/OffScreenEmptyPlot.cpp \
plot/offscreen/OffScreenPlot.cpp \
......
......@@ -119,7 +119,6 @@ am__dirstamp = $(am__leading_dot)dirstamp
am__objects_1 = plot/mplplot-Plot.$(OBJEXT) \
plot/mplplot-EmptyPlot.$(OBJEXT) plot/mplplot-Plot1D.$(OBJEXT) \
plot/mplplot-Plot2D.$(OBJEXT) plot/mplplot-PlotHisto.$(OBJEXT) \
plot/mplplot-PlotToolBar.$(OBJEXT) \
plot/mplplot-PlotWindow.$(OBJEXT) \
plot/offscreen/mplplot-OffScreenEmptyPlot.$(OBJEXT) \
plot/offscreen/mplplot-OffScreenPlot.$(OBJEXT) \
......@@ -183,7 +182,6 @@ am__objects_6 = plot/offmplplot-Plot.$(OBJEXT) \
plot/offmplplot-Plot1D.$(OBJEXT) \
plot/offmplplot-Plot2D.$(OBJEXT) \
plot/offmplplot-PlotHisto.$(OBJEXT) \
plot/offmplplot-PlotToolBar.$(OBJEXT) \
plot/offmplplot-PlotWindow.$(OBJEXT) \
plot/offscreen/offmplplot-OffScreenEmptyPlot.$(OBJEXT) \
plot/offscreen/offmplplot-OffScreenPlot.$(OBJEXT) \
......@@ -242,7 +240,6 @@ offmplplot_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
am__objects_12 = plot/ploty2-Plot.$(OBJEXT) \
plot/ploty2-EmptyPlot.$(OBJEXT) plot/ploty2-Plot1D.$(OBJEXT) \
plot/ploty2-Plot2D.$(OBJEXT) plot/ploty2-PlotHisto.$(OBJEXT) \
plot/ploty2-PlotToolBar.$(OBJEXT) \
plot/ploty2-PlotWindow.$(OBJEXT) \
plot/offscreen/ploty2-OffScreenEmptyPlot.$(OBJEXT) \
plot/offscreen/ploty2-OffScreenPlot.$(OBJEXT) \
......@@ -546,7 +543,6 @@ PLOT = \
plot/Plot1D.cpp \
plot/Plot2D.cpp \
plot/PlotHisto.cpp \
plot/PlotToolBar.cpp \
plot/PlotWindow.cpp \
plot/offscreen/OffScreenEmptyPlot.cpp \
plot/offscreen/OffScreenPlot.cpp \
......@@ -770,8 +766,6 @@ plot/mplplot-Plot2D.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/mplplot-PlotHisto.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/mplplot-PlotToolBar.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/mplplot-PlotWindow.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/offscreen/$(am__dirstamp):
......@@ -931,8 +925,6 @@ plot/offmplplot-Plot2D.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/offmplplot-PlotHisto.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/offmplplot-PlotToolBar.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/offmplplot-PlotWindow.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/offscreen/offmplplot-OffScreenEmptyPlot.$(OBJEXT): \
......@@ -1068,8 +1060,6 @@ plot/ploty2-Plot2D.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/ploty2-PlotHisto.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/ploty2-PlotToolBar.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/ploty2-PlotWindow.$(OBJEXT): plot/$(am__dirstamp) \
plot/$(DEPDIR)/$(am__dirstamp)
plot/offscreen/ploty2-OffScreenEmptyPlot.$(OBJEXT): \
......@@ -1243,21 +1233,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/mplplot-Plot1D.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/mplplot-Plot2D.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/mplplot-PlotHisto.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/mplplot-PlotToolBar.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/mplplot-PlotWindow.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/offmplplot-EmptyPlot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/offmplplot-Plot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/offmplplot-Plot1D.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/offmplplot-Plot2D.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/offmplplot-PlotHisto.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/offmplplot-PlotToolBar.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/offmplplot-PlotWindow.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/ploty2-EmptyPlot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/ploty2-Plot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/ploty2-Plot1D.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/ploty2-Plot2D.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/ploty2-PlotHisto.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/ploty2-PlotToolBar.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/$(DEPDIR)/ploty2-PlotWindow.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/offscreen/$(DEPDIR)/mplplot-OffScreenEmptyPlot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plot/offscreen/$(DEPDIR)/mplplot-OffScreenPlot.Po@am__quote@
......@@ -1503,20 +1490,6 @@ plot/mplplot-PlotHisto.obj: plot/PlotHisto.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/mplplot-PlotHisto.obj `if test -f 'plot/PlotHisto.cpp'; then $(CYGPATH_W) 'plot/PlotHisto.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotHisto.cpp'; fi`
plot/mplplot-PlotToolBar.o: plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/mplplot-PlotToolBar.o -MD -MP -MF plot/$(DEPDIR)/mplplot-PlotToolBar.Tpo -c -o plot/mplplot-PlotToolBar.o `test -f 'plot/PlotToolBar.cpp' || echo '$(srcdir)/'`plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/mplplot-PlotToolBar.Tpo plot/$(DEPDIR)/mplplot-PlotToolBar.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='plot/PlotToolBar.cpp' object='plot/mplplot-PlotToolBar.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/mplplot-PlotToolBar.o `test -f 'plot/PlotToolBar.cpp' || echo '$(srcdir)/'`plot/PlotToolBar.cpp
plot/mplplot-PlotToolBar.obj: plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/mplplot-PlotToolBar.obj -MD -MP -MF plot/$(DEPDIR)/mplplot-PlotToolBar.Tpo -c -o plot/mplplot-PlotToolBar.obj `if test -f 'plot/PlotToolBar.cpp'; then $(CYGPATH_W) 'plot/PlotToolBar.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotToolBar.cpp'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/mplplot-PlotToolBar.Tpo plot/$(DEPDIR)/mplplot-PlotToolBar.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='plot/PlotToolBar.cpp' object='plot/mplplot-PlotToolBar.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/mplplot-PlotToolBar.obj `if test -f 'plot/PlotToolBar.cpp'; then $(CYGPATH_W) 'plot/PlotToolBar.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotToolBar.cpp'; fi`
plot/mplplot-PlotWindow.o: plot/PlotWindow.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/mplplot-PlotWindow.o -MD -MP -MF plot/$(DEPDIR)/mplplot-PlotWindow.Tpo -c -o plot/mplplot-PlotWindow.o `test -f 'plot/PlotWindow.cpp' || echo '$(srcdir)/'`plot/PlotWindow.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/mplplot-PlotWindow.Tpo plot/$(DEPDIR)/mplplot-PlotWindow.Po
......@@ -2189,20 +2162,6 @@ plot/offmplplot-PlotHisto.obj: plot/PlotHisto.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(offmplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/offmplplot-PlotHisto.obj `if test -f 'plot/PlotHisto.cpp'; then $(CYGPATH_W) 'plot/PlotHisto.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotHisto.cpp'; fi`
plot/offmplplot-PlotToolBar.o: plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(offmplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/offmplplot-PlotToolBar.o -MD -MP -MF plot/$(DEPDIR)/offmplplot-PlotToolBar.Tpo -c -o plot/offmplplot-PlotToolBar.o `test -f 'plot/PlotToolBar.cpp' || echo '$(srcdir)/'`plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/offmplplot-PlotToolBar.Tpo plot/$(DEPDIR)/offmplplot-PlotToolBar.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='plot/PlotToolBar.cpp' object='plot/offmplplot-PlotToolBar.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(offmplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/offmplplot-PlotToolBar.o `test -f 'plot/PlotToolBar.cpp' || echo '$(srcdir)/'`plot/PlotToolBar.cpp
plot/offmplplot-PlotToolBar.obj: plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(offmplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/offmplplot-PlotToolBar.obj -MD -MP -MF plot/$(DEPDIR)/offmplplot-PlotToolBar.Tpo -c -o plot/offmplplot-PlotToolBar.obj `if test -f 'plot/PlotToolBar.cpp'; then $(CYGPATH_W) 'plot/PlotToolBar.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotToolBar.cpp'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/offmplplot-PlotToolBar.Tpo plot/$(DEPDIR)/offmplplot-PlotToolBar.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='plot/PlotToolBar.cpp' object='plot/offmplplot-PlotToolBar.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(offmplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/offmplplot-PlotToolBar.obj `if test -f 'plot/PlotToolBar.cpp'; then $(CYGPATH_W) 'plot/PlotToolBar.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotToolBar.cpp'; fi`
plot/offmplplot-PlotWindow.o: plot/PlotWindow.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(offmplplot_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/offmplplot-PlotWindow.o -MD -MP -MF plot/$(DEPDIR)/offmplplot-PlotWindow.Tpo -c -o plot/offmplplot-PlotWindow.o `test -f 'plot/PlotWindow.cpp' || echo '$(srcdir)/'`plot/PlotWindow.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/offmplplot-PlotWindow.Tpo plot/$(DEPDIR)/offmplplot-PlotWindow.Po
......@@ -2959,20 +2918,6 @@ plot/ploty2-PlotHisto.obj: plot/PlotHisto.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ploty2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/ploty2-PlotHisto.obj `if test -f 'plot/PlotHisto.cpp'; then $(CYGPATH_W) 'plot/PlotHisto.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotHisto.cpp'; fi`
plot/ploty2-PlotToolBar.o: plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ploty2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/ploty2-PlotToolBar.o -MD -MP -MF plot/$(DEPDIR)/ploty2-PlotToolBar.Tpo -c -o plot/ploty2-PlotToolBar.o `test -f 'plot/PlotToolBar.cpp' || echo '$(srcdir)/'`plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/ploty2-PlotToolBar.Tpo plot/$(DEPDIR)/ploty2-PlotToolBar.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='plot/PlotToolBar.cpp' object='plot/ploty2-PlotToolBar.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ploty2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/ploty2-PlotToolBar.o `test -f 'plot/PlotToolBar.cpp' || echo '$(srcdir)/'`plot/PlotToolBar.cpp
plot/ploty2-PlotToolBar.obj: plot/PlotToolBar.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ploty2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/ploty2-PlotToolBar.obj -MD -MP -MF plot/$(DEPDIR)/ploty2-PlotToolBar.Tpo -c -o plot/ploty2-PlotToolBar.obj `if test -f 'plot/PlotToolBar.cpp'; then $(CYGPATH_W) 'plot/PlotToolBar.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotToolBar.cpp'; fi`
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/ploty2-PlotToolBar.Tpo plot/$(DEPDIR)/ploty2-PlotToolBar.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='plot/PlotToolBar.cpp' object='plot/ploty2-PlotToolBar.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ploty2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plot/ploty2-PlotToolBar.obj `if test -f 'plot/PlotToolBar.cpp'; then $(CYGPATH_W) 'plot/PlotToolBar.cpp'; else $(CYGPATH_W) '$(srcdir)/plot/PlotToolBar.cpp'; fi`
plot/ploty2-PlotWindow.o: plot/PlotWindow.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ploty2_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plot/ploty2-PlotWindow.o -MD -MP -MF plot/$(DEPDIR)/ploty2-PlotWindow.Tpo -c -o plot/ploty2-PlotWindow.o `test -f 'plot/PlotWindow.cpp' || echo '$(srcdir)/'`plot/PlotWindow.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) plot/$(DEPDIR)/ploty2-PlotWindow.Tpo plot/$(DEPDIR)/ploty2-PlotWindow.Po
......
......@@ -20,7 +20,6 @@
#include "manager/ServerRequesterManager.h"
#include "PlotWindow.h"
#include "PlotToolBar.h"
#include "datacontainer/PropertyPlotDataContainer.h"
#include "Trace.h"
......@@ -168,14 +167,20 @@ void Plot1D::display() throw (Error) {
///////////////////////////////////////////////////////////////////////////////////////
//// check grid
////
// if (m_PlotWindow->getPlotToolBar()->gridActivated() == true) {
// // show grid
// try {
// grid(true);
// } catch (Error& e) {
// Warning("Plot1D", "display", "Failed to show plot grid");
// }
// }
try {
grid(m_PlotWindow->gridActivated());
} catch (Error& e) {
Warning("Plot1D", "display", "Failed to show plot grid");
}
///////////////////////////////////////////////////////////////////////////////////////
//// check log
////
try {
log(m_PlotWindow->logActivated());
} catch (Error& e) {
Warning("Plot1D", "display", "Failed to activate log");
}
///////////////////////////////////////////////////////////////////////////////////////
//// reset limits
......@@ -242,9 +247,6 @@ void Plot1D::resetLimits() throw (Error) {
*/
void Plot1D::grid(bool show) throw (Error) {
m_MplPlot1D.grid(show);
if (m_PlotWindow != nullptr) {
m_PlotWindow->repaint();
}
}
/*
......@@ -252,9 +254,6 @@ void Plot1D::grid(bool show) throw (Error) {
*/
void Plot1D::log(bool tolog) throw (Error) {
m_MplPlot1D.log(tolog);
if (m_PlotWindow != nullptr) {
m_PlotWindow->repaint();
}
}
/*
......
......@@ -21,7 +21,6 @@
#include "manager/ServerRequesterManager.h"
#include "datacontainer/PropertyPlotDataContainer.h"
#include "PlotWindow.h"
#include "PlotToolBar.h"
#include "Trace.h"
#include "CImg.h"
......@@ -129,27 +128,45 @@ void Plot2D::display() throw (Error) {
Warning("Plot2D", "display", "Failed to set y label", ylabel);
}
// ///////////////////////////////////////////////////////////////////////////////////////
// //// check grid of plots
// ////
// if (m_PlotWindow->getPlotToolBar()->gridActivated() == true) {
// // show grid
// try {
// grid(true);
// } catch (Error& e) {
// Warning("Plot2D", "display", "Failed to show plot grid");
// }
// }
//
// ///////////////////////////////////////////////////////////////////////////////////////
// //// Aspect Ratio
// ////
// try {
// aspectRatio(m_PlotWindow->getPlotToolBar()->ratioActivated());
// }
// catch(Error& e) {
// Warning("Plot2D", "display", "Could not set aspect ratio");
// }
if (m_PlotWindow != nullptr) {
///////////////////////////////////////////////////////////////////////////////////////
//// check grid of plots
////
try {
grid(m_PlotWindow->gridActivated());
} catch (Error& e) {
Warning("Plot2D", "display", "Failed to show plot grid");
}
///////////////////////////////////////////////////////////////////////////////////////
//// check log of plots
////
try {
log(m_PlotWindow->logActivated());
} catch (Error& e) {
Warning("Plot2D", "display", "Failed to activated log");
}
///////////////////////////////////////////////////////////////////////////////////////
//// Aspect Ratio
////
try {
aspectRatio(m_PlotWindow->ratioActivated());
}
catch(Error& e) {
Warning("Plot2D", "display", "Could not set aspect ratio");
}
///////////////////////////////////////////////////////////////////////////////////////
//// Color map
////
try {
colorMap(m_PlotWindow->getColorMapName());
}
catch(Error& e) {
Warning("Plot2D", "display", "Could not set color map");
}
}
}
/*
......@@ -197,9 +214,6 @@ void Plot2D::resetLimits() throw (Error) {
*/
void Plot2D::grid(bool show) throw (Error) {
m_MplPlot2D.grid(show);
if (m_PlotWindow != nullptr) {
m_PlotWindow->repaint();
}
}
/*
......@@ -207,9 +221,6 @@ void Plot2D::grid(bool show) throw (Error) {
*/
void Plot2D::log(bool tolog) throw (Error) {
m_MplPlot2D.log(tolog);
if (m_PlotWindow != nullptr) {
m_PlotWindow->repaint();
}
}
/*
......@@ -222,9 +233,6 @@ void Plot2D::aspectRatio(bool state) throw (Error) {
else {
m_MplPlot2D.aspectRatio(0);
}
if (m_PlotWindow != nullptr) {
m_PlotWindow->repaint();
}
}
/*
......
/*
* Nomad Instrument Control Software
*
* Copyright 2011 Institut Laue-Langevin
*
* Licensed under the EUPL, Version 1.1 only (the "License");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* http://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*/
#include "PlotToolBar.h"
#include "PlotWindow.h"
#include "Trace.h"
using namespace std;
namespace plot {
/*
* constructor
*/
PlotToolBar::PlotToolBar(PlotWindow* plotwindow) :
m_Plotwindow(plotwindow) {
m_GridState = false;
m_LogState = false;
m_RatioState = false;
}
/*
* destructor
*/
PlotToolBar::~PlotToolBar() {
}
/*
* home
*/
void PlotToolBar::home() throw (Error) {
m_Plotwindow->home();
}
/*
* back
*/
void PlotToolBar::back() throw (Error) {
m_Plotwindow->back();
}
/*
* pan
*/
void PlotToolBar::pan(bool on) throw (Error) {
m_Plotwindow->pan(on);
}
/*
* zoom
*/
void PlotToolBar::zoom(bool on) throw (Error) {
m_Plotwindow->zoom(on);
}
/*
* grid
*/
void PlotToolBar::grid(bool on) throw (Error) {
m_GridState = on;
m_Plotwindow->grid(on);
}
/*
* log
*/
void PlotToolBar::log(bool on) throw (Error) {
m_LogState = on;
m_Plotwindow->log(on);
}
/*
* ratio
*/
void PlotToolBar::ratio(bool on) throw (Error) {
m_RatioState = on;
m_Plotwindow->ratio(on);
}
/*
* filesave
*/
void PlotToolBar::filesave() throw (Error) {
m_Plotwindow->filesave();
}
}
/*
* Nomad Instrument Control Software
*
* Copyright 2011 Institut Laue-Langevin
*
* Licensed under the EUPL, Version 1.1 only (the "License");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
*
* http://joinup.ec.europa.eu/software/page/eupl
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the Licence is distributed on an "AS IS" basis,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and
* limitations under the Licence.
*/
#ifndef PLOTTOOLBAR_H
#define PLOTTOOLBAR_H
#include "Error.h"
namespace plot {
class PlotWindow;
/*!
* \brief Plot toolbar control class
*/
class PlotToolBar {
public:
/*!
* \brief constructor
*/
PlotToolBar(PlotWindow* plotwindow);
/*!
* \brief destructor
*/
~PlotToolBar();
/*!
* \brief Reset zoom, go to original view
* \throws Error
*/
void home() throw (Error);
/*!
* \brief Back to previous zoom view
* \throws Error
*/
void back() throw (Error);
/*!
* \brief Toogle zoom state (on or off)
* \param[in] on The state of zoom
* \throws Error
*/
void zoom(bool on) throw (Error);
/*!
* \brief Toogle pan state (on or off)
* \param[in] on The state of pan
* \throws Error
*/
void pan(bool on) throw (Error);
/*!
* \brief Toogle grid state (on or off)
* \param[in] on The state of grid
* \throws Error
*/
void grid(bool on) throw (Error);
/*!
* \brief Toogle log state (on or off)
* \param[in] on The state of log
* \throws Error
*/
void log(bool on) throw (Error);
/*!
* \brief Toogle log ratio (on or off)
* \param[in] on The ratio of log
* \throws Error
*/
void ratio(bool on) throw (Error);
/*!
* \brief Image File save
* \throws Error
*/
void filesave() throw (Error);
/*!
* \brief Get grid state
* \return state
*/
bool gridActivated() const {
return m_GridState;
}
/*!
* \brief Get log state
* \return state
*/
bool logActivated() const {
return m_LogState;
}
/*!
* \brief Get ratio state
* \return state
*/
bool ratioActivated() const {
return m_RatioState;
}
private:
PlotWindow* m_Plotwindow; //! Link to the plot window
bool m_GridState; //! Grid state
bool m_LogState; //! Log state
bool m_RatioState; //! Ratio state
};
}
#endif // PLOTTOOLBAR_H
......@@ -17,7 +17,6 @@
*/
#include "PlotWindow.h"
#include "PlotToolBar.h"
#include <cameo/cameo.h>
#include <boost/python/object.hpp>
......@@ -46,7 +45,6 @@ PlotWindow::PlotWindow(view::mpl::Mpl* mpl, const proto::PlotPropertyDataMessage
m_PropertyPlotDataContainer = new PropertyPlotDataContainer(plotMessage);
m_QtWindow = nullptr;
m_MplFigure = nullptr;
m_PlotToolBar = nullptr;
m_Plot = nullptr;
}
......@@ -58,7 +56,6 @@ PlotWindow::~PlotWindow() {
view::mpl::MplEventManager::getInstance()->unsubscribeMotionNotifyEvent(m_MplFigure->getCanvas());
delete m_QtWindow;
delete m_MplFigure;
delete m_PlotToolBar;
}
/*
......@@ -69,8 +66,6 @@ void PlotWindow::create(QApplication& app, cameo::application::Subscriber* subsc
//// Create mpl figure and qt window
////
try {
m_PlotToolBar = new PlotToolBar(this);
m_MplFigure = new view::mpl::MplFigure();
m_QtWindow = new view::qt::QtWindow(view::extract<QWidget>(m_MplFigure->getCanvas()), app, subscriber, this);
......@@ -178,7 +173,6 @@ void PlotWindow::switchPlot() {
m_Plot = nullptr;
m_MplFigure->clear();
display();
repaint();
m_MplFigure->resetToolBarStack();
} catch (Error& e) {
throw Error("PlotWindow", "switchTo2D", "Failed create 2d plot", m_PropertyPlotDataContainer->plotKey);
......@@ -233,6 +227,7 @@ void PlotWindow::zoom(bool on) throw (Error) {
*/
void PlotWindow::grid(bool on) throw (Error) {
m_Plot->grid(on);
repaint();
}
/*
......@@ -240,6 +235,7 @@ void PlotWindow::grid(bool on) throw (Error) {
*/
void PlotWindow::log(bool on) throw (Error) {
m_Plot->log(on);
repaint();
}
/*
......@@ -247,6 +243,7 @@ void PlotWindow::log(bool on) throw (Error) {
*/
void PlotWindow::ratio(bool on) throw (Error) {
m_Plot->aspectRatio(on);
repaint();
}
/*
......@@ -278,10 +275,31 @@ view::mpl::MplFigure* PlotWindow::getMplFigure() const {
}
/*
* getPlotToolBar
* gridActivated
*/
bool PlotWindow::gridActivated() const {
return m_QtWindow->gridActivated();
}
/*
* logActivated
*/
bool PlotWindow::logActivated() const {
return m_QtWindow->logActivated();
}
/*
* ratioActivated
*/
bool PlotWindow::ratioActivated() const {
return m_QtWindow->ratioActivated();
}
/*
* getColorMapName
*/
PlotToolBar* PlotWindow::getPlotToolBar() const {
return m_PlotToolBar;
const string& PlotWindow::getColorMapName() const {
return m_QtWindow->getColorMapName<