diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp
index 101b8cbe3964a163b432378b6e3ce4f055139d16..1213c95e06d3702a4c7061bcf61b26fdb00ee856 100644
--- a/MantidPlot/src/ApplicationWindow.cpp
+++ b/MantidPlot/src/ApplicationWindow.cpp
@@ -895,10 +895,6 @@ void ApplicationWindow::initGlobalConstants() {
// MG: On Linux, if cups defines a printer queue that cannot be contact, the
// QPrinter constructor hangs and doesn't timeout.
-
- // QPrinterInfo::availablePrinters();
-
- // d_export_resolution = QPrinter().resolution();
d_export_color = true;
d_export_vector_size = static_cast<int>(QPrinter::Custom);
d_keep_plot_aspect = true;
@@ -914,8 +910,6 @@ QMenuBar *ApplicationWindow::myMenuBar() {
void ApplicationWindow::initToolBars() {
initPlot3DToolBar();
-
- // setWindowIcon(QIcon(getQPixmap("logo_xpm")));
setWindowIcon(QIcon(":/MantidPlot_Icon_32offset.png"));
QPixmap openIcon, saveIcon;
@@ -984,7 +978,6 @@ void ApplicationWindow::initToolBars() {
btnCursor->setActionGroup(dataTools);
btnCursor->setCheckable(true);
btnCursor->setIcon(QIcon(getQPixmap("select_xpm")));
- // plotTools->addAction(btnCursor); disabled until fixed (#2783)
btnPicker = new QAction(tr("S&creen Reader"), this);
btnPicker->setActionGroup(dataTools);
btnPicker->setCheckable(true);
@@ -995,21 +988,18 @@ void ApplicationWindow::initToolBars() {
actionDrawPoints->setActionGroup(dataTools);
actionDrawPoints->setCheckable(true);
actionDrawPoints->setIcon(QIcon(getQPixmap("draw_points_xpm")));
- // plotTools->addAction(actionDrawPoints); disabled until fixed (#2783)
btnMovePoints = new QAction(tr("&Move Data Points..."), this);
btnMovePoints->setShortcut(tr("Ctrl+ALT+M"));
btnMovePoints->setActionGroup(dataTools);
btnMovePoints->setCheckable(true);
btnMovePoints->setIcon(QIcon(getQPixmap("hand_xpm")));
- // plotTools->addAction(btnMovePoints); disabled until fixed (#2783)
btnRemovePoints = new QAction(tr("Remove &Bad Data Points..."), this);
btnRemovePoints->setShortcut(tr("Alt+B"));
btnRemovePoints->setActionGroup(dataTools);
btnRemovePoints->setCheckable(true);
btnRemovePoints->setIcon(QIcon(getQPixmap("gomme_xpm")));
- // plotTools->addAction(btnRemovePoints); disabled until fixed (#2783)
if (mantidUI->fitFunctionBrowser()) {
btnMultiPeakPick = new QAction(tr("Select Multiple Peaks..."), this);
@@ -1205,7 +1195,6 @@ void ApplicationWindow::initMainMenu() {
plot3DMenu->addAction(actionContourMap);
plot3DMenu->addAction(actionGrayMap);
plot3DMenu->addSeparator();
- // plot3DMenu->addAction(actionPlotHistogram);
matrixMenu = new QMenu(this);
matrixMenu->setObjectName("matrixMenu");
@@ -1240,9 +1229,6 @@ void ApplicationWindow::initMainMenu() {
decayMenu = new QMenu(this);
decayMenu->setObjectName("decayMenu");
- multiPeakMenu = new QMenu(this);
- multiPeakMenu->setObjectName("multiPeakMenu");
-
analysisMenu = new QMenu(this);
analysisMenu->setObjectName("analysisMenu");
connect(analysisMenu, SIGNAL(aboutToShow()), this,
@@ -3024,13 +3010,6 @@ void ApplicationWindow::setPreferences(Graph *g) {
g->setScale(QwtPlot::xBottom, d_axes_scales[2]);
g->setScale(QwtPlot::xTop, d_axes_scales[3]);
- // QtiPlot makes these calls here (as of 26/6/12), but they spoil color fill
- // plots for us.
- // Losing them seems to have no detrimental effect. Perhaps we need to
- // update our updateSecondaryAxis code to match QtiPlot's.
- // g->updateSecondaryAxis(QwtPlot::xTop);
- // g->updateSecondaryAxis(QwtPlot::yRight);
-
QList<int> ticksList;
ticksList << majTicksStyle << majTicksStyle << majTicksStyle
<< majTicksStyle;
@@ -3891,7 +3870,6 @@ void ApplicationWindow::defineErrorBars(const QString &name, int type,
ycol = t->colIndex(xColName);
QVarLengthArray<double> Y(t->col(ycol));
- // Y=t->col(ycol);
QString errColName = t->colName(c);
double prc = percent.toDouble();
@@ -5396,8 +5374,6 @@ void ApplicationWindow::readSettings() {
settings.value("/ImageFileTypeFilter", ".png").toString();
d_export_transparency = settings.value("/ExportTransparency", false).toBool();
d_export_quality = settings.value("/ImageQuality", 100).toInt();
- // d_export_resolution = settings.value("/Resolution",
- // QPrinter().resolution()).toInt();
d_export_color = settings.value("/ExportColor", true).toBool();
d_export_vector_size =
settings.value("/ExportPageSize", QPrinter::Custom).toInt();
@@ -6266,7 +6242,7 @@ void ApplicationWindow::saveProjectAs(const QString &fileName, bool compress) {
QString fn = fileName;
if (fileName.isEmpty()) {
QString filter = tr("MantidPlot project") +
- " (*.mantid);;"; // tr("QtiPlot project")+" (*.qti);;";
+ " (*.mantid);;";
filter += tr("Compressed MantidPlot project") + " (*.mantid.gz)";
QString selectedFilter;
@@ -6301,7 +6277,6 @@ void ApplicationWindow::saveProjectAs(const QString &fileName, bool compress) {
workingDir = fi.absolutePath();
QString baseName = fi.fileName();
if (!baseName.contains("."))
- // fn.append(".qti");
fn.append(".mantid");
projectname = fn;
@@ -7434,7 +7409,6 @@ void ApplicationWindow::showPlotDialog(int curveKey) {
PlotDialog *pd = new PlotDialog(d_extended_plot_dialog, this, w);
pd->setAttribute(Qt::WA_DeleteOnClose);
pd->insertColumnsList(columnsList(Table::All));
- // pd->setMultiLayer(w);
if (curveKey >= 0) {
Graph *g = w->activeGraph();
if (g)
@@ -8206,7 +8180,7 @@ void ApplicationWindow::showCursor() {
/** Switch on the multi-peak selecting tool for fitting
* with the Fit algorithm of multiple peaks on a single background
- */
+ */
void ApplicationWindow::selectMultiPeak(bool showFitPropertyBrowser) {
MultiLayer *plot = dynamic_cast<MultiLayer *>(activeWindow(MultiLayerWindow));
if (!plot)
@@ -8263,10 +8237,6 @@ void ApplicationWindow::selectMultiPeak(MultiLayer *plot,
mantidUI->fitFunctionBrowser()->setEndX(xmax);
}
g->setActiveTool(ppicker);
- // do we need this? PeakPickerTool::windowStateChanged does nothing
- // connect(plot,SIGNAL(windowStateChanged(Qt::WindowStates,
- // Qt::WindowStates)),ppicker,SLOT(windowStateChanged(Qt::WindowStates,
- // Qt::WindowStates)));
}
}
}
@@ -8756,7 +8726,6 @@ MdiSubWindow *ApplicationWindow::clone(MdiSubWindow *w) {
for (auto j = 0; j < nt->numRows(); j++) {
auto io = t->table()->item(j, i);
nt->table()->setItem(j, i, io);
- // nt->table()->item(j, i)->setText(t->table()->item(j, i)->text());
}
}
@@ -9270,11 +9239,6 @@ void ApplicationWindow::analysisMenuAboutToShow() {
return;
if (isOfType(w, "MultiLayer")) {
- // The tool doesn't work yet (DataPickerTool)
- // QMenu *translateMenu = analysisMenu->addMenu (tr("&Translate"));
- // translateMenu->addAction(actionTranslateVert);
- // translateMenu->addAction(actionTranslateHor);
- // analysisMenu->insertSeparator();
analysisMenu->addAction(actionDifferentiate);
analysisMenu->addAction(actionIntegrate);
analysisMenu->addAction(actionShowIntDialog);
@@ -9312,12 +9276,6 @@ void ApplicationWindow::analysisMenuAboutToShow() {
analysisMenu->addAction(actionFitGauss);
analysisMenu->addAction(actionFitLorentz);
- // The tool doesn't work yet (DataPickerTool)
- // multiPeakMenu->clear();
- // multiPeakMenu = analysisMenu->addMenu (tr("Fit &Multi-peak"));
- // multiPeakMenu->addAction(actionMultiPeakGauss);
- // multiPeakMenu->addAction(actionMultiPeakLorentz);
-
analysisMenu->addSeparator();
analysisMenu->addAction(actionShowFitDialog);
} else if (isOfType(w, "Matrix")) {
@@ -10508,60 +10466,6 @@ void ApplicationWindow::chooseHelpFolder() {
}
}
-void ApplicationWindow::showStandAloneHelp() {
-#ifdef Q_OS_MAC // Mac
- QSettings settings(QSettings::IniFormat, QSettings::UserScope,
- QCoreApplication::organizationName(),
- QCoreApplication::applicationName());
-#else
- QSettings settings; //(QSettings::NativeFormat,QSettings::UserScope,
- //"ProIndependent", "QtiPlot");
-#endif
-
- settings.beginGroup("/General");
- settings.beginGroup("/Paths");
- QString helpPath = settings.value("/HelpFile", qApp->applicationDirPath() +
- "/manual/index.html")
- .toString();
- settings.endGroup();
- settings.endGroup();
-
- QFile helpFile(helpPath);
- if (!helpPath.isEmpty() && !helpFile.exists()) {
- QMessageBox::critical(0, tr("MantidPlot - Help Files Not Found!"), // Mantid
- tr("The manual can be found at the following "
- "internet address:") +
- "<p><a href = "
- "http://www.mantidproject.org/"
- "MantidPlot:_Help>http://www.mantidproject.org/"
- "MantidPlot:_Help</a></p>");
- exit(0);
- }
-
- QFileInfo fi(helpPath);
- QString profilePath = QString(fi.absolutePath() + "/qtiplot.adp");
- if (!QFile(profilePath).exists()) {
- QMessageBox::critical(
- 0, tr("MantidPlot - Help Profile Not Found!"), // Mantid
- tr("The assistant could not start because the file <b>%1</b> was not "
- "found in the help file directory!")
- .arg("qtiplot.adp") +
- "<br>" +
- tr("This file is provided with the MantidPlot manual which can be "
- "downloaded from the following internet address:") +
- "<p><a href = "
- "http://www.mantidproject.org/MantidPlot:_Help>http://"
- "www.mantidproject.org/MantidPlot:_Help</a></p>");
- exit(0);
- }
-
- QStringList cmdLst = QStringList() << "-profile" << profilePath;
- // QAssistantClient *assist = new QAssistantClient( QString(), 0);
- // assist->setArguments( cmdLst );
- // assist->showPage(helpPath);
- // connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) );
-}
-
void ApplicationWindow::showHelp() {
QFile helpFile(helpFilePath);
if (!helpFile.exists()) {
@@ -10599,9 +10503,6 @@ void ApplicationWindow::showHelp() {
return;
}
- QStringList cmdLst = QStringList() << "-profile" << profilePath;
- // assistant->setArguments( cmdLst );
- // assistant->showPage(helpFilePath);
}
void ApplicationWindow::showPlotWizard() {
@@ -11995,8 +11896,6 @@ void ApplicationWindow::connectMultilayerPlot(MultiLayer *g) {
connect(g, SIGNAL(createTable(const QString &, int, int, const QString &)),
this, SLOT(newTable(const QString &, int, int, const QString &)));
connect(g, SIGNAL(viewTitleDialog()), this, SLOT(showTitleDialog()));
- // connect
- // (g,SIGNAL(modifiedWindow(MdiSubWindow*)),this,SLOT(modifiedProject(MdiSubWindow*)));
connect(g, SIGNAL(modifiedPlot()), this, SLOT(modifiedProject()));
connect(g, SIGNAL(showLineDialog()), this, SLOT(showLineDialog()));
connect(g, SIGNAL(pasteMarker()), this, SLOT(pasteSelection()));
@@ -12575,7 +12474,6 @@ void ApplicationWindow::createActions() {
connect(actionShowColumnOptionsDialog, SIGNAL(activated()), this,
SLOT(showColumnOptionsDialog()));
- // JZ May 3, 2011: Removed this because it segfaults.
actionShowColumnValuesDialog = new QAction(
QIcon(getQPixmap("formula_xpm")), tr("Set Column &Values ..."), this);
connect(actionShowColumnValuesDialog, SIGNAL(activated()), this,
@@ -12937,14 +12835,6 @@ void ApplicationWindow::createActions() {
actionDeconvolute = new QAction(tr("&Deconvolute"), this);
connect(actionDeconvolute, SIGNAL(activated()), this, SLOT(deconvolute()));
- actionTranslateHor = new QAction(tr("&Horizontal"), this);
- connect(actionTranslateHor, SIGNAL(activated()), this,
- SLOT(translateCurveHor()));
-
- actionTranslateVert = new QAction(tr("&Vertical"), this);
- connect(actionTranslateVert, SIGNAL(activated()), this,
- SLOT(translateCurveVert()));
-
actionSetAscValues = new QAction(QIcon(getQPixmap("rowNumbers_xpm")),
tr("Ro&w Numbers"), this);
connect(actionSetAscValues, SIGNAL(activated()), this, SLOT(setAscValues()));
@@ -12985,26 +12875,9 @@ void ApplicationWindow::createActions() {
new QAction(QIcon(getQPixmap("boxPlot_xpm")), tr("&Box Plot"), this);
connect(actionBoxPlot, SIGNAL(activated()), this, SLOT(plotBoxDiagram()));
- actionMultiPeakGauss = new QAction(tr("&Gaussian..."), this);
- connect(actionMultiPeakGauss, SIGNAL(activated()), this,
- SLOT(fitMultiPeakGauss()));
-
- actionMultiPeakLorentz = new QAction(tr("&Lorentzian..."), this);
- connect(actionMultiPeakLorentz, SIGNAL(activated()), this,
- SLOT(fitMultiPeakLorentz()));
-
- // actionCheckUpdates = new QAction(tr("Search for &Updates"), this);
- // connect(actionCheckUpdates, SIGNAL(activated()), this,
- // SLOT(searchForUpdates()));
-
actionHomePage = new QAction(tr("&Mantid Homepage"), this); // Mantid change
connect(actionHomePage, SIGNAL(activated()), this, SLOT(showHomePage()));
- // actionHelpForums = new QAction(tr("QtiPlot &Forums"), this); // Mantid
- // change
- // connect(actionHelpForums, SIGNAL(triggered()), this,
- // SLOT(showForums())); // Mantid change
-
actionHelpBugReports = new QAction(tr("Report a &Bug"), this);
connect(actionHelpBugReports, SIGNAL(triggered()), this,
SLOT(showBugTracker()));
@@ -13444,18 +13317,12 @@ void ApplicationWindow::translateActionsStrings() {
actionAbout->setText(tr("&About MantidPlot")); // Mantid
actionAbout->setShortcut(tr("F1"));
- // actionShowHelp->setMenuText(tr("&Help"));
- // actionShowHelp->setShortcut(tr("Ctrl+H"));
-
actionMantidConcepts->setText(tr("&Mantid Concepts"));
actionMantidAlgorithms->setText("&Algorithm Descriptions");
actionmantidplotHelp->setText("&MantidPlot Help");
- // actionChooseHelpFolder->setMenuText(tr("&Choose Help Folder..."));
- // actionRename->setMenuText(tr("&Rename Window"));
-
actionCloseWindow->setText(tr("Close &Window"));
actionCloseWindow->setShortcut(tr("Ctrl+W"));
@@ -13524,21 +13391,19 @@ void ApplicationWindow::translateActionsStrings() {
actionConvertTableToWorkspace->setText(tr("Convert to Table&Workspace"));
actionConvertTableToMatrixWorkspace->setText(
tr("Convert to MatrixWorkspace"));
- actionPlot3DWireFrame->setText(tr("3D &Wire Frame"));
- actionPlot3DHiddenLine->setText(tr("3D &Hidden Line"));
- actionPlot3DPolygons->setText(tr("3D &Polygons"));
- actionPlot3DWireSurface->setText(tr("3D Wire &Surface"));
- actionSortTable->setText(tr("Sort Ta&ble"));
- actionSortSelection->setText(tr("Sort Columns"));
- actionNormalizeTable->setText(tr("&Table"));
- actionNormalizeSelection->setText(tr("&Columns"));
- actionCorrelate->setText(tr("Co&rrelate"));
- actionAutoCorrelate->setText(tr("&Autocorrelate"));
- actionConvolute->setText(tr("&Convolute"));
- actionDeconvolute->setText(tr("&Deconvolute"));
- actionTranslateHor->setText(tr("&Horizontal"));
- actionTranslateVert->setText(tr("&Vertical"));
- actionSetAscValues->setText(tr("Ro&w Numbers"));
+ actionPlot3DWireFrame->setMenuText(tr("3D &Wire Frame"));
+ actionPlot3DHiddenLine->setMenuText(tr("3D &Hidden Line"));
+ actionPlot3DPolygons->setMenuText(tr("3D &Polygons"));
+ actionPlot3DWireSurface->setMenuText(tr("3D Wire &Surface"));
+ actionSortTable->setMenuText(tr("Sort Ta&ble"));
+ actionSortSelection->setMenuText(tr("Sort Columns"));
+ actionNormalizeTable->setMenuText(tr("&Table"));
+ actionNormalizeSelection->setMenuText(tr("&Columns"));
+ actionCorrelate->setMenuText(tr("Co&rrelate"));
+ actionAutoCorrelate->setMenuText(tr("&Autocorrelate"));
+ actionConvolute->setMenuText(tr("&Convolute"));
+ actionDeconvolute->setMenuText(tr("&Deconvolute"));
+ actionSetAscValues->setMenuText(tr("Ro&w Numbers"));
actionSetAscValues->setToolTip(tr("Fill selected columns with row numbers"));
actionSetRandomValues->setText(tr("&Random Values"));
actionSetRandomValues->setToolTip(
@@ -13561,20 +13426,9 @@ void ApplicationWindow::translateActionsStrings() {
actionBoxPlot->setText(tr("&Box Plot"));
actionBoxPlot->setToolTip(tr("Box and whiskers plot"));
- actionMultiPeakGauss->setText(tr("&Gaussian..."));
- actionMultiPeakLorentz->setText(tr("&Lorentzian..."));
- actionHomePage->setText(tr("&Mantid Homepage")); // Mantid change
- // actionCheckUpdates->setText(tr("Search for &Updates")); //Mantid change
- // - commented out
- // actionHelpForums->setText(tr("Visit QtiPlot &Forums"));
+ actionHomePage->setMenuText(tr("&Mantid Homepage")); // Mantid change
actionHelpBugReports->setText(tr("Report a &Bug"));
actionAskHelp->setText(tr("Ask for Help"));
- // actionDownloadManual->setText(tr("Download &Manual"));//Mantid change -
- // commented out
- // actionTranslations->setText(tr("&Translations"));//Mantid change -
- // commented out
- // actionDonate->setText(tr("Make a &Donation"));
- // actionTechnicalSupport->setText(tr("Technical &Support"));
btnPointer->setText(tr("Selection &Tools"));
btnPointer->setToolTip(tr("Selection Tools"));
@@ -13620,9 +13474,6 @@ void ApplicationWindow::translateActionsStrings() {
btnLine->setToolTip(tr("Draw Line"));
// FIXME: is setText necessary for action groups?
- // coord->setText( tr( "Coordinates" ) );
- // coord->setText( tr( "&Coord" ) );
- // coord->setStatusTip( tr( "Coordinates" ) );
Box->setText(tr("Box"));
Box->setText(tr("Box"));
Box->setToolTip(tr("Box"));
@@ -13675,9 +13526,6 @@ void ApplicationWindow::translateActionsStrings() {
crossHairStyle->setToolTip(tr("Crosshairs"));
crossHairStyle->setStatusTip(tr("Crosshairs"));
- // floorstyle->setText( tr( "Floor Style" ) );
- // floorstyle->setMenuText( tr( "Floor Style" ) );
- // floorstyle->setStatusTip( tr( "Floor Style" ) );
floordata->setText(tr("Floor Data Projection"));
floordata->setToolTip(tr("Floor data projection"));
floordata->setStatusTip(tr("Floor data projection"));
@@ -14073,72 +13921,6 @@ void ApplicationWindow::updateRecentFilesList(QString fname) {
}
}
-void ApplicationWindow::translateCurveHor() {
- MultiLayer *plot = dynamic_cast<MultiLayer *>(activeWindow(MultiLayerWindow));
- if (!plot)
- return;
- if (plot->isEmpty()) {
- QMessageBox::warning(
- this, tr("MantidPlot - Warning"), // Mantid
- tr("<h4>There are no plot layers available in this window.</h4>"
- "<p><h4>Please add a layer and try again!</h4>"));
- btnPointer->setChecked(true);
- return;
- }
-
- Graph *g = dynamic_cast<Graph *>(plot->activeGraph());
- if (!g)
- return;
-
- if (g->isPiePlot()) {
- QMessageBox::warning(
- this, tr("MantidPlot - Warning"), // Mantid
- tr("This functionality is not available for pie plots!"));
-
- btnPointer->setChecked(true);
- return;
- } else if (g->validCurvesDataSize()) {
- btnPointer->setChecked(true);
- g->setActiveTool(
- new TranslateCurveTool(g, this, TranslateCurveTool::Horizontal, info,
- SLOT(setText(const QString &))));
- displayBar->show();
- }
-}
-
-void ApplicationWindow::translateCurveVert() {
- MultiLayer *plot = dynamic_cast<MultiLayer *>(activeWindow(MultiLayerWindow));
- if (!plot)
- return;
- if (plot->isEmpty()) {
- QMessageBox::warning(
- this, tr("MantidPlot - Warning"), // Mantid
- tr("<h4>There are no plot layers available in this window.</h4>"
- "<p><h4>Please add a layer and try again!</h4>"));
- btnPointer->setChecked(true);
- return;
- }
-
- Graph *g = dynamic_cast<Graph *>(plot->activeGraph());
- if (!g)
- return;
-
- if (g->isPiePlot()) {
- QMessageBox::warning(
- this, tr("MantidPlot - Warning"), // Mantid
- tr("This functionality is not available for pie plots!"));
-
- btnPointer->setChecked(true);
- return;
- } else if (g->validCurvesDataSize()) {
- btnPointer->setChecked(true);
- g->setActiveTool(new TranslateCurveTool(g, this,
- TranslateCurveTool::Vertical, info,
- SLOT(setText(const QString &))));
- displayBar->show();
- }
-}
-
void ApplicationWindow::setReadOnlyCol() {
Table *t = dynamic_cast<Table *>(activeWindow(TableWindow));
if (!t)
@@ -14238,55 +14020,10 @@ void ApplicationWindow::disregardCol() {
t->setPlotDesignation(Table::None);
}
-void ApplicationWindow::fitMultiPeakGauss() {
- fitMultiPeak((int)MultiPeakFit::Gauss);
-}
-
-void ApplicationWindow::fitMultiPeakLorentz() {
- fitMultiPeak((int)MultiPeakFit::Lorentz);
-}
-
-void ApplicationWindow::fitMultiPeak(int profile) {
- MultiLayer *plot = dynamic_cast<MultiLayer *>(activeWindow(MultiLayerWindow));
- if (!plot)
- return;
- if (plot->isEmpty()) {
- QMessageBox::warning(
- this, tr("MantidPlot - Warning"), // Mantid
- tr("<h4>There are no plot layers available in this window.</h4>"
- "<p><h4>Please add a layer and try again!</h4>"));
- btnPointer->setChecked(true);
- return;
- }
-
- Graph *g = dynamic_cast<Graph *>(plot->activeGraph());
- if (!g || !g->validCurvesDataSize())
- return;
-
- if (g->isPiePlot()) {
- QMessageBox::warning(
- this, tr("MantidPlot - Warning"), // Mantid
- tr("This functionality is not available for pie plots!"));
- return;
- } else {
- bool ok;
- int peaks = QInputDialog::getInteger(this,
- tr("MantidPlot - Enter the number of peaks"), // Mantid
- tr("Peaks"), 2, 2, 1000000, 1, &ok);
- if (ok && peaks) {
- g->setActiveTool(
- new MultiPeakFitTool(g, this, (MultiPeakFit::PeakProfile)profile,
- peaks, info, SLOT(setText(const QString &))));
- displayBar->show();
- }
- }
-}
-
void ApplicationWindow::showHomePage() {
QDesktopServices::openUrl(QUrl("http://www.mantidproject.org"));
}
void ApplicationWindow::showMantidConcepts() {
- // QDesktopServices::openUrl(QUrl("http://www.mantidproject.org/Category:Concepts"));
HelpWindow::showConcept(this);
}
void ApplicationWindow::showalgorithmDescriptions() {
@@ -14852,7 +14589,6 @@ void ApplicationWindow::projectProperties() {
new QMessageBox(tr("Properties"), s, QMessageBox::NoIcon, QMessageBox::Ok,
QMessageBox::NoButton, QMessageBox::NoButton, this);
- // mbox->setIconPixmap(QPixmap( qtiplot_logo_xpm ));
mbox->show();
}
@@ -14872,9 +14608,7 @@ void ApplicationWindow::folderProperties() {
tr("windows");
s += ", " + QString::number(currentFolder()->subfolders().count()) + " " +
tr("folders") + "\n\n";
- // s += "\n\n\n";
s += tr("Created") + ": " + currentFolder()->birthDate() + "\n\n";
- // s += tr("Modified") + ": " + currentFolder()->modificationDate() + "\n\n";
QMessageBox *mbox =
new QMessageBox(tr("Properties"), s, QMessageBox::NoIcon, QMessageBox::Ok,
@@ -15098,8 +14832,6 @@ bool ApplicationWindow::changeFolder(Folder *newFolder, bool force) {
else if (w->status() == MdiSubWindow::Maximized)
w->setMaximized();
}
- // else
- // w->setStatus(MdiSubWindow::Hidden);
addListViewItem(w);
}
@@ -15815,12 +15547,6 @@ void ApplicationWindow::restoreApplicationGeometry() {
void ApplicationWindow::scriptsDirPathChanged(const QString &path) {
scriptsDirPath = path;
-
- // QList<MdiSubWindow*> windows = windowsList();
- // foreach(MdiSubWindow *w, windows){
- // if (w->isA("Note"))
- // dynamic_cast<Note*>(w)->setDirPath(path);
- // }
}
void ApplicationWindow::makeToolbarsMenu()
diff --git a/MantidPlot/src/ApplicationWindow.h b/MantidPlot/src/ApplicationWindow.h
index 31ff30f9506f4f2caa8d11bba0bccb7cd59480f4..57fb3ffeee58b09be64d9dceb2cf84b2755ebde1 100644
--- a/MantidPlot/src/ApplicationWindow.h
+++ b/MantidPlot/src/ApplicationWindow.h
@@ -652,9 +652,9 @@ public slots:
void fitSigmoidal();
void fitGauss();
void fitLorentz();
- void fitMultiPeak(int profile);
- void fitMultiPeakGauss();
- void fitMultiPeakLorentz();
+ //void fitMultiPeak(int profile);
+ //void fitMultiPeakGauss();
+ //void fitMultiPeakLorentz();
//@}
//! \name Calculus
@@ -737,7 +737,6 @@ public slots:
void showMoreWindows();
void showMarkerPopupMenu();
void showHelp();
- static void showStandAloneHelp();
void chooseHelpFolder();
void showPlotWizard();
void showFitPolynomDialog();
@@ -770,9 +769,6 @@ public slots:
void showColorMapDialog();
//@}
- void translateCurveHor();
- void translateCurveVert();
-
//! Removes the curve identified by a key stored in the data() of actionRemoveCurve.
void removeCurve();
void hideCurve();
@@ -839,29 +835,12 @@ public slots:
//! Updates the recent projects list and menu (but doesn't insert anything)
void updateRecentProjectsList();
-
//! Inserts file name in the list of recent files (if fname not empty) and updates the "recent files" menu
void updateRecentFilesList(QString fname="");
-
- //! connected to the done(bool) signal of the http object
- //void receivedVersionFile(bool error);
- //! called when the user presses the actionCheckUpdates
- //void searchForUpdates();
-
- //! Open support page in external browser
- //void showSupportPage();
- //! Open donation page in external browser
- //void showDonationsPage();
//! Open QtiPlot homepage in external browser
void showHomePage();
- //! Open forums page at berliOS in external browser
- //void showForums();
//! Open bug tracking system at berliOS in external browser
void showBugTracker();
- //! Show download page in external browser
- //void downloadManual();
- //! Show translations page in external browser
- //void downloadTranslation();
void parseCommandLineArguments(const QStringList& args);
void createLanguagesList();
@@ -1039,7 +1018,6 @@ public slots:
signals:
void modified();
void shutting_down();
- //void changeToMDI(MdiSubWindow*);
protected:
bool event(QEvent *e) override;
@@ -1423,9 +1401,9 @@ private:
QAction *actionLowPassFilter, *actionHighPassFilter, *actionBandPassFilter, *actionBandBlockFilter;
QAction *actionSortTable, *actionSortSelection, *actionNormalizeSelection;
QAction *actionNormalizeTable, *actionConvolute, *actionDeconvolute, *actionCorrelate, *actionAutoCorrelate;
- QAction *actionTranslateHor, *actionTranslateVert, *actionSetAscValues, *actionSetRandomValues;
+ QAction *actionSetAscValues, *actionSetRandomValues;
QAction *actionSetXCol, *actionSetYCol, *actionSetZCol, *actionSetLabelCol, *actionDisregardCol, *actionSetXErrCol, *actionSetYErrCol;
- QAction *actionBoxPlot, *actionMultiPeakGauss, *actionMultiPeakLorentz, *actionCheckUpdates;
+ QAction *actionBoxPlot, *actionCheckUpdates;
QAction *actionDonate, *actionHomePage, *actionDownloadManual, *actionTechnicalSupport, *actionTranslations;
QAction *actionHelpForums, *actionHelpBugReports, *actionAskHelp;
QAction *actionShowPlotDialog, *actionShowScaleDialog;
@@ -1435,7 +1413,7 @@ private:
QAction *actionShowScriptWindow, *actionShowScriptInterpreter;
QAction *actionAnimate, *actionPerspective, *actionFitFrame, *actionResetRotation;
QAction *actionDeleteRows, *actionDrawPoints;
- QAction *btnCursor, /* *btnSelect,*/ *btnPicker, *btnRemovePoints, *btnMovePoints, /* *btnPeakPick,*/ *btnMultiPeakPick;
+ QAction *btnCursor, *btnPicker, *btnRemovePoints, *btnMovePoints, *btnMultiPeakPick;
QAction *btnZoomIn, *btnZoomOut, *btnPointer, *btnLine, *btnArrow, *btnLabel;
QAction *actionFlipMatrixVertically, *actionFlipMatrixHorizontally, *actionRotateMatrix;
QAction *actionViewMatrixImage, *actionViewMatrix, *actionExportMatrix;
diff --git a/MantidPlot/src/ImageExportDialog.cpp b/MantidPlot/src/ImageExportDialog.cpp
index 6953951351e004c9b0aa6f0637f3c5cebdd40ff6..e71589d83b10fdeddcd26c4b9dd211d5070c9b59 100644
--- a/MantidPlot/src/ImageExportDialog.cpp
+++ b/MantidPlot/src/ImageExportDialog.cpp
@@ -100,7 +100,6 @@ void ImageExportDialog::initAdvancedOptions()
resLabel->hide();
d_resolution = new QSpinBox();
d_resolution->setRange(0, 1000);
- //d_resolution->setValue(app->d_export_resolution);
//only printing with screen resolution works correctly for the moment
d_resolution->setValue(QPrinter().resolution());
vector_layout->addWidget(d_resolution, 1, 1);
diff --git a/MantidPlot/src/main.cpp b/MantidPlot/src/main.cpp
index 29dc92bcc14e894a5dde5c3ab6646eca91b193f8..b6da397d3e924194f1d8e75b17e458e51e3928ac 100644
--- a/MantidPlot/src/main.cpp
+++ b/MantidPlot/src/main.cpp
@@ -184,8 +184,7 @@ int main( int argc, char ** argv )
exit(0);
}
- //else if ( str == "-m" || str == "--manual" ) // Not for the time being at least
- // ApplicationWindow::showStandAloneHelp();
+
}
MantidApplication app( argc, argv );