diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index d9439899b..c9b335eb2 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -1745,6 +1745,8 @@ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){ plot1D->SetYTitle("Trimbits"); //set plot parameters plot1D->SetXMinMax(0,nPixelsX); + /*plot1D->SetYMinMax(0,plotHistogram->boundingRect().height()); plot1D->SetZoomBase(0,0,nPixelsX,plot1D->GetYMaximum());*/ + //for some reason this plothistogram works as well. plot1D->SetZoomBase(0,0,nPixelsX,plotHistogram->boundingRect().height()); SlsQtH1D* h; plot1D_hists.append(h=new SlsQtH1D("",nPixelsX,histXAxis,histYAxis[0])); @@ -1789,9 +1791,9 @@ int qDrawPlot::UpdateTrimbitPlot(bool fromDetector,bool Histogram){ histFrameIndexTitle->setText(GetHistTitle(0)); plotHistogram->attach(plot1D); //refixing all the zooming - /*plot1D->SetXMinMax(0,TRIM_HISTOGRAM_XMAX+1); + plot1D->SetXMinMax(0,TRIM_HISTOGRAM_XMAX+1); plot1D->SetYMinMax(0,plotHistogram->boundingRect().height()); - plot1D->SetZoomBase(0,0,actualPixelsX,plotHistogram->boundingRect().height());*/ + plot1D->SetZoomBase(0,0,actualPixelsX,plotHistogram->boundingRect().height()); } } diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index cd801392c..7d15b1e01 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -123,6 +123,10 @@ void qTabDataOutput::SetupWidgetWindow(){ connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels())); + if(detType == slsDetectorDefs::MYTHEN){ + comboDetector->hide(); + } + qDefs::checkErrorMessage(myDet,"qTabDataOutput::SetupWidgetWindow"); }