Skip to content

Commit 08ec4c2

Browse files
committed
Closes #1431
1 parent 88950bd commit 08ec4c2

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

src/ExampleNets/regression/reportInfos_new.srn5

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -579,8 +579,8 @@
579579
<item>
580580
<first>PrintDatatype:12</first>
581581
<second>
582-
<first>-6.77000000000000000e+02</first>
583-
<second>-3.40000000000000000e+01</second>
582+
<first>-6.08000000000000000e+02</first>
583+
<second>0.00000000000000000e+00</second>
584584
</second>
585585
</item>
586586
<item>
@@ -607,8 +607,8 @@
607607
<item>
608608
<first>PrintDatatype:7</first>
609609
<second>
610-
<first>-1.42100000000000000e+03</first>
611-
<second>-9.40000000000000000e+01</second>
610+
<first>-1.52000000000000000e+03</first>
611+
<second>-7.60000000000000000e+01</second>
612612
</second>
613613
</item>
614614
<item>
@@ -653,55 +653,55 @@
653653
<item_version>0</item_version>
654654
<item class_id="20" tracking_level="0" version="0">
655655
<first>CreateLatVol:0</first>
656-
<second>0</second>
656+
<second>2</second>
657657
</item>
658658
<item>
659659
<first>CreateMatrix:1</first>
660660
<second>0</second>
661661
</item>
662662
<item>
663663
<first>PrintDatatype:10</first>
664-
<second>0</second>
664+
<second>-1</second>
665665
</item>
666666
<item>
667667
<first>PrintDatatype:11</first>
668-
<second>0</second>
668+
<second>-1</second>
669669
</item>
670670
<item>
671671
<first>PrintDatatype:12</first>
672-
<second>0</second>
672+
<second>2</second>
673673
</item>
674674
<item>
675675
<first>PrintDatatype:4</first>
676-
<second>0</second>
676+
<second>-1</second>
677677
</item>
678678
<item>
679679
<first>PrintDatatype:5</first>
680680
<second>0</second>
681681
</item>
682682
<item>
683683
<first>PrintDatatype:6</first>
684-
<second>0</second>
684+
<second>-1</second>
685685
</item>
686686
<item>
687687
<first>PrintDatatype:7</first>
688688
<second>0</second>
689689
</item>
690690
<item>
691691
<first>PrintDatatype:8</first>
692-
<second>0</second>
692+
<second>-1</second>
693693
</item>
694694
<item>
695695
<first>PrintDatatype:9</first>
696-
<second>0</second>
696+
<second>1</second>
697697
</item>
698698
<item>
699699
<first>ReportFieldInfo:3</first>
700-
<second>0</second>
700+
<second>-1</second>
701701
</item>
702702
<item>
703703
<first>ReportMatrixInfo:2</first>
704-
<second>0</second>
704+
<second>2</second>
705705
</item>
706706
</moduleTags>
707707
<disabledModules class_id="21" tracking_level="0" version="0">

src/Interface/Application/NetworkEditor.cc

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,19 +1352,22 @@ void NetworkEditor::drawTagGroups()
13521352

13531353
Q_FOREACH(QGraphicsItem* item, scene_->items())
13541354
{
1355-
const auto itemTag = item->data(TagDataKey).toInt();
1356-
1357-
if (itemTag != 0)
1355+
if (dynamic_cast<ModuleProxyWidget*>(item))
13581356
{
1359-
auto r = item->boundingRect();
1360-
r.translate(item->pos());
1361-
if (!tagItemRects.contains(itemTag))
1362-
{
1363-
tagItemRects.insert(itemTag, r);
1364-
}
1365-
else
1357+
const auto itemTag = item->data(TagDataKey).toInt();
1358+
1359+
if (itemTag != NoTag)
13661360
{
1367-
tagItemRects[itemTag] = tagItemRects[itemTag].united(r);
1361+
auto r = item->boundingRect();
1362+
r.translate(item->pos());
1363+
if (!tagItemRects.contains(itemTag))
1364+
{
1365+
tagItemRects.insert(itemTag, r);
1366+
}
1367+
else
1368+
{
1369+
tagItemRects[itemTag] = tagItemRects[itemTag].united(r);
1370+
}
13681371
}
13691372
}
13701373
}

src/Interface/Application/TagManagerWindow.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ QColor TagManagerWindow::tagColor(int tag) const
129129
//error results in gray
130130
}
131131
}
132-
return QColor(r, g, b);
132+
return QColor(r, g, b);
133133
}
134134

135135
QString TagManagerWindow::tagName(int tag) const
@@ -148,7 +148,7 @@ void TagManagerWindow::showHelp(QWidget* parent)
148148
"To use, while in the Network Editor, hold down the Alt / Option key. Then press A to see all module tag groups(each module will be colorized "
149149
"according to the chosen colors). Or press 0 - 9 keys to see each tag group individually; other modules will be slightly blurred out. While in "
150150
"the single - tag view, you can click a module to toggle it as tagged. There is also a button in the toolbar to view all tagged modules."
151-
"\n\Once tags are being used, tag groups can be toggled using Alt-G (show) and Alt-Shift-G (hide). Boxes of the tag color, labelled with the tag's text, will be displayed overlaying the network."
151+
"\n\nOnce tags are being used, tag groups can be toggled using Alt-G (show) and Alt-Shift-G (hide). Boxes of the tag color, labelled with the tag's text, will be displayed overlaying the network."
152152
"\n\nComing soon: tag names saved in the network file to override application-level names, as well as an option to display tag groups on network load."
153153
);
154154
}

0 commit comments

Comments
 (0)