diff --git a/slsDetectorGui/forms/form_tab_plot.ui b/slsDetectorGui/forms/form_tab_plot.ui
index c7533aa53..98f05ce19 100644
--- a/slsDetectorGui/forms/form_tab_plot.ui
+++ b/slsDetectorGui/forms/form_tab_plot.ui
@@ -92,9 +92,9 @@
- 10
+ 8
20
- 361
+ 358
26
@@ -191,149 +191,258 @@
false
-
+
- 10
- 20
- 361
- 26
+ 4
+ 15
+ 366
+ 31
-
-
- 0
-
- -
-
-
-
- 0
- 0
-
-
-
- Superimpose
-
-
- false
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
- Points
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 140
- 10
-
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
- Lines
-
-
- true
-
-
-
-
-
-
-
-
- 120
- 21
- 121
- 23
-
+
+ 0
-
-
- 1
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
- Persistency:
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- 40
- 16777215
-
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
+
+
+
+
+ 5
+ 4
+ 107
+ 26
+
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Superimpose
+
+
+ false
+
+
+
+
+
+
+
+
+ 210
+ 5
+ 128
+ 23
+
+
+
+
1
-
- 10
-
-
- 1
-
-
-
-
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+ Persistency:
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+
+ 40
+ 16777215
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+ 1
+
+
+ 10
+
+
+ 1
+
+
+
+
+
+
+
+
+ 345
+ 0
+ 16
+ 16
+
+
+
+
+ 0
+ 0
+
+
+
+ Qt::NoFocus
+
+
+
+
+
+
+ :/icons/images/rightArrow.png:/icons/images/rightArrow.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+
+
+
+
+ 5
+ 5
+ 336
+ 26
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Log Scale (Y)
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 95
+ 20
+
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+ Points
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+ Lines
+
+
+ true
+
+
+
+
+
+
+
+
+ 345
+ 0
+ 16
+ 16
+
+
+
+
+ 0
+ 0
+
+
+
+ Qt::NoFocus
+
+
+
+
+
+
+ :/icons/images/leftArrow.png:/icons/images/leftArrow.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
@@ -1001,7 +1110,7 @@
10
20
- 361
+ 358
26
diff --git a/slsDetectorGui/include/icons.qrc b/slsDetectorGui/include/icons.qrc
index 071da30c4..abb13ecf9 100644
--- a/slsDetectorGui/include/icons.qrc
+++ b/slsDetectorGui/include/icons.qrc
@@ -13,5 +13,7 @@
../images/erase.png
../images/remove.png
../images/stop.png
+ ../images/leftArrow.png
+ ../images/rightArrow.png
diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h
index f970ad1c2..14b58f531 100644
--- a/slsDetectorGui/include/qDrawPlot.h
+++ b/slsDetectorGui/include/qDrawPlot.h
@@ -459,6 +459,7 @@ void UpdatingPlotFinished();
void InterpolateSignal(bool);
void ContourSignal(bool);
void LogzSignal(bool);
+void LogySignal(bool);
void SetZRangeSignal(double,double);
void EnableZRangeSignal(bool);
void SetCurrentMeasurementSignal(int);
diff --git a/slsDetectorGui/include/qTabPlot.h b/slsDetectorGui/include/qTabPlot.h
index b23513e32..a07cdad35 100644
--- a/slsDetectorGui/include/qTabPlot.h
+++ b/slsDetectorGui/include/qTabPlot.h
@@ -140,6 +140,8 @@ private slots:
/** Set Plot to none, data graph, histogram*/
void SetPlot();
+ /** Change pages in 1D box*/
+ void Set1DPage();
signals:
diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
index 3b5e64ea9..1125df904 100644
--- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
+++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
@@ -158,7 +158,7 @@ class SlsQt1DPlot:public QwtPlot{
void Update();
void SetLogX(bool yes=1);
- void SetLogY(bool yes=1);
+ void SetLogY(bool yes=1);
protected:
diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index 2ed7f2287..bd9ce2b7b 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -205,6 +205,7 @@ void qDrawPlot::Initialization(){
connect(this, SIGNAL(InterpolateSignal(bool)),plot2D, SIGNAL(InterpolateSignal(bool)));
connect(this, SIGNAL(ContourSignal(bool)), plot2D, SIGNAL(ContourSignal(bool)));
connect(this, SIGNAL(LogzSignal(bool)), plot2D, SLOT(SetZScaleToLog(bool)));
+ connect(this, SIGNAL(LogySignal(bool)), plot1D, SLOT(SetLogY(bool)));
connect(this, SIGNAL(EnableZRangeSignal(bool)),plot2D, SLOT(EnableZRange(bool)));
connect(this, SIGNAL(SetZRangeSignal(double,double)), plot2D, SLOT(SetZRange(double,double)));
@@ -753,7 +754,9 @@ int qDrawPlot::GetData(detectorData *data){
}
pthread_mutex_unlock(&(last_image_complete_mutex));
}
+#ifdef VERYVERBOSE
cout<<"currentframe:"<show();
// to remember which all clone widgets were closed
diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp
index 65cbde362..3c3737aaa 100644
--- a/slsDetectorGui/src/qTabPlot.cpp
+++ b/slsDetectorGui/src/qTabPlot.cpp
@@ -154,6 +154,18 @@ void qTabPlot::SetupWidgetWindow(){
//-------------------------------------------------------------------------------------------------------------------------------------------------
+void qTabPlot::Set1DPage(){
+ QPushButton *clickedButton = qobject_cast(sender());
+ if(clickedButton->icon().pixmap(QSize(16,16)).toImage()==btnLeft->icon().pixmap(QSize(16,16)).toImage())
+ stackedWidget->setCurrentIndex(0);
+ else
+ stackedWidget->setCurrentIndex(1);
+}
+
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+
void qTabPlot::Select1DPlot(bool b){
isOneD = b;
if(b){
@@ -192,6 +204,10 @@ void qTabPlot::Initialization(){
connect(spinPersistency,SIGNAL(valueChanged(int)), myPlot,SLOT(SetPersistency(int)));
connect(chkPoints, SIGNAL(toggled(bool)), myPlot, SLOT(SetMarkers(bool)));
connect(chkLines, SIGNAL(toggled(bool)), myPlot, SLOT(SetLines(bool)));
+ connect(chk1DLog, SIGNAL(toggled(bool)), myPlot, SIGNAL(LogySignal(bool)));
+ //to change pages
+ connect(btnLeft, SIGNAL(clicked()), this, SLOT(Set1DPage()));
+ connect(btnRight, SIGNAL(clicked()), this, SLOT(Set1DPage()));
// 2D Plot box
connect(chkInterpolate, SIGNAL(toggled(bool)),myPlot, SIGNAL(InterpolateSignal(bool)));
connect(chkContour, SIGNAL(toggled(bool)),myPlot, SIGNAL(ContourSignal(bool)));