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

Multichannel grabber #260

Open
wants to merge 86 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
156a08a
first work for multi channel grabber. Added AddInAbstractGrabber and …
gegelle May 15, 2020
c45a416
Merge branch 'master' into multichannelGrabber
gegelle Jul 8, 2020
67b8a03
Merge branch 'master' into multichannelGrabber
gegelle Sep 23, 2020
8eb7b58
AddInAbstractGrabber: started implementation of pixel format string
gegelle Sep 24, 2020
058c2a6
AddInMultiChannelGrabber: further work done
gegelle Sep 30, 2020
ae932cc
AddInMultiChannelGrabber: added untested method to synchronize the pa…
gegelle Oct 5, 2020
707448b
bugfix in template myActuator.cpp: in waitForDone the boolean done wa…
gegelle Oct 9, 2020
f67aeb9
AddInMultiChannelGrabber: added applyParamsToChannelParams to apply c…
gegelle Oct 13, 2020
1a1d52e
AddInMultiChannelGrabber: further adaptions
gegelle Oct 13, 2020
257d5d3
Merge branch 'master' into multichannelGrabber
gegelle Dec 10, 2020
cc2a1fb
small fix
gegelle Feb 18, 2021
8170503
Merge branch 'master' into multichannelGrabber
gegelle Feb 18, 2021
a2cd54a
addInGrabber: implemented set and getParam with channel specification…
gegelle Feb 19, 2021
b8a85a4
FigureWidget: adjustments to enable a live image based on a pixelForm…
gegelle Mar 22, 2021
d6fa718
added unittest for DummyMultiChannelGrabber
gegelle Mar 24, 2021
4b56f7c
Merge branch 'master' into multichannelGrabber
gegelle Apr 19, 2021
dfd3747
added optional channel parameter for AddInGrabber::sendDataToListeners.
gegelle May 6, 2021
5612224
Merge branch 'StringListParam' into multichannelGrabber
gegelle May 6, 2021
feec1b2
started implementation of channelList param
gegelle May 7, 2021
031bdac
Merge remote-tracking branch 'remotes/origin/StringListParam' into mu…
gegelle May 7, 2021
2daa835
addInGrabber: update channelList after adding a channel
gegelle May 10, 2021
81a6872
Merge branch 'StringListParam' into multichannelGrabber
gegelle May 10, 2021
3e336de
addInGrabber.cpp: set channelList to readonly
gegelle May 10, 2021
9647888
changed m_autoGrabbingListener to QMultiMap
gegelle Jun 8, 2021
62aae46
AbstractDObjFigure: added cameraChannel property
gegelle Jun 9, 2021
f066d36
Merge branch 'master' into multichannelGrabber
magro11 Jun 18, 2021
12b9ac3
small updates based on recent meeting
magro11 Jun 18, 2021
fd9e4a6
created file addInMultiChannelGrabber.cpp and addInMultiChannelGrabbe…
gegelle Jun 21, 2021
249ba87
AddInMultiChannelGrabber: added new functions allowing to set paramet…
gegelle Jun 30, 2021
6799013
AddInMultiChannelGrabber: small fixes
gegelle Jul 1, 2021
ec5b43f
Merge branch 'master' into multichannelGrabber
gegelle Mar 11, 2022
551addc
Merge branch 'master' into multichannelGrabber
gegelle Jun 27, 2022
3e75988
added new pixel formats to addInGrabber
gegelle Aug 1, 2022
de2d82f
MultiChannelGrabber: further improvements
gegelle Aug 2, 2022
95f86bd
Merge branch 'master' into multichannelGrabber
gegelle Aug 4, 2022
d7144d2
Merge branch 'master' into multichannelGrabber
gegelle Sep 13, 2022
b75de2e
initial work of a multichannel copyVal function
gegelle Sep 15, 2022
4a5800b
further work on multichannel getVal
gegelle Sep 19, 2022
7d9cb56
Merge branch 'master' into multichannelGrabber
gegelle Oct 7, 2022
591c481
first implementation of getValByMap
gegelle Oct 18, 2022
0dac1ce
Multichannelgrabber: added a QMap based version of copyVal
gegelle Oct 25, 2022
b5f00ad
Merge branch 'master' into multichannelGrabber
gegelle Oct 25, 2022
4aa6019
Merge branch 'master' into multichannelGrabber
gegelle Dec 13, 2022
df4e459
Merge branch 'master' into multichannelGrabber
Jan 19, 2023
c9859b0
implemented a new newGrabberData signal delivering a QMap of dataObje…
Jan 21, 2023
85b84e8
AddInManager: register qMetaType
Jan 22, 2023
2b3e2bd
added a first version of the default parameters axisOffset and axisSc…
Jan 30, 2023
a6ffe6f
removed suffix support for setParam and getParam. To set a channel sp…
Feb 26, 2023
c8d473c
Merge branch 'master' into multichannelGrabber
Feb 26, 2023
7f02996
:books: some more documentation added
Feb 26, 2023
86873c4
:books: and renamed signal newData
Feb 28, 2023
82d7dda
Merge branch 'master' into multichannelGrabber
Jun 10, 2023
d3d8663
Merged master into multichannelGrabber
Jun 10, 2023
25bcca0
deleted new otherwise in future this looks bad
photoniker Jun 10, 2023
2c37883
NULL changed to nullptr
Jun 12, 2023
6a9ea19
Merge branch 'master' into multichannelGrabber
Jun 12, 2023
d1c5fe3
added demo file for MultiChannelDummyGrabber
Jun 14, 2023
1ad3464
added dataObject meta info to AddInGrabber which can be set by a data…
Jun 17, 2023
67e4e8a
fix for update dataObject meta info without changed image type
photoniker Jun 18, 2023
c9a85fe
fix to work with special characters as e.g. µ
photoniker Jun 18, 2023
9048158
adapted demo_DummyGrabber for meta information of liveImage
photoniker Jun 18, 2023
be8253a
added new demo for Gaussian DummyGrabber
photoniker Jun 19, 2023
347e040
fixed "none" entry when executing print(camera.getParamListInfo())
photoniker Jun 22, 2023
ce7a649
added dataObject meta information to addInMultiChannelGrabber similia…
photoniker Jun 23, 2023
8298f0f
compiler fixes and minor improvements of addInMultiChannelGrabber
magro11 Jun 25, 2023
17ef70a
some improvements and modifications with respect to multiChannelGrabber
magro11 Jun 25, 2023
c3719bd
multigrabber refactoring
magro11 Jun 28, 2023
f969aa9
fix in AIManagerWidget
magro11 Jul 3, 2023
a27acbe
some intermediate steps for multichannelGrabber. Not finished yet.
magro11 Jul 9, 2023
ca2b2b5
some improvements for addInMultiChannelGrabber
magro11 Jul 19, 2023
a8b4059
some improvements concerning MultiGrabber
magro11 Jul 31, 2023
54dce15
more fixes and improvements of multichannelGrabber
magro11 Aug 2, 2023
cf40e69
more work for multi grabber interface
magro11 Aug 12, 2023
8c9d441
more work for multi channel grabber
magro11 Aug 17, 2023
180edb8
Merge branch 'master' into multichannelGrabber
photoniker Aug 21, 2023
1fd6e71
dataObject: make some member methods const if possible
magro11 Aug 25, 2023
d2e5274
more adaptions to support multichannel grabber
magro11 Aug 25, 2023
77a2c43
more steps for multichannelGrabber
magro11 Oct 9, 2023
90a4b02
Merge branch 'master' into multichannelGrabber
magro11 Oct 17, 2023
4bee151
next steps for multichannel grabber
magro11 Oct 17, 2023
bc5c3fe
bugfix in DataObject library: DataObject::copyFromData2D cannot be co…
magro11 Oct 20, 2023
c30d931
next steps for MultiChannelGrabber
magro11 Oct 20, 2023
330888a
Qt5 fixes
magro11 Nov 18, 2023
1dc37b2
Merge branch 'master' into multichannelGrabber
magro11 Nov 18, 2023
c41ed18
Merge branch 'master' into multichannelGrabber
photoniker Jan 14, 2024
755d1ac
some fixes for multigrabber
magro11 May 11, 2024
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
1 change: 1 addition & 0 deletions AddInManager/addInManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,7 @@ AddInManager::AddInManager(QString itomSettingsFile, void **apiFuncsGraph, QObje
qRegisterMetaType<QMap<QString, ito::Param> >("QMap<QString, ito::ParamBase>");
qRegisterMetaType<QSharedPointer<QVector<ito::ParamBase> > >("QSharedPointer<QVector<ito::ParamBase> >");
qRegisterMetaType<QVector<QSharedPointer<ito::ParamBase> > >("QVector<QSharedPointer<ito::ParamBase> >");
qRegisterMetaType<QSharedPointer<QMap<QString, ito::DataObject*> > >("QSharedPointer<QMap<QString, ito::DataObject*> >");

#if ITOM_POINTCLOUDLIBRARY > 0
qRegisterMetaType<ito::PCLPointCloud >("ito::PCLPointCloud");
Expand Down
Loading