Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New signal slots for Qt 6 #2381

Merged
merged 59 commits into from
Apr 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
4321563
Interface/Application SIGNAL --> 315
dcwhite Mar 2, 2022
3199c22
count = 307
dcwhite Mar 2, 2022
230d837
Update Port.cc
dcwhite Mar 2, 2022
46b79f4
count 303
dcwhite Mar 3, 2022
c6394f1
Update Subnetworks.cc
dcwhite Mar 3, 2022
886ba66
Update SCIRunMainWindowSetup.cc
dcwhite Mar 4, 2022
6b1bf2f
Update SCIRunMainWindowSetup.cc
dcwhite Mar 4, 2022
d036115
Working on button signals
dcwhite Mar 4, 2022
a748957
Builds
dcwhite Mar 4, 2022
d3de4a8
QSpinBoxes
dcwhite Mar 4, 2022
c3e585c
Update SCIRunMainWindow.cc
dcwhite Mar 7, 2022
6616d74
More new signals
dcwhite Mar 7, 2022
d3eafb3
More signals
dcwhite Mar 8, 2022
a346ada
More new signals
dcwhite Mar 8, 2022
9511454
Working on more signals
dcwhite Mar 8, 2022
85218d5
Builds
dcwhite Mar 8, 2022
5b3a23b
More signals
dcwhite Mar 8, 2022
0ca84e9
A few more
dcwhite Mar 9, 2022
773aee9
More signals
dcwhite Mar 9, 2022
84418ad
More signals
dcwhite Mar 9, 2022
22813ab
More signals
dcwhite Mar 9, 2022
a8a4e91
Almost done
dcwhite Mar 10, 2022
2f0b316
Resolve pmf overloads for 5.15 compatibility
dcwhite Mar 12, 2022
87d87d5
Merge branch 'master' into new-signal-slots
dcwhite Mar 17, 2022
076dd79
Update SCIRunMainWindowSlotsPrivate.cc
dcwhite Mar 17, 2022
635b012
Working on convenience lists
dcwhite Mar 22, 2022
8c3d842
Working version of recent modules (not saved)
dcwhite Mar 23, 2022
fdc327e
Save/load recent list
dcwhite Mar 24, 2022
9c3117e
Working on frequent modules
dcwhite Mar 25, 2022
4f15c43
Frequent modules saved
dcwhite Mar 25, 2022
2c84967
Add clear actions
dcwhite Mar 28, 2022
4b2f7be
Implement clear actions
dcwhite Mar 28, 2022
a369b2e
Working on new selector section
dcwhite Mar 28, 2022
9bbd357
two trees
dcwhite Mar 28, 2022
dd3d045
Fix renumbering
dcwhite Mar 28, 2022
1947c92
Working on two-tree event forwarding
dcwhite Mar 29, 2022
5913ff9
Fix eventing
dcwhite Mar 29, 2022
3a618b3
Layout
dcwhite Mar 29, 2022
d124dd6
Try separate dock widget
dcwhite Mar 29, 2022
a6f24ac
Fix some stuff
dcwhite Mar 30, 2022
093732f
Working on dockwidget actions
dcwhite Mar 30, 2022
9a86582
Closes #1050
dcwhite Mar 30, 2022
0e75c9a
Improve sizes
dcwhite Mar 30, 2022
22854fa
Closes #1195
dcwhite Mar 31, 2022
b37f0c0
Create ViewSceneShortcuts.ui
dcwhite Mar 31, 2022
3ed6c82
Update ViewSceneShortcuts.ui
dcwhite Apr 12, 2022
27bc4fb
Merge branch 'master' into new-signal-slots
dcwhite Apr 12, 2022
4a66775
Fix merge
dcwhite Apr 13, 2022
37981cb
Update ctkBasePopupWidget.cpp
dcwhite Apr 13, 2022
2a33c32
Fix for ReadNrrd/TendFiber
dcwhite Apr 13, 2022
f6b9d93
Fix for older Qt on linux
dcwhite Apr 13, 2022
90cf20a
Fix for windows packaging
dcwhite Apr 13, 2022
5959c26
Fix ospray build
dcwhite Apr 14, 2022
255d52b
Actual fix for old linux qt build
dcwhite Apr 14, 2022
f543840
Update qt_include.h
dcwhite Apr 14, 2022
738f3fb
moving bundle output to algo class. This should make the bundle incl…
jessdtate Apr 19, 2022
4780127
iquant net more like SR4
jessdtate Apr 19, 2022
4123c8e
fixed typo
jessdtate Apr 19, 2022
7d1c476
some vis update to iquant net
jessdtate Apr 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <Core/Datatypes/Legacy/Field/Mesh.h>
#include <Core/Datatypes/Legacy/Field/VMesh.h>
#include <Core/Datatypes/Legacy/Field/VField.h>
#include <Core/Datatypes/Legacy/Bundle/Bundle.h>

using namespace SCIRun;
using namespace SCIRun::Core::Algorithms;
Expand All @@ -50,6 +51,7 @@ const AlgorithmOutputName SplitFieldByConnectedRegionAlgo::OutputField5("OutputF
const AlgorithmOutputName SplitFieldByConnectedRegionAlgo::OutputField6("OutputField6");
const AlgorithmOutputName SplitFieldByConnectedRegionAlgo::OutputField7("OutputField7");
const AlgorithmOutputName SplitFieldByConnectedRegionAlgo::OutputField8("OutputField8");
const AlgorithmOutputName SplitFieldByConnectedRegionAlgo::OutputBundle("OutputBundle");

class SortSizes
{
Expand Down Expand Up @@ -352,6 +354,14 @@ AlgorithmOutput SplitFieldByConnectedRegionAlgo::run(const AlgorithmInput& input
output[OutputField8]=output_fields[7];

/// TODO: enable dynamic output ports


auto boutput = std::make_shared<Bundle>();
for (size_t j = 0; j < output_fields.size() ; ++j)
{
boutput->set("Field" + std::to_string(j), output_fields.at(j));
}

output[OutputBundle]=boutput;

return output;
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class SCISHARE SplitFieldByConnectedRegionAlgo : public AlgorithmBase
static const AlgorithmOutputName OutputField6;
static const AlgorithmOutputName OutputField7;
static const AlgorithmOutputName OutputField8;
static const AlgorithmOutputName OutputBundle;

std::vector<FieldHandle> run(FieldHandle input) const;

Expand Down
Loading