Skip to content

Commit 7c80da3

Browse files
authored
Merge pull request #3095 from ajdapretnar/distmatrix-output
Renamed output to Distance Matrix
2 parents 7c61b48 + 1d52ba7 commit 7c80da3

File tree

2 files changed

+79
-1
lines changed

2 files changed

+79
-1
lines changed
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<scheme description="" title="" version="2.0">
3+
<nodes>
4+
<node id="0" name="File" position="(222.0, 131.0)" project_name="Orange3" qualified_name="Orange.widgets.data.owfile.OWFile" title="File" version="" />
5+
<node id="1" name="Distances" position="(357.0, 142.0)" project_name="Orange3" qualified_name="Orange.widgets.unsupervised.owdistances.OWDistances" title="Distances" version="" />
6+
<node id="2" name="Distance Matrix" position="(511.0, 150.0)" project_name="Orange3" qualified_name="Orange.widgets.unsupervised.owdistancematrix.OWDistanceMatrix" title="Distance Matrix" version="" />
7+
<node id="3" name="Scatter Plot" position="(712.0, 144.0)" project_name="Orange3" qualified_name="Orange.widgets.visualize.owscatterplot.OWScatterPlot" title="Scatter Plot" version="" />
8+
</nodes>
9+
<links>
10+
<link enabled="true" id="0" sink_channel="Data" sink_node_id="1" source_channel="Data" source_node_id="0" />
11+
<link enabled="true" id="1" sink_channel="Distances" sink_node_id="2" source_channel="Distances" source_node_id="1" />
12+
<link enabled="true" id="2" sink_channel="Data" sink_node_id="3" source_channel="Table" source_node_id="2" />
13+
</links>
14+
<annotations />
15+
<thumbnail />
16+
<node_properties>
17+
<properties format="pickle" node_id="0">gAN9cQAoWBIAAABjb250cm9sQXJlYVZpc2libGVxAYhYDAAAAHJlY2VudF9wYXRoc3ECXXEDKGNP
18+
cmFuZ2Uud2lkZ2V0cy51dGlscy5maWxlZGlhbG9ncwpSZWNlbnRQYXRoCnEEKYFxBX1xBihYBwAA
19+
AGFic3BhdGhxB1gzAAAAL1VzZXJzL2FqZGEvb3JhbmdlL29yYW5nZTMvT3JhbmdlL2RhdGFzZXRz
20+
L2lyaXMudGFicQhYBgAAAHByZWZpeHEJWA8AAABzYW1wbGUtZGF0YXNldHNxClgHAAAAcmVscGF0
21+
aHELWAgAAABpcmlzLnRhYnEMWAUAAAB0aXRsZXENWAAAAABxDlgFAAAAc2hlZXRxD2gOWAsAAABm
22+
aWxlX2Zvcm1hdHEQTnViaAQpgXERfXESKGgHWEcAAAAvVXNlcnMvYWpkYS9Eb3dubG9hZHMvRGF0
23+
YSBzZXRzL3dpbmUtcmV2aWV3cy93aW5lbWFnLWRhdGFfZmlyc3QxNTBrLmNzdnETaAlOaAtOaA1o
24+
DmgPaA5oEE51YmgEKYFxFH1xFShoB1g2AAAAL1VzZXJzL2FqZGEvb3JhbmdlL29yYW5nZTMvT3Jh
25+
bmdlL2RhdGFzZXRzL3RpdGFuaWMudGFicRZoCWgKaAtYCwAAAHRpdGFuaWMudGFicRdoDWgOaA9o
26+
DmgQTnViaAQpgXEYfXEZKGgHWDYAAAAvVXNlcnMvYWpkYS9vcmFuZ2Uvb3JhbmdlMy9PcmFuZ2Uv
27+
ZGF0YXNldHMvaG91c2luZy50YWJxGmgJaApoC1gLAAAAaG91c2luZy50YWJxG2gNaA5oD2gOaBBO
28+
dWJoBCmBcRx9cR0oaAdYPAAAAC9Vc2Vycy9hamRhL29yYW5nZS9vcmFuZ2UzL09yYW5nZS9kYXRh
29+
c2V0cy9oZWFydF9kaXNlYXNlLnRhYnEeaAloCmgLWBEAAABoZWFydF9kaXNlYXNlLnRhYnEfaA1o
30+
DmgPaA5oEE51YmVYCwAAAHJlY2VudF91cmxzcSBdcSFYEwAAAHNhdmVkV2lkZ2V0R2VvbWV0cnlx
31+
IkMyAdnQywACAAAAAAISAAAA3QAABGkAAAMYAAACEgAAAPMAAARpAAADGAAAAAAAAAAACABxI1gL
32+
AAAAc2hlZXRfbmFtZXNxJH1xJVgGAAAAc291cmNlcSZLAFgDAAAAdXJscSdoDlgNAAAAZG9tYWlu
33+
X2VkaXRvcnEofXEpWAsAAABfX3ZlcnNpb25fX3EqSwFYEAAAAGNvbnRleHRfc2V0dGluZ3NxK11x
34+
LGNPcmFuZ2Uud2lkZ2V0cy5zZXR0aW5ncwpDb250ZXh0CnEtKYFxLn1xLyhYBAAAAHRpbWVxMEdB
35+
1s0kyQBBGFgGAAAAdmFsdWVzcTF9cTIoWAkAAAB2YXJpYWJsZXNxM11xNFgJAAAAeGxzX3NoZWV0
36+
cTVoDkr/////hnE2aCh9cTdoM11xOChdcTkoWAwAAABzZXBhbCBsZW5ndGhxOmNPcmFuZ2UuZGF0
37+
YS52YXJpYWJsZQpDb250aW51b3VzVmFyaWFibGUKcTtLAGgOiGVdcTwoWAsAAABzZXBhbCB3aWR0
38+
aHE9aDtLAGgOiGVdcT4oWAwAAABwZXRhbCBsZW5ndGhxP2g7SwBoDohlXXFAKFgLAAAAcGV0YWwg
39+
d2lkdGhxQWg7SwBoDohlXXFCKFgEAAAAaXJpc3FDY09yYW5nZS5kYXRhLnZhcmlhYmxlCkRpc2Ny
40+
ZXRlVmFyaWFibGUKcURLAVgsAAAASXJpcy1zZXRvc2EsIElyaXMtdmVyc2ljb2xvciwgSXJpcy12
41+
aXJnaW5pY2FxRYllZXNoKksBdVgKAAAAYXR0cmlidXRlc3FGKFgMAAAAc2VwYWwgbGVuZ3RocUdL
42+
AoZxSFgLAAAAc2VwYWwgd2lkdGhxSUsChnFKWAwAAABwZXRhbCBsZW5ndGhxS0sChnFMWAsAAABw
43+
ZXRhbCB3aWR0aHFNSwKGcU50cU9YBQAAAG1ldGFzcVApWAoAAABjbGFzc192YXJzcVFYBAAAAGly
44+
aXNxUl1xUyhYCwAAAElyaXMtc2V0b3NhcVRYDwAAAElyaXMtdmVyc2ljb2xvcnFVWA4AAABJcmlz
45+
LXZpcmdpbmljYXFWZYZxV4VxWFgSAAAAbW9kaWZpZWRfdmFyaWFibGVzcVldcVp1YmF1Lg==
46+
</properties>
47+
<properties format="literal" node_id="1">{'autocommit': True, 'axis': 0, 'controlAreaVisible': True, 'metric_idx': 0, 'normalized_dist': True, 'savedWidgetGeometry': b'\x01\xd9\xd0\xcb\x00\x02\x00\x00\x00\x00\x03\x84\x00\x00\x01\xac\x00\x00\x04h\x00\x00\x02\xb0\x00\x00\x03\x84\x00\x00\x01\xc2\x00\x00\x04h\x00\x00\x02\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00', '__version__': 2}</properties>
48+
<properties format="pickle" node_id="2">gAN9cQAoWAsAAABhdXRvX2NvbW1pdHEBiFgSAAAAY29udHJvbEFyZWFWaXNpYmxlcQKIWBMAAABz
49+
YXZlZFdpZGdldEdlb21ldHJ5cQNDMgHZ0MsAAgAAAAACZgAAASkAAAWFAAADMgAAAmYAAAE/AAAF
50+
hQAAAzIAAAAAAAAAAAgAcQRYCwAAAF9fdmVyc2lvbl9fcQVLAVgQAAAAY29udGV4dF9zZXR0aW5n
51+
c3EGXXEHY09yYW5nZS53aWRnZXRzLnNldHRpbmdzCkNvbnRleHQKcQgpgXEJfXEKKFgEAAAAdGlt
52+
ZXELR0HWzSTKywUVWAYAAAB2YWx1ZXNxDH1xDWgFSwFzWAMAAABkaW1xDkuWWAsAAABhbm5vdGF0
53+
aW9uc3EPXXEQKFgEAAAATm9uZXERWAkAAABFbnVtZXJhdGVxElgMAAAAc2VwYWwgbGVuZ3RocRNY
54+
CwAAAHNlcGFsIHdpZHRocRRYDAAAAHBldGFsIGxlbmd0aHEVWAsAAABwZXRhbCB3aWR0aHEWWAQA
55+
AABpcmlzcRdlWAoAAABhbm5vdGF0aW9ucRhYBAAAAE5vbmVxGVgJAAAAc2VsZWN0aW9ucRpdcRso
56+
SwBLAUsCSwNLBEsFZXViYXUu
57+
</properties>
58+
<properties format="pickle" node_id="3">gAN9cQAoWAsAAABhdXRvX3NhbXBsZXEBiFgTAAAAYXV0b19zZW5kX3NlbGVjdGlvbnECiFgSAAAA
59+
Y29udHJvbEFyZWFWaXNpYmxlcQOIWBMAAABzYXZlZFdpZGdldEdlb21ldHJ5cQRDMgHZ0MsAAgAA
60+
AAADPAAAAQYAAAVBAAAD3wAAAzwAAAEcAAAFQQAAA98AAAAAAAAAAAgAcQVYDwAAAHNlbGVjdGlv
61+
bl9ncm91cHEGTlgRAAAAdG9vbGJhcl9zZWxlY3Rpb25xB0sAWAUAAABncmFwaHEIfXEJKFgLAAAA
62+
YWxwaGFfdmFsdWVxCkuAWA0AAABjbGFzc19kZW5zaXR5cQuJWBEAAABqaXR0ZXJfY29udGludW91
63+
c3EMiVgLAAAAaml0dGVyX3NpemVxDUsKWBMAAABsYWJlbF9vbmx5X3NlbGVjdGVkcQ6JWAsAAABw
64+
b2ludF93aWR0aHEPSwpYCQAAAHNob3dfZ3JpZHEQiVgLAAAAc2hvd19sZWdlbmRxEYhYDQAAAHNo
65+
b3dfcmVnX2xpbmVxEolYEQAAAHRvb2x0aXBfc2hvd3NfYWxscROJdVgLAAAAX192ZXJzaW9uX19x
66+
FEsCWBAAAABjb250ZXh0X3NldHRpbmdzcRVdcRZjT3JhbmdlLndpZGdldHMuc2V0dGluZ3MKQ29u
67+
dGV4dApxFymBcRh9cRkoWAQAAAB0aW1lcRpHQdbNJM31WJJYBgAAAHZhbHVlc3EbfXEcKFgGAAAA
68+
YXR0cl94cR1YDAAAAHNlcGFsIGxlbmd0aHEeS2aGcR9YBgAAAGF0dHJfeXEgWAsAAABzZXBhbCB3
69+
aWR0aHEhS2aGcSJoCH1xIyhYCgAAAGF0dHJfY29sb3JxJFgEAAAAaXJpc3ElS2WGcSZYCgAAAGF0
70+
dHJfbGFiZWxxJ05K/v///4ZxKFgKAAAAYXR0cl9zaGFwZXEpTkr+////hnEqWAkAAABhdHRyX3Np
71+
emVxK05K/v///4ZxLHVoFEsCdVgKAAAAYXR0cmlidXRlc3EtfXEuKGgeSwJoIUsCWAwAAABwZXRh
72+
bCBsZW5ndGhxL0sCWAsAAABwZXRhbCB3aWR0aHEwSwJoJUsBdVgFAAAAbWV0YXNxMX1xMnViYXUu
73+
</properties>
74+
</node_properties>
75+
<session_state>
76+
<window_groups />
77+
</session_state>
78+
</scheme>

Orange/widgets/unsupervised/owdistancematrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class Inputs:
208208

209209
class Outputs:
210210
distances = Output("Distances", DistMatrix, dynamic=False)
211-
table = Output("Table", Table)
211+
table = Output("Selected Data", Table, replaces=["Table"])
212212

213213
settingsHandler = DistanceMatrixContextHandler()
214214
auto_commit = Setting(True)

0 commit comments

Comments
 (0)