Skip to content

Commit 9aa2a85

Browse files
jessdtatejessdtate
committed
Merge remote-tracking branch 'upstream/issues_AE'
2 parents 4fd4fcd + 413efaf commit 9aa2a85

File tree

6 files changed

+91
-72
lines changed

6 files changed

+91
-72
lines changed

‎src/ExampleNets/regression/importFields.srn5‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<name>Filename</name>
4242
<value>
4343
<which>2</which>
44-
<value>E:/git/SCIRunTestData/Fields/tdcs/electrodes.mat</value>
44+
<value>%SCIRUNDATADIR%/Fields/tdcs/electrodes.mat</value>
4545
</value>
4646
</second>
4747
</item>
@@ -186,7 +186,7 @@
186186
<name>tolerance</name>
187187
<value>
188188
<which>1</which>
189-
<value>9.99999999999999950e-007</value>
189+
<value>9.99999999999999955e-07</value>
190190
</value>
191191
</second>
192192
</item>
@@ -322,7 +322,7 @@
322322
<name>CylinderRadius</name>
323323
<value>
324324
<which>1</which>
325-
<value>1.00000000000000010e-001</value>
325+
<value>1.00000000000000006e-01</value>
326326
</value>
327327
</second>
328328
</item>
@@ -382,7 +382,7 @@
382382
<name>EdgeTransparencyValue</name>
383383
<value>
384384
<which>1</which>
385-
<value>6.49999976158142090e-001</value>
385+
<value>6.49999976158142090e-01</value>
386386
</value>
387387
</second>
388388
</item>
@@ -442,7 +442,7 @@
442442
<name>FaceTransparencyValue</name>
443443
<value>
444444
<which>1</which>
445-
<value>6.49999976158142090e-001</value>
445+
<value>6.49999976158142090e-01</value>
446446
</value>
447447
</second>
448448
</item>
@@ -490,7 +490,7 @@
490490
<name>NodeTransparencyValue</name>
491491
<value>
492492
<which>1</which>
493-
<value>6.49999976158142090e-001</value>
493+
<value>6.49999976158142090e-01</value>
494494
</value>
495495
</second>
496496
</item>
@@ -634,7 +634,7 @@
634634
<name>SphereScaleValue</name>
635635
<value>
636636
<which>1</which>
637-
<value>2.99999999999999990e-002</value>
637+
<value>2.99999999999999989e-02</value>
638638
</value>
639639
</second>
640640
</item>
@@ -722,7 +722,7 @@
722722
<name>Ambient</name>
723723
<value>
724724
<which>1</which>
725-
<value>2.00000000000000010e-001</value>
725+
<value>2.00000000000000011e-01</value>
726726
</value>
727727
</second>
728728
</item>
@@ -758,7 +758,7 @@
758758
<name>Diffuse</name>
759759
<value>
760760
<which>1</which>
761-
<value>1.00000000000000000e+000</value>
761+
<value>1.00000000000000000e+00</value>
762762
</value>
763763
</second>
764764
</item>
@@ -782,7 +782,7 @@
782782
<name>Emission</name>
783783
<value>
784784
<which>1</which>
785-
<value>1.00000000000000000e+000</value>
785+
<value>1.00000000000000000e+00</value>
786786
</value>
787787
</second>
788788
</item>
@@ -818,7 +818,7 @@
818818
<name>FogEnd</name>
819819
<value>
820820
<which>1</which>
821-
<value>7.09999999999999960e-001</value>
821+
<value>7.09999999999999964e-01</value>
822822
</value>
823823
</second>
824824
</item>
@@ -842,7 +842,7 @@
842842
<name>FogStart</name>
843843
<value>
844844
<which>1</which>
845-
<value>0.00000000000000000e+000</value>
845+
<value>0.00000000000000000e+00</value>
846846
</value>
847847
</second>
848848
</item>
@@ -878,7 +878,7 @@
878878
<name>PolygonOffset</name>
879879
<value>
880880
<which>1</which>
881-
<value>0.00000000000000000e+000</value>
881+
<value>0.00000000000000000e+00</value>
882882
</value>
883883
</second>
884884
</item>
@@ -902,7 +902,7 @@
902902
<name>ScaleBarHeight</name>
903903
<value>
904904
<which>1</which>
905-
<value>1.00000000000000000e+000</value>
905+
<value>1.00000000000000000e+00</value>
906906
</value>
907907
</second>
908908
</item>
@@ -914,7 +914,7 @@
914914
<name>ScaleBarLength</name>
915915
<value>
916916
<which>1</which>
917-
<value>1.00000000000000000e+000</value>
917+
<value>1.00000000000000000e+00</value>
918918
</value>
919919
</second>
920920
</item>
@@ -926,7 +926,7 @@
926926
<name>ScaleBarLineWidth</name>
927927
<value>
928928
<which>1</which>
929-
<value>1.00000000000000000e+000</value>
929+
<value>1.00000000000000000e+00</value>
930930
</value>
931931
</second>
932932
</item>
@@ -938,7 +938,7 @@
938938
<name>ScaleBarMultiplier</name>
939939
<value>
940940
<which>1</which>
941-
<value>1.00000000000000000e+000</value>
941+
<value>1.00000000000000000e+00</value>
942942
</value>
943943
</second>
944944
</item>
@@ -974,7 +974,7 @@
974974
<name>Shine</name>
975975
<value>
976976
<which>1</which>
977-
<value>1.00000000000000000e+000</value>
977+
<value>1.00000000000000000e+00</value>
978978
</value>
979979
</second>
980980
</item>
@@ -1010,7 +1010,7 @@
10101010
<name>Specular</name>
10111011
<value>
10121012
<which>1</which>
1013-
<value>4.00000000000000020e-001</value>
1013+
<value>4.00000000000000022e-01</value>
10141014
</value>
10151015
</second>
10161016
</item>
@@ -1034,7 +1034,7 @@
10341034
<name>StereoFusion</name>
10351035
<value>
10361036
<which>1</which>
1037-
<value>4.00000000000000020e-001</value>
1037+
<value>4.00000000000000022e-01</value>
10381038
</value>
10391039
</second>
10401040
</item>
@@ -1046,7 +1046,7 @@
10461046
<name>TextOffset</name>
10471047
<value>
10481048
<which>1</which>
1049-
<value>0.00000000000000000e+000</value>
1049+
<value>0.00000000000000000e+00</value>
10501050
</value>
10511051
</second>
10521052
</item>
@@ -1258,71 +1258,71 @@
12581258
<item class_id="17" tracking_level="0" version="0">
12591259
<first>ImportFieldsFromMatlab:0</first>
12601260
<second class_id="18" tracking_level="0" version="0">
1261-
<first>4.90000000000000000e+001</first>
1262-
<second>1.40000000000000000e+001</second>
1261+
<first>4.90000000000000000e+01</first>
1262+
<second>1.40000000000000000e+01</second>
12631263
</second>
12641264
</item>
12651265
<item>
12661266
<first>JoinFields:0</first>
12671267
<second>
1268-
<first>1.52000000000000000e+002</first>
1269-
<second>5.32000000000000000e+002</second>
1268+
<first>1.52000000000000000e+02</first>
1269+
<second>5.32000000000000000e+02</second>
12701270
</second>
12711271
</item>
12721272
<item>
12731273
<first>ReportFieldInfo:0</first>
12741274
<second>
1275-
<first>-1.52000000000000000e+002</first>
1276-
<second>1.52000000000000000e+002</second>
1275+
<first>-1.52000000000000000e+02</first>
1276+
<second>1.52000000000000000e+02</second>
12771277
</second>
12781278
</item>
12791279
<item>
12801280
<first>ReportFieldInfo:1</first>
12811281
<second>
1282-
<first>-1.52000000000000000e+002</first>
1283-
<second>2.28000000000000000e+002</second>
1282+
<first>-1.52000000000000000e+02</first>
1283+
<second>2.28000000000000000e+02</second>
12841284
</second>
12851285
</item>
12861286
<item>
12871287
<first>ReportFieldInfo:2</first>
12881288
<second>
1289-
<first>-1.52000000000000000e+002</first>
1290-
<second>3.04000000000000000e+002</second>
1289+
<first>-1.52000000000000000e+02</first>
1290+
<second>3.04000000000000000e+02</second>
12911291
</second>
12921292
</item>
12931293
<item>
12941294
<first>ReportFieldInfo:3</first>
12951295
<second>
1296-
<first>2.28000000000000000e+002</first>
1297-
<second>1.52000000000000000e+002</second>
1296+
<first>2.28000000000000000e+02</first>
1297+
<second>1.52000000000000000e+02</second>
12981298
</second>
12991299
</item>
13001300
<item>
13011301
<first>ReportFieldInfo:4</first>
13021302
<second>
1303-
<first>2.28000000000000000e+002</first>
1304-
<second>2.28000000000000000e+002</second>
1303+
<first>2.28000000000000000e+02</first>
1304+
<second>2.28000000000000000e+02</second>
13051305
</second>
13061306
</item>
13071307
<item>
13081308
<first>ReportFieldInfo:5</first>
13091309
<second>
1310-
<first>2.28000000000000000e+002</first>
1311-
<second>3.04000000000000000e+002</second>
1310+
<first>2.28000000000000000e+02</first>
1311+
<second>3.04000000000000000e+02</second>
13121312
</second>
13131313
</item>
13141314
<item>
13151315
<first>ShowField:0</first>
13161316
<second>
1317-
<first>0.00000000000000000e+000</first>
1318-
<second>6.84000000000000000e+002</second>
1317+
<first>0.00000000000000000e+00</first>
1318+
<second>6.84000000000000000e+02</second>
13191319
</second>
13201320
</item>
13211321
<item>
13221322
<first>ViewScene:0</first>
13231323
<second>
1324-
<first>4.00000000000000000e+001</first>
1325-
<second>7.74000000000000000e+002</second>
1324+
<first>4.00000000000000000e+01</first>
1325+
<second>7.74000000000000000e+02</second>
13261326
</second>
13271327
</item>
13281328
</modulePositions>

‎src/Interface/Application/NetworkEditor.cc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,13 @@ void NetworkEditor::mouseMoveEvent(QMouseEvent *event)
667667
QGraphicsView::mouseMoveEvent(event);
668668
}
669669

670+
void NetworkEditor::mousePressEvent(QMouseEvent *event)
671+
{
672+
if (event->button() == Qt::MiddleButton)
673+
Q_EMIT middleMouseClicked();
674+
QGraphicsView::mousePressEvent(event);
675+
}
676+
670677
void NetworkEditor::mouseReleaseEvent(QMouseEvent *event)
671678
{
672679
if (modulesSelectedByCL_)

‎src/Interface/Application/NetworkEditor.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ namespace Gui {
215215
virtual void mouseReleaseEvent(QMouseEvent *event) override;
216216
virtual void wheelEvent(QWheelEvent* event) override;
217217
virtual void contextMenuEvent(QContextMenuEvent *event) override;
218+
virtual void mousePressEvent(QMouseEvent *event) override;
218219

219220
public Q_SLOTS:
220221
void addModuleWidget(const std::string& name, SCIRun::Dataflow::Networks::ModuleHandle module, const SCIRun::Dataflow::Engine::ModuleCounter& count);
@@ -256,6 +257,7 @@ namespace Gui {
256257
void networkExecuted();
257258
void networkExecutionFinished();
258259
void networkEditorMouseButtonPressed();
260+
void middleMouseClicked();
259261
void moduleMoved(const SCIRun::Dataflow::Networks::ModuleId& id, double newX, double newY);
260262
void defaultNotePositionChanged(NotePosition position);
261263
void sceneChanged(const QList<QRectF>& region);

0 commit comments

Comments
 (0)