Skip to content

Commit b40e82b

Browse files
committed
Closes #750
1 parent 155011e commit b40e82b

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

src/Interface/Application/Connection.cc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,14 @@ namespace
437437
void DataInfoDialog::show(PortDataDescriber portDataDescriber, const QString& label, const std::string& id)
438438
{
439439
auto info = eval(portDataDescriber);
440-
QMessageBox::information(SCIRunMainWindow::Instance(), label + " Data info: " + QString::fromStdString(id), info);
440+
441+
QMessageBox* msgBox = new QMessageBox(SCIRunMainWindow::Instance());
442+
msgBox->setAttribute(Qt::WA_DeleteOnClose);
443+
msgBox->setStandardButtons(QMessageBox::Ok);
444+
msgBox->setWindowTitle(label + " Data info: " + QString::fromStdString(id));
445+
msgBox->setText(info);
446+
msgBox->setModal(false);
447+
msgBox->show();
441448
}
442449

443450
void ConnectionLine::keyPressEvent(QKeyEvent* event)

src/Interface/Application/ModuleProxyWidget.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void ModuleProxyWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
179179
{
180180
if (PortWidget* p = qobject_cast<PortWidget*>(pressedSubWidget_))
181181
{
182-
p->doMouseRelease(event->button(), mapToScene(event->pos()));
182+
p->doMouseRelease(event->button(), mapToScene(event->pos()), event->modifiers());
183183
return;
184184
}
185185
if (grabbedByWidget_)

src/Interface/Application/NetworkEditor.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ int NetworkEditor::currentZoomPercentage() const
988988
return static_cast<int>(currentScale_ * 100);
989989
}
990990

991-
static QGraphicsTextItem* zoomHelp = 0;
991+
//static QGraphicsTextItem* zoomHelp = 0;
992992

993993
void NetworkEditor::keyPressEvent(QKeyEvent *event)
994994
{

src/Interface/Application/Port.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ void PortWidget::doMouseMove(Qt::MouseButtons buttons, const QPointF& pos)
234234

235235
void PortWidget::mouseReleaseEvent(QMouseEvent* event)
236236
{
237-
doMouseRelease(event->button(), event->pos());
237+
doMouseRelease(event->button(), event->pos(), event->modifiers());
238238
}
239239

240240
size_t PortWidget::getIndex() const
@@ -277,9 +277,13 @@ void PortWidget::cancelConnectionsInProgress()
277277
currentConnection_ = 0;
278278
}
279279

280-
void PortWidget::doMouseRelease(Qt::MouseButton button, const QPointF& pos)
280+
void PortWidget::doMouseRelease(Qt::MouseButton button, const QPointF& pos, Qt::KeyboardModifiers modifiers)
281281
{
282-
if (button == Qt::LeftButton)
282+
if (!isInput() && (button == Qt::MiddleButton || modifiers & Qt::ControlModifier))
283+
{
284+
DataInfoDialog::show(getPortDataDescriber(), "Port", moduleId_.id_ + "::" + portId_.toString());
285+
}
286+
else if (button == Qt::LeftButton)
283287
{
284288
toggleLight();
285289
update();
@@ -293,10 +297,6 @@ void PortWidget::doMouseRelease(Qt::MouseButton button, const QPointF& pos)
293297
{
294298
showMenu();
295299
}
296-
else if (button == Qt::MiddleButton && !isInput())
297-
{
298-
DataInfoDialog::show(getPortDataDescriber(), "Port", portId_.toString());
299-
}
300300
}
301301

302302
void PortWidget::makeConnection(const QPointF& pos)

src/Interface/Application/Port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class PortWidget : public PortWidgetBase, public NeedsScenePositionProvider
119119

120120
void doMousePress(Qt::MouseButton button, const QPointF& pos);
121121
void doMouseMove(Qt::MouseButtons buttons, const QPointF& pos);
122-
void doMouseRelease(Qt::MouseButton button, const QPointF& pos);
122+
void doMouseRelease(Qt::MouseButton button, const QPointF& pos, Qt::KeyboardModifiers modifiers);
123123

124124
SCIRun::Dataflow::Networks::PortDataDescriber getPortDataDescriber() const { return portDataDescriber_; }
125125

0 commit comments

Comments
 (0)