Git commit 71d84fe112d32933a80c5a2bb40d1ebcf9b7f078 by Stefan Gerlach. Committed on 30/06/2017 at 20:58. Pushed by sgerlach into branch 'master'. code improvements M +227 -229 src/kdefrontend/GuiObserver.cpp https://commits.kde.org/labplot/71d84fe112d32933a80c5a2bb40d1ebcf9b7f078 diff --git a/src/kdefrontend/GuiObserver.cpp b/src/kdefrontend/GuiObserver.= cpp index 9274f576..428b7cae 100644 --- a/src/kdefrontend/GuiObserver.cpp +++ b/src/kdefrontend/GuiObserver.cpp @@ -4,6 +4,7 @@ Description : GUI observer -------------------------------------------------------------------- Copyright : (C) 2010-2015 Alexander Semke (alexander.semke@web= .de) + Copyright : (C) 2015-2017 Stefan Gerlach (stefan.gerlach@uni.k= n) Copyright : (C) 2016 Garvit Khatri (garvitdelhi@gmail.com) = **************************************************************************= */ @@ -108,404 +109,401 @@ GuiObserver::GuiObserver(MainWin* mainWin) : m_last= CartesianPlot(0) { */ void GuiObserver::selectedAspectsChanged(QList& selectedA= spects) const { if (selectedAspects.isEmpty()) { - if (m_mainWindow->stackedWidget->currentWidget()) - m_mainWindow->stackedWidget->currentWidget()->hide(); + if (m_mainWindow->stackedWidget->currentWidget()) + m_mainWindow->stackedWidget->currentWidget()->hide(); = - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Properties")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Properties")); return; } = - AbstractAspect* aspect =3D 0; QString prevClassName, className; = //check, whether objects of different types where selected //don't show any dock widgets in this case. - foreach(aspect, selectedAspects) { - className=3D aspect->metaObject()->className(); - if ( className !=3D prevClassName && !prevClassName.isEmpty() ) { - if (m_mainWindow->stackedWidget->currentWidget()) - m_mainWindow->stackedWidget->currentWidget()->hide(); + for (auto* aspect: selectedAspects) { + className =3D aspect->metaObject()->className(); + if (className !=3D prevClassName && !prevClassName.isEmpty()) { + if (m_mainWindow->stackedWidget->currentWidget()) + m_mainWindow->stackedWidget->currentWidget()->hide(); = - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Propertie= s")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Properties")); return; } prevClassName =3D className; } = - if (m_mainWindow->stackedWidget->currentWidget()) - m_mainWindow->stackedWidget->currentWidget()->show(); + if (m_mainWindow->stackedWidget->currentWidget()) + m_mainWindow->stackedWidget->currentWidget()->show(); = if (className =3D=3D "Spreadsheet") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Spreadsheet")= ); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Spreadsheet")); = - if (!m_mainWindow->spreadsheetDock) { - m_mainWindow->spreadsheetDock =3D new SpreadsheetDock(m_mainWi= ndow->stackedWidget); - connect(m_mainWindow->spreadsheetDock, SIGNAL(info(QString)), = m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->spreadshe= etDock); + if (!m_mainWindow->spreadsheetDock) { + m_mainWindow->spreadsheetDock =3D new SpreadsheetDock(m_mainWindow->sta= ckedWidget); + connect(m_mainWindow->spreadsheetDock, SIGNAL(info(QString)), m_mainWin= dow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->spreadsheetDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->spreadsheetDock->setSpreadsheets(list); + m_mainWindow->spreadsheetDock->setSpreadsheets(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->spread= sheetDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->spreadsheetD= ock); } else if (className =3D=3D "Column") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Column")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Column")); = - if (!m_mainWindow->columnDock) { - m_mainWindow->columnDock =3D new ColumnDock(m_mainWindow->stac= kedWidget); - connect(m_mainWindow->columnDock, SIGNAL(info(QString)), m_mai= nWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->columnDoc= k); + if (!m_mainWindow->columnDock) { + m_mainWindow->columnDock =3D new ColumnDock(m_mainWindow->stackedWidget= ); + connect(m_mainWindow->columnDock, SIGNAL(info(QString)), m_mainWindow->= statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->columnDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->columnDock->setColumns(list); + m_mainWindow->columnDock->setColumns(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->column= Dock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->columnDock); } else if (className =3D=3D "Matrix") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Matrix")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Matrix")); = - if (!m_mainWindow->matrixDock) { - m_mainWindow->matrixDock =3D new MatrixDock(m_mainWindow->stac= kedWidget); - connect(m_mainWindow->matrixDock, SIGNAL(info(QString)), m_mai= nWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->matrixDoc= k); + if (!m_mainWindow->matrixDock) { + m_mainWindow->matrixDock =3D new MatrixDock(m_mainWindow->stackedWidget= ); + connect(m_mainWindow->matrixDock, SIGNAL(info(QString)), m_mainWindow->= statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->matrixDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->matrixDock->setMatrices(list); + m_mainWindow->matrixDock->setMatrices(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->matrix= Dock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->matrixDock); } else if (className =3D=3D "Worksheet") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Worksheet")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Worksheet")); = - if (!m_mainWindow->worksheetDock) { - m_mainWindow->worksheetDock =3D new WorksheetDock(m_mainWindow= ->stackedWidget); - connect(m_mainWindow->worksheetDock, SIGNAL(info(QString)), m_= mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->worksheet= Dock); + if (!m_mainWindow->worksheetDock) { + m_mainWindow->worksheetDock =3D new WorksheetDock(m_mainWindow->stacked= Widget); + connect(m_mainWindow->worksheetDock, SIGNAL(info(QString)), m_mainWindo= w->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->worksheetDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->worksheetDock->setWorksheets(list); + m_mainWindow->worksheetDock->setWorksheets(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->worksh= eetDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->worksheetDoc= k); } else if (className =3D=3D "CartesianPlot") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Cartesian Plo= t")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Cartesian Plot")); = - if (!m_mainWindow->cartesianPlotDock) { - m_mainWindow->cartesianPlotDock =3D new CartesianPlotDock(m_ma= inWindow->stackedWidget); - connect(m_mainWindow->cartesianPlotDock, SIGNAL(info(QString))= , m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->cartesian= PlotDock); + if (!m_mainWindow->cartesianPlotDock) { + m_mainWindow->cartesianPlotDock =3D new CartesianPlotDock(m_mainWindow-= >stackedWidget); + connect(m_mainWindow->cartesianPlotDock, SIGNAL(info(QString)), m_mainW= indow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->cartesianPlotDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->cartesianPlotDock->setPlots(list); + m_mainWindow->cartesianPlotDock->setPlots(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->cartes= ianPlotDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->cartesianPlo= tDock); } else if (className =3D=3D "CartesianPlotLegend") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Legend")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Legend")); = - if (!m_mainWindow->cartesianPlotLegendDock) { - m_mainWindow->cartesianPlotLegendDock =3D new CartesianPlotLeg= endDock(m_mainWindow->stackedWidget); - connect(m_mainWindow->cartesianPlotLegendDock, SIGNAL(info(QSt= ring)), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->cartesian= PlotLegendDock); + if (!m_mainWindow->cartesianPlotLegendDock) { + m_mainWindow->cartesianPlotLegendDock =3D new CartesianPlotLegendDock(m= _mainWindow->stackedWidget); + connect(m_mainWindow->cartesianPlotLegendDock, SIGNAL(info(QString)), m= _mainWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->cartesianPlotLegen= dDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->cartesianPlotLegendDock->setLegends(list); + m_mainWindow->cartesianPlotLegendDock->setLegends(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->cartes= ianPlotLegendDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->cartesianPlo= tLegendDock); } else if (className =3D=3D "Axis") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Axis")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Axis")); = - if (!m_mainWindow->axisDock) { - m_mainWindow->axisDock =3D new AxisDock(m_mainWindow->stackedW= idget); - connect(m_mainWindow->axisDock, SIGNAL(info(QString)), m_mainW= indow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->axisDock); + if (!m_mainWindow->axisDock) { + m_mainWindow->axisDock =3D new AxisDock(m_mainWindow->stackedWidget); + connect(m_mainWindow->axisDock, SIGNAL(info(QString)), m_mainWindow->st= atusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->axisDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->axisDock->setAxes(list); + m_mainWindow->axisDock->setAxes(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->axisDo= ck); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->axisDock); } else if (className =3D=3D "XYCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("xy-Curve")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("xy-Curve")); = - if (!m_mainWindow->xyCurveDock) { - m_mainWindow->xyCurveDock =3D new XYCurveDock(m_mainWindow->st= ackedWidget); - m_mainWindow->xyCurveDock->setupGeneral(); - connect(m_mainWindow->xyCurveDock, SIGNAL(info(QString)), m_ma= inWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyCurveDo= ck); + if (!m_mainWindow->xyCurveDock) { + m_mainWindow->xyCurveDock =3D new XYCurveDock(m_mainWindow->stackedWidg= et); + m_mainWindow->xyCurveDock->setupGeneral(); + connect(m_mainWindow->xyCurveDock, SIGNAL(info(QString)), m_mainWindow-= >statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyCurveDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xyCurveDock->setCurves(list); + m_mainWindow->xyCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyCurv= eDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyCurveDock); } else if (className =3D=3D "XYEquationCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("xy-Equation")= ); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("xy-Equation")); = - if (!m_mainWindow->xyEquationCurveDock) { - m_mainWindow->xyEquationCurveDock =3D new XYEquationCurveDock(= m_mainWindow->stackedWidget); - m_mainWindow->xyEquationCurveDock->setupGeneral(); - connect(m_mainWindow->xyEquationCurveDock, SIGNAL(info(QString= )), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyEquatio= nCurveDock); + if (!m_mainWindow->xyEquationCurveDock) { + m_mainWindow->xyEquationCurveDock =3D new XYEquationCurveDock(m_mainWin= dow->stackedWidget); + m_mainWindow->xyEquationCurveDock->setupGeneral(); + connect(m_mainWindow->xyEquationCurveDock, SIGNAL(info(QString)), m_mai= nWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyEquationCurveDoc= k); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xyEquationCurveDock->setCurves(list); + m_mainWindow->xyEquationCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyEqua= tionCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyEquationCu= rveDock); } else if (className =3D=3D "XYDataReductionCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Data reductio= n")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Data reduction")); = - if (!m_mainWindow->xyDataReductionCurveDock) { - m_mainWindow->xyDataReductionCurveDock =3D new XYDataReduction= CurveDock(m_mainWindow->stackedWidget, m_mainWindow->statusBar()); - m_mainWindow->xyDataReductionCurveDock->setupGeneral(); - connect(m_mainWindow->xyDataReductionCurveDock, SIGNAL(info(QS= tring)), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyDataRed= uctionCurveDock); + if (!m_mainWindow->xyDataReductionCurveDock) { + m_mainWindow->xyDataReductionCurveDock =3D new XYDataReductionCurveDock= (m_mainWindow->stackedWidget, m_mainWindow->statusBar()); + m_mainWindow->xyDataReductionCurveDock->setupGeneral(); + connect(m_mainWindow->xyDataReductionCurveDock, SIGNAL(info(QString)), = m_mainWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyDataReductionCur= veDock); } = QList list; - foreach(aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xyDataReductionCurveDock->setCurves(list); + m_mainWindow->xyDataReductionCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyData= ReductionCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyDataReduct= ionCurveDock); } else if (className =3D=3D "XYDifferentiationCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Differentiati= on")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Differentiation")); = - if (!m_mainWindow->xyDifferentiationCurveDock) { - m_mainWindow->xyDifferentiationCurveDock =3D new XYDifferentia= tionCurveDock(m_mainWindow->stackedWidget); - m_mainWindow->xyDifferentiationCurveDock->setupGeneral(); - connect(m_mainWindow->xyDifferentiationCurveDock, SIGNAL(info(= QString)), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyDiffere= ntiationCurveDock); + if (!m_mainWindow->xyDifferentiationCurveDock) { + m_mainWindow->xyDifferentiationCurveDock =3D new XYDifferentiationCurve= Dock(m_mainWindow->stackedWidget); + m_mainWindow->xyDifferentiationCurveDock->setupGeneral(); + connect(m_mainWindow->xyDifferentiationCurveDock, SIGNAL(info(QString))= , m_mainWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyDifferentiationC= urveDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xyDifferentiationCurveDock->setCurves(list); + m_mainWindow->xyDifferentiationCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyDiff= erentiationCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyDifferenti= ationCurveDock); } else if (className =3D=3D "XYIntegrationCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Integration")= ); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Integration")); = - if (!m_mainWindow->xyIntegrationCurveDock) { - m_mainWindow->xyIntegrationCurveDock =3D new XYIntegrationCurv= eDock(m_mainWindow->stackedWidget); - m_mainWindow->xyIntegrationCurveDock->setupGeneral(); - connect(m_mainWindow->xyIntegrationCurveDock, SIGNAL(info(QStr= ing)), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyIntegra= tionCurveDock); + if (!m_mainWindow->xyIntegrationCurveDock) { + m_mainWindow->xyIntegrationCurveDock =3D new XYIntegrationCurveDock(m_m= ainWindow->stackedWidget); + m_mainWindow->xyIntegrationCurveDock->setupGeneral(); + connect(m_mainWindow->xyIntegrationCurveDock, SIGNAL(info(QString)), m_= mainWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyIntegrationCurve= Dock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xyIntegrationCurveDock->setCurves(list); + m_mainWindow->xyIntegrationCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyInte= grationCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyIntegratio= nCurveDock); } else if (className =3D=3D "XYInterpolationCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Interpolation= ")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Interpolation")); = - if (!m_mainWindow->xyInterpolationCurveDock) { - m_mainWindow->xyInterpolationCurveDock =3D new XYInterpolation= CurveDock(m_mainWindow->stackedWidget); - m_mainWindow->xyInterpolationCurveDock->setupGeneral(); - connect(m_mainWindow->xyInterpolationCurveDock, SIGNAL(info(QS= tring)), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyInterpo= lationCurveDock); + if (!m_mainWindow->xyInterpolationCurveDock) { + m_mainWindow->xyInterpolationCurveDock =3D new XYInterpolationCurveDock= (m_mainWindow->stackedWidget); + m_mainWindow->xyInterpolationCurveDock->setupGeneral(); + connect(m_mainWindow->xyInterpolationCurveDock, SIGNAL(info(QString)), = m_mainWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyInterpolationCur= veDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xyInterpolationCurveDock->setCurves(list); + m_mainWindow->xyInterpolationCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyInte= rpolationCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyInterpolat= ionCurveDock); } else if (className =3D=3D "XYFitCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Fit")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Fit")); = - if (!m_mainWindow->xyFitCurveDock) { - m_mainWindow->xyFitCurveDock =3D new XYFitCurveDock(m_mainWind= ow->stackedWidget); - m_mainWindow->xyFitCurveDock->setupGeneral(); - connect(m_mainWindow->xyFitCurveDock, SIGNAL(info(QString)), m= _mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyFitCurv= eDock); + if (!m_mainWindow->xyFitCurveDock) { + m_mainWindow->xyFitCurveDock =3D new XYFitCurveDock(m_mainWindow->stack= edWidget); + m_mainWindow->xyFitCurveDock->setupGeneral(); + connect(m_mainWindow->xyFitCurveDock, SIGNAL(info(QString)), m_mainWind= ow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyFitCurveDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xyFitCurveDock->setCurves(list); - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyFitC= urveDock); + m_mainWindow->xyFitCurveDock->setCurves(list); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyFitCurveDo= ck); } else if (className =3D=3D "XYFourierTransformCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Fourier Trans= form")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Fourier Transform")= ); = - if (!m_mainWindow->xyFourierTransformCurveDock) { - m_mainWindow->xyFourierTransformCurveDock =3D new XYFourierTra= nsformCurveDock(m_mainWindow->stackedWidget); - m_mainWindow->xyFourierTransformCurveDock->setupGeneral(); - connect(m_mainWindow->xyFourierTransformCurveDock, SIGNAL(info= (QString)), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyFourier= TransformCurveDock); + if (!m_mainWindow->xyFourierTransformCurveDock) { + m_mainWindow->xyFourierTransformCurveDock =3D new XYFourierTransformCur= veDock(m_mainWindow->stackedWidget); + m_mainWindow->xyFourierTransformCurveDock->setupGeneral(); + connect(m_mainWindow->xyFourierTransformCurveDock, SIGNAL(info(QString)= ), m_mainWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyFourierTransform= CurveDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); = - m_mainWindow->xyFourierTransformCurveDock->setCurves(list); + m_mainWindow->xyFourierTransformCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyFour= ierTransformCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyFourierTra= nsformCurveDock); } else if (className =3D=3D "XYFourierFilterCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Fourier Filte= r")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Fourier Filter")); = - if (!m_mainWindow->xyFourierFilterCurveDock) { - m_mainWindow->xyFourierFilterCurveDock =3D new XYFourierFilter= CurveDock(m_mainWindow->stackedWidget); - m_mainWindow->xyFourierFilterCurveDock->setupGeneral(); - connect(m_mainWindow->xyFourierFilterCurveDock, SIGNAL(info(QS= tring)), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyFourier= FilterCurveDock); + if (!m_mainWindow->xyFourierFilterCurveDock) { + m_mainWindow->xyFourierFilterCurveDock =3D new XYFourierFilterCurveDock= (m_mainWindow->stackedWidget); + m_mainWindow->xyFourierFilterCurveDock->setupGeneral(); + connect(m_mainWindow->xyFourierFilterCurveDock, SIGNAL(info(QString)), = m_mainWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xyFourierFilterCur= veDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xyFourierFilterCurveDock->setCurves(list); + m_mainWindow->xyFourierFilterCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyFour= ierFilterCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xyFourierFil= terCurveDock); } else if (className =3D=3D "XYSmoothCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Smoothing")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Smoothing")); = - if (!m_mainWindow->xySmoothCurveDock) { - m_mainWindow->xySmoothCurveDock =3D new XYSmoothCurveDock(m_ma= inWindow->stackedWidget); - m_mainWindow->xySmoothCurveDock->setupGeneral(); - connect(m_mainWindow->xySmoothCurveDock, SIGNAL(info(QString))= , m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->xySmoothC= urveDock); + if (!m_mainWindow->xySmoothCurveDock) { + m_mainWindow->xySmoothCurveDock =3D new XYSmoothCurveDock(m_mainWindow-= >stackedWidget); + m_mainWindow->xySmoothCurveDock->setupGeneral(); + connect(m_mainWindow->xySmoothCurveDock, SIGNAL(info(QString)), m_mainW= indow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->xySmoothCurveDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->xySmoothCurveDock->setCurves(list); + m_mainWindow->xySmoothCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xySmoo= thCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->xySmoothCurv= eDock); } else if (className =3D=3D "TextLabel") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Text Label")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Text Label")); = - if (!m_mainWindow->textLabelDock) { - m_mainWindow->textLabelDock =3D new LabelWidget(m_mainWindow->= stackedWidget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->textLabel= Dock); + if (!m_mainWindow->textLabelDock) { + m_mainWindow->textLabelDock =3D new LabelWidget(m_mainWindow->stackedWi= dget); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->textLabelDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->textLabelDock->setLabels(list); + m_mainWindow->textLabelDock->setLabels(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->textLa= belDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->textLabelDoc= k); } else if (className =3D=3D "CustomPoint") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Custom Point"= )); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Custom Point")); = - if (!m_mainWindow->customPointDock) { - m_mainWindow->customPointDock =3D new CustomPointDock(m_mainWi= ndow->stackedWidget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->customPoi= ntDock); + if (!m_mainWindow->customPointDock) { + m_mainWindow->customPointDock =3D new CustomPointDock(m_mainWindow->sta= ckedWidget); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->customPointDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->customPointDock->setPoints(list); + m_mainWindow->customPointDock->setPoints(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->custom= PointDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->customPointD= ock); } else if (className =3D=3D "DatapickerCurve") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Datapicker Cu= rve")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Datapicker Curve")); = - if (!m_mainWindow->datapickerCurveDock) { - m_mainWindow->datapickerCurveDock =3D new DatapickerCurveWidge= t(m_mainWindow->stackedWidget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->datapicke= rCurveDock); + if (!m_mainWindow->datapickerCurveDock) { + m_mainWindow->datapickerCurveDock =3D new DatapickerCurveWidget(m_mainW= indow->stackedWidget); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->datapickerCurveDoc= k); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->datapickerCurveDock->setCurves(list); + m_mainWindow->datapickerCurveDock->setCurves(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->datapi= ckerCurveDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->datapickerCu= rveDock); } else if (className =3D=3D "Datapicker") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Datapicker")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Datapicker")); = - if (!m_mainWindow->datapickerImageDock) { - m_mainWindow->datapickerImageDock =3D new DatapickerImageWidge= t(m_mainWindow->stackedWidget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->datapicke= rImageDock); + if (!m_mainWindow->datapickerImageDock) { + m_mainWindow->datapickerImageDock =3D new DatapickerImageWidget(m_mainW= indow->stackedWidget); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->datapickerImageDoc= k); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect)->image(); - m_mainWindow->datapickerImageDock->setImages(list); + m_mainWindow->datapickerImageDock->setImages(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->datapi= ckerImageDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->datapickerIm= ageDock); } else if (className =3D=3D "Project") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Project")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Project")); = - if (!m_mainWindow->projectDock) { - m_mainWindow->projectDock =3D new ProjectDock(m_mainWindow->st= ackedWidget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->projectDo= ck); + if (!m_mainWindow->projectDock) { + m_mainWindow->projectDock =3D new ProjectDock(m_mainWindow->stackedWidg= et); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->projectDock); } = - m_mainWindow->projectDock->setProject(m_mainWindow->m_project); + m_mainWindow->projectDock->setProject(m_mainWindow->m_project); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->projec= tDock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->projectDock); } else if (className=3D=3D"CantorWorksheet"){ #ifdef HAVE_CANTOR_LIBS - if (!m_mainWindow->cantorWorksheetDock){ - m_mainWindow->cantorWorksheetDock =3D new CantorWorksheetDock(= m_mainWindow->stackedWidget); - connect(m_mainWindow->cantorWorksheetDock, SIGNAL(info(QString= )), m_mainWindow->statusBar(), SLOT(showMessage(QString))); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->cantorWor= ksheetDock); + if (!m_mainWindow->cantorWorksheetDock){ + m_mainWindow->cantorWorksheetDock =3D new CantorWorksheetDock(m_mainWin= dow->stackedWidget); + connect(m_mainWindow->cantorWorksheetDock, SIGNAL(info(QString)), m_mai= nWindow->statusBar(), SLOT(showMessage(QString))); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->cantorWorksheetDoc= k); } = QList list; - foreach(aspect, selectedAspects){ - list<(aspect); - } - if (list.size()=3D=3D1){ - m_mainWindow->m_propertiesDock->setWindowTitle(list.first()->b= ackendName() + " Properties"); - } else { - m_mainWindow->m_propertiesDock->setWindowTitle("CAS Properties= "); - } - m_mainWindow->cantorWorksheetDock->setCantorWorksheets(list); - - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->cantor= WorksheetDock); + for (auto* aspect: selectedAspects) + list << qobject_cast(aspect); + if (list.size() =3D=3D 1) + m_mainWindow->m_propertiesDock->setWindowTitle(list.first()->backendNam= e() + " Properties"); + else + m_mainWindow->m_propertiesDock->setWindowTitle("CAS Properties"); + m_mainWindow->cantorWorksheetDock->setCantorWorksheets(list); + + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->cantorWorksh= eetDock); #endif } else if (className =3D=3D "Notes") { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Notes")); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Notes")); = - if (!m_mainWindow->notesDock) { - m_mainWindow->notesDock =3D new NoteDock(m_mainWindow->stacked= Widget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->notesDock= ); + if (!m_mainWindow->notesDock) { + m_mainWindow->notesDock =3D new NoteDock(m_mainWindow->stackedWidget); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->notesDock); } = QList list; - foreach (aspect, selectedAspects) + for (auto* aspect: selectedAspects) list << qobject_cast(aspect); - m_mainWindow->notesDock->setNotesList(list); + m_mainWindow->notesDock->setNotesList(list); = - m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->notesD= ock); + m_mainWindow->stackedWidget->setCurrentWidget(m_mainWindow->notesDock); } else { - m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Properties")); - if (m_mainWindow->stackedWidget->currentWidget()) - m_mainWindow->stackedWidget->currentWidget()->hide(); + m_mainWindow->m_propertiesDock->setWindowTitle(i18n("Properties")); + if (m_mainWindow->stackedWidget->currentWidget()) + m_mainWindow->stackedWidget->currentWidget()->hide(); } } = @@ -521,23 +519,23 @@ void GuiObserver::hiddenAspectSelected(const Abstract= Aspect* aspect) const { = QString className =3D parent->metaObject()->className(); if (className =3D=3D "Axis") { - if (!m_mainWindow->axisDock) { - m_mainWindow->axisDock =3D new AxisDock(m_mainWindow->stackedW= idget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->axisDock); + if (!m_mainWindow->axisDock) { + m_mainWindow->axisDock =3D new AxisDock(m_mainWindow->stackedWidget); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->axisDock); } - m_mainWindow->axisDock->activateTitleTab(); + m_mainWindow->axisDock->activateTitleTab(); } else if (className =3D=3D "CartesianPlot") { - if (!m_mainWindow->cartesianPlotDock) { - m_mainWindow->cartesianPlotDock =3D new CartesianPlotDock(m_ma= inWindow->stackedWidget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->cartesian= PlotDock); + if (!m_mainWindow->cartesianPlotDock) { + m_mainWindow->cartesianPlotDock =3D new CartesianPlotDock(m_mainWindow-= >stackedWidget); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->cartesianPlotDock); } - m_mainWindow->cartesianPlotDock->activateTitleTab(); + m_mainWindow->cartesianPlotDock->activateTitleTab(); } else if (className =3D=3D "CartesianPlotLegend") { - if (!m_mainWindow->cartesianPlotLegendDock) { - m_mainWindow->cartesianPlotLegendDock =3D new CartesianPlotLeg= endDock(m_mainWindow->stackedWidget); - m_mainWindow->stackedWidget->addWidget(m_mainWindow->cartesian= PlotLegendDock); + if (!m_mainWindow->cartesianPlotLegendDock) { + m_mainWindow->cartesianPlotLegendDock =3D new CartesianPlotLegendDock(m= _mainWindow->stackedWidget); + m_mainWindow->stackedWidget->addWidget(m_mainWindow->cartesianPlotLegen= dDock); } - m_mainWindow->cartesianPlotLegendDock->activateTitleTab(); + m_mainWindow->cartesianPlotLegendDock->activateTitleTab(); } } =20