Skip to content
Snippets Groups Projects
Commit f1209c38 authored by Vickie Lynch's avatar Vickie Lynch
Browse files

Merge remote branch 'origin/feature/6132_Usability_Improvements_to_ImageView'

parents 29c8a828 34c59b58
No related branches found
No related tags found
No related merge requests found
......@@ -94,7 +94,8 @@ public slots:
void multi_color_scale();
void spectrum_color_scale();
void load_color_map();
void online_help_slot();
private:
Ui_ImageViewer* iv_ui;
......
......@@ -261,6 +261,7 @@
<property name="title">
<string>Help</string>
</property>
<addaction name="actionOnline_Help_Page"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuEdit"/>
......@@ -363,6 +364,11 @@
<string>Load Colormap</string>
</property>
</action>
<action name="actionOnline_Help_Page">
<property name="text">
<string>Online Help Page</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
......
......@@ -2,6 +2,8 @@
#include <iostream>
#include <qwt_plot_canvas.h>
#include <QDesktopServices>
#include "MantidQtAPI/MantidColorMap.h"
#include "MantidQtImageViewer/IVConnections.h"
......@@ -43,7 +45,7 @@ IVConnections::IVConnections( Ui_ImageViewer* ui,
iv_ui->actionOffset_Vertically->setDisabled(true);
iv_ui->actionOffset_Diagonally->setDisabled(true);
iv_ui->actionGraph_Rebinned_Data->setDisabled(true);
iv_ui->menuHelp->setDisabled(true);
iv_ui->menuHelp->setDisabled(false);
this->iv_main_window = iv_main_window;
QObject::connect( iv_ui->actionClose, SIGNAL(triggered()),
......@@ -255,6 +257,10 @@ IVConnections::IVConnections( Ui_ImageViewer* ui,
QwtPicker::DragSelection );
QObject::connect( v_graph_picker, SIGNAL(mouseMoved()),
this, SLOT(v_graphPicker_moved()) );
QObject::connect( iv_ui->actionOnline_Help_Page, SIGNAL(triggered()),
this, SLOT(online_help_slot()) );
}
......@@ -543,6 +549,12 @@ void IVConnections::ShowColorScale( std::vector<QRgb> & positive_color_table,
}
void IVConnections::online_help_slot()
{
QDesktopServices::openUrl(QUrl("http://www.mantidproject.org/MantidPlot:_ImageViewer"));
}
} // namespace MantidQt
} // namespace ImageView
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment