Code

Multichannel grabber#260

Code

Open

photoniker wants to merge 86 commits intomasteritom-project/itom:masterfrom multichannelGrabberitom-project/itom:multichannelGrabberCopy head branch name to clipboard

+5,292-2,382

Commits

Commits on May 15, 2020

• first work for multi channel grabber. Added AddInAbstractGrabber and AddInMultiChannelGrabber

  gegelle

  committed
  156a08a

  Copy full SHA for 156a08a

Commits on Jul 8, 2020

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  c45a416

  Copy full SHA for c45a416

Commits on Sep 23, 2020

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  67b8a03

  Copy full SHA for 67b8a03

Commits on Sep 24, 2020

• AddInAbstractGrabber: started implementation of pixel format string

  gegelle

  committed
  8eb7b58

  Copy full SHA for 8eb7b58

Commits on Sep 30, 2020

• AddInMultiChannelGrabber: further work done

  gegelle

  committed
  058c2a6

  Copy full SHA for 058c2a6

Commits on Oct 5, 2020

• AddInMultiChannelGrabber: added untested method to synchronize the parameters between the channels and m_params. SetParam set to final and a pure virtual function setParameter is added. SetParamete…

  Show description for ae932cc
  gegelle

  committed
  ae932cc

  Copy full SHA for ae932cc

Commits on Oct 9, 2020

• bugfix in template myActuator.cpp: in waitForDone the boolean done was set to false, even if axis is on target

  gegelle

  committed
  707448b

  Copy full SHA for 707448b

Commits on Oct 13, 2020

• AddInMultiChannelGrabber: added applyParamsToChannelParams to apply changes in m_params to the channel params. Further improved setParam...

  gegelle

  committed
  f67aeb9

  Copy full SHA for f67aeb9

• AddInMultiChannelGrabber: further adaptions

  gegelle

  committed
  1a1d52e

  Copy full SHA for 1a1d52e

Commits on Dec 10, 2020

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  257d5d3

  Copy full SHA for 257d5d3

Commits on Feb 18, 2021

• small fix

  gegelle

  committed
  cc2a1fb

  Copy full SHA for cc2a1fb

• Merge branch 'master' into multichannelGrabber

  Show description for 8170503
  gegelle

  committed
  8170503

  Copy full SHA for 8170503

Commits on Feb 19, 2021

• addInGrabber: implemented set and getParam with channel specification via parameter suffixes. Additionally getParam was moved to AddInMultiChannelGrabber. getParam calls getParameter in the plugin …

  Show description for a2cd54a
  gegelle

  committed
  a2cd54a

  Copy full SHA for a2cd54a

Commits on Mar 22, 2021

• FigureWidget: adjustments to enable a live image based on a pixelFormat string for multichannelGrabber

  gegelle

  committed
  b8a85a4

  Copy full SHA for b8a85a4

Commits on Mar 24, 2021

• added unittest for DummyMultiChannelGrabber

  gegelle

  committed
  d6fa718

  Copy full SHA for d6fa718

Commits on Apr 19, 2021

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  4b56f7c

  Copy full SHA for 4b56f7c

Commits on May 6, 2021

• added optional channel parameter for AddInGrabber::sendDataToListeners.

  gegelle

  committed
  dfd3747

  Copy full SHA for dfd3747

• Merge branch 'StringListParam' into multichannelGrabber

  gegelle

  committed
  5612224

  Copy full SHA for 5612224

Commits on May 7, 2021

• started implementation of channelList param

  gegelle

  committed
  feec1b2

  Copy full SHA for feec1b2

• Merge remote-tracking branch 'remotes/origin/StringListParam' into multichannelGrabber

  gegelle

  committed
  031bdac

  Copy full SHA for 031bdac

Commits on May 10, 2021

• addInGrabber: update channelList after adding a channel

  gegelle

  committed
  2daa835

  Copy full SHA for 2daa835

• Merge branch 'StringListParam' into multichannelGrabber

  gegelle

  committed
  81a6872

  Copy full SHA for 81a6872

• addInGrabber.cpp: set channelList to readonly

  gegelle

  committed
  3e336de

  Copy full SHA for 3e336de

Commits on Jun 8, 2021

• changed m_autoGrabbingListener to QMultiMap

  gegelle

  committed
  9647888

  Copy full SHA for 9647888

Commits on Jun 9, 2021

• AbstractDObjFigure: added cameraChannel property

  gegelle

  committed
  62aae46

  Copy full SHA for 62aae46

Commits on Jun 18, 2021

• Merge branch 'master' into multichannelGrabber

  Show description for f066d36
  magro11

  committed
  f066d36

  Copy full SHA for f066d36

• small updates based on recent meeting

  magro11

  committed
  12b9ac3

  Copy full SHA for 12b9ac3

Commits on Jun 21, 2021

• created file addInMultiChannelGrabber.cpp and addInMultiChannelGrabber.h. Started the implementation of initializeDefaultConfiguration. The QMap<QString,QStringList>m_paramChannelAvailabilityMap ha…

  Show description for fd9e4a6
  gegelle

  committed
  fd9e4a6

  Copy full SHA for fd9e4a6

Commits on Jun 30, 2021

• AddInMultiChannelGrabber: added new functions allowing to set parameters within the plugin.

  gegelle

  committed
  249ba87

  Copy full SHA for 249ba87

Commits on Jul 1, 2021

• AddInMultiChannelGrabber: small fixes

  gegelle

  committed
  6799013

  Copy full SHA for 6799013

Commits on Mar 11, 2022

• Merge branch 'master' into multichannelGrabber

  Show description for ec5b43f
  gegelle

  committed
  ec5b43f

  Copy full SHA for ec5b43f

Commits on Jun 27, 2022

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  551addc

  Copy full SHA for 551addc

Commits on Aug 1, 2022

• added new pixel formats to addInGrabber

  gegelle

  committed
  3e75988

  Copy full SHA for 3e75988

Commits on Aug 2, 2022

• MultiChannelGrabber: further improvements

  gegelle

  committed
  de2d82f

  Copy full SHA for de2d82f

Commits on Aug 4, 2022

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  95f86bd

  Copy full SHA for 95f86bd

Commits on Sep 13, 2022

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  d7144d2

  Copy full SHA for d7144d2

Commits on Sep 15, 2022

• initial work of a multichannel copyVal function

  gegelle

  committed
  b75de2e

  Copy full SHA for b75de2e

Commits on Sep 19, 2022

• further work on multichannel getVal

  gegelle

  committed
  4a5800b

  Copy full SHA for 4a5800b

Commits on Oct 7, 2022

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  7d9cb56

  Copy full SHA for 7d9cb56

Commits on Oct 18, 2022

• first implementation of getValByMap

  gegelle

  committed
  591c481

  Copy full SHA for 591c481

Commits on Oct 25, 2022

• Multichannelgrabber: added a QMap based version of copyVal

  gegelle

  committed
  0dac1ce

  Copy full SHA for 0dac1ce

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  b5f00ad

  Copy full SHA for b5f00ad

Commits on Dec 13, 2022

• Merge branch 'master' into multichannelGrabber

  gegelle

  committed
  4aa6019

  Copy full SHA for 4aa6019

Commits on Jan 19, 2023

• Merge branch 'master' into multichannelGrabber

  

  Robin Hahn

  committed
  df4e459

  Copy full SHA for df4e459

Commits on Jan 21, 2023

• implemented a new newGrabberData signal delivering a QMap of dataObjects to python

  

  Robin Hahn

  committed
  c9859b0

  Copy full SHA for c9859b0

Commits on Jan 22, 2023

• AddInManager: register qMetaType

  

  Robin Hahn

  committed
  85b84e8

  Copy full SHA for 85b84e8

Commits on Jan 30, 2023

• added a first version of the default parameters axisOffset and axisScale. The parameters are channel specific parameters. AxisScale and Offset are set to the dataObject in AddInMultiChannelGrabber:…

  Show description for 2b3e2bd
  

  Robin Hahn

  committed
  2b3e2bd

  Copy full SHA for 2b3e2bd

Commits on Feb 26, 2023

• removed suffix support for setParam and getParam. To set a channel specific parameter the channel must be selected by the defaultChannel parameter.

  Show description for a6ffe6f
  

  Robin Hahn

  committed
  a6ffe6f

  Copy full SHA for a6ffe6f

• Merge branch 'master' into multichannelGrabber

  

  Robin Hahn

  committed
  c8d473c

  Copy full SHA for c8d473c

• 📚 some more documentation added

  

  Robin Hahn

  committed
  7f02996

  Copy full SHA for 7f02996

Commits on Feb 28, 2023

• 📚 and renamed signal newData

  

  Robin Hahn

  committed
  86873c4

  Copy full SHA for 86873c4

Commits on Jun 10, 2023

• Merge branch 'master' into multichannelGrabber

  

  Krauter

  committed
  82d7dda

  Copy full SHA for 82d7dda

• Merged master into multichannelGrabber

  

  Krauter

  committed
  d3d8663

  Copy full SHA for d3d8663

• deleted new otherwise in future this looks bad

  photoniker

  authored
  25bcca0

  Copy full SHA for 25bcca0

Commits on Jun 12, 2023

• NULL changed to nullptr

  

  Krauter

  committed
  2c37883

  Copy full SHA for 2c37883

• Merge branch 'master' into multichannelGrabber

  

  Krauter

  committed
  6a9ea19

  Copy full SHA for 6a9ea19

Commits on Jun 14, 2023

• added demo file for MultiChannelDummyGrabber

  

  Krauter

  committed
  d1c5fe3

  Copy full SHA for d1c5fe3

Commits on Jun 17, 2023

• added dataObject meta info to AddInGrabber which can be set by a dataIO plugin

  

  Krauter

  committed
  1ad3464

  Copy full SHA for 1ad3464

Commits on Jun 18, 2023

• fix for update dataObject meta info without changed image type

  photoniker

  committed
  67e4e8a

  Copy full SHA for 67e4e8a

• fix to work with special characters as e.g. µ

  photoniker

  committed
  c9a85fe

  Copy full SHA for c9a85fe

• adapted demo_DummyGrabber for meta information of liveImage

  photoniker

  committed
  9048158

  Copy full SHA for 9048158

Commits on Jun 19, 2023

• added new demo for Gaussian DummyGrabber

  photoniker

  committed
  be8253a

  Copy full SHA for be8253a

Commits on Jun 22, 2023

• fixed "none" entry when executing print(camera.getParamListInfo())

  photoniker

  committed
  347e040

  Copy full SHA for 347e040

Commits on Jun 23, 2023

• added dataObject meta information to addInMultiChannelGrabber similiar to addInGrabber

  photoniker

  committed
  ce7a649

  Copy full SHA for ce7a649

Commits on Jun 25, 2023

• compiler fixes and minor improvements of addInMultiChannelGrabber

  magro11

  committed
  8298f0f

  Copy full SHA for 8298f0f

• some improvements and modifications with respect to multiChannelGrabber

  magro11

  committed
  17ef70a

  Copy full SHA for 17ef70a

Commits on Jun 28, 2023

• multigrabber refactoring

  magro11

  committed
  c3719bd

  Copy full SHA for c3719bd

Commits on Jul 3, 2023

• fix in AIManagerWidget

  magro11

  committed
  f969aa9

  Copy full SHA for f969aa9

Commits on Jul 9, 2023

• some intermediate steps for multichannelGrabber. Not finished yet.

  magro11

  committed
  a27acbe

  Copy full SHA for a27acbe

Commits on Jul 19, 2023

• some improvements for addInMultiChannelGrabber

  magro11

  committed
  ca2b2b5

  Copy full SHA for ca2b2b5

Commits on Jul 31, 2023

• some improvements concerning MultiGrabber

  magro11

  committed
  a8b4059

  Copy full SHA for a8b4059

Commits on Aug 2, 2023

• more fixes and improvements of multichannelGrabber

  magro11

  committed
  54dce15

  Copy full SHA for 54dce15

Commits on Aug 12, 2023

• more work for multi grabber interface

  magro11

  committed
  cf40e69

  Copy full SHA for cf40e69

Commits on Aug 17, 2023

• more work for multi channel grabber

  magro11

  committed
  8c9d441

  Copy full SHA for 8c9d441

Commits on Aug 21, 2023

• Merge branch 'master' into multichannelGrabber

  photoniker

  committed
  180edb8

  Copy full SHA for 180edb8

Commits on Aug 25, 2023

• dataObject: make some member methods const if possible

  magro11

  committed
  1fd6e71

  Copy full SHA for 1fd6e71

• more adaptions to support multichannel grabber

  magro11

  committed
  d2e5274

  Copy full SHA for d2e5274

Commits on Oct 9, 2023

• more steps for multichannelGrabber

  magro11

  committed
  77a2c43

  Copy full SHA for 77a2c43

Commits on Oct 17, 2023

• Merge branch 'master' into multichannelGrabber

  Show description for 90a4b02
  magro11

  committed
  90a4b02

  Copy full SHA for 90a4b02

• next steps for multichannel grabber

  magro11

  committed
  4bee151

  Copy full SHA for 4bee151

Commits on Oct 20, 2023

• bugfix in DataObject library: DataObject::copyFromData2D cannot be const. Const removed.

  magro11

  committed
  bc5c3fe

  Copy full SHA for bc5c3fe

• next steps for MultiChannelGrabber

  magro11

  committed
  c30d931

  Copy full SHA for c30d931

Commits on Nov 18, 2023

• Qt5 fixes

  magro11

  committed
  330888a

  Copy full SHA for 330888a

• Merge branch 'master' into multichannelGrabber

  magro11

  committed
  1dc37b2

  Copy full SHA for 1dc37b2

Commits on Jan 14, 2024

• Merge branch 'master' into multichannelGrabber

  photoniker

  committed
  c41ed18

  Copy full SHA for c41ed18

Commits on May 11, 2024

• some fixes for multigrabber

  magro11

  committed
  755d1ac

  Copy full SHA for 755d1ac