Dhanya Maliakal 24c305ec59 solved conflicts from merge of version being used to binary

2017-12-06 19:07:06 +01:00

..

gitInfoGui.h

possible to use binary --version or -v to get the branch and versionid

2017-12-06 19:05:35 +01:00

gitInfoGuiTmp.h

changed all variables from svn to git, included --version for receiver binary

2017-12-06 10:29:57 +01:00

icons.qrc

made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi

2013-02-26 08:34:47 +00:00

qActionsWidget.h

included sls defs in every file so that int is 32 bit

2013-01-11 09:59:29 +00:00

qCloneWidget.h

fixed segmentation fault issue of xputsn the right way, fixed warnings

2017-11-17 09:26:05 +01:00

qDebugStream.h

fixed segmentation fault issue of xputsn the right way, fixed warnings

2017-11-17 09:26:05 +01:00

qDefs.h

makefiles and versioning update complete

2017-06-29 17:09:46 +02:00

qDetectorMain.h

possible to use binary --version or -v to get the branch and versionid

2017-12-06 19:05:35 +01:00

qDrawPlot.h

merge conflict from 3.0.1 to restream stop from recieveR

2017-11-30 19:05:19 +01:00

qScanWidget.h

included sls defs in every file so that int is 32 bit

2013-01-11 09:59:29 +00:00

qServer.h

gui_client more stable with 2 servers for stop and acquire

2013-03-21 09:27:16 +00:00

qTabActions.h

included sls defs in every file so that int is 32 bit

2013-01-11 09:59:29 +00:00

qTabAdvanced.h

makng the zmq work without external flag

2017-11-27 17:06:11 +01:00

qTabDataOutput.h

removed compression from gui in expert mode

2017-11-13 15:32:24 +01:00

qTabDebugging.h

included sls defs in every file so that int is 32 bit

2013-01-11 09:59:29 +00:00

qTabDeveloper.h

-1 in getadc fixed in gui as well

2017-12-05 15:37:34 +01:00

qTabMeasurement.h

wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it

2017-11-30 16:20:26 +01:00

qTabMessages.h

defining everything to reduce null pointer errors, fixed zooming problem for scans

2013-04-10 13:34:52 +00:00

qTabPlot.h

gainplot added for jungfrau, aspect ratio check in gui added, npixels-1 as endpixel bug fix

2017-09-01 12:03:09 +02:00

qTabSettings.h

added 2 gain settings to eigeR

2016-08-03 10:34:10 +02:00