1. 24 Apr, 2020 2 commits
  2. 23 Apr, 2020 6 commits
  3. 20 Apr, 2020 3 commits
  4. 17 Apr, 2020 8 commits
  5. 15 Apr, 2020 8 commits
  6. 09 Apr, 2020 1 commit
    • Locatelli's avatar
      Some changes: · b427678a
      Locatelli authored
      - Redo jars files
      - ScanSpy plots
      - Offscreens plots improvements
      b427678a
  7. 06 Apr, 2020 7 commits
  8. 03 Apr, 2020 1 commit
  9. 02 Apr, 2020 2 commits
    • Locatelli's avatar
      Merge remote-tracking branch 'origin/V3.2_191' into ploty2 · 3ef15e5b
      Locatelli authored
      Conflicts:
      	src/controllers/common/acquisition/gui/nomadacquisitiongui.jar
      	src/controllers/common/acquisition/mode/KineticExternalAcquisitionController.cpp
      	src/controllers/common/acquisition/mode/KineticExternalAcquisitionController.h
      	src/controllers/common/axis/Module.xml
      	src/controllers/common/axis/gui/nomadaxisgui.jar
      	src/controllers/common/baselegacy/gui/nomadbaselegacygui.jar
      	src/controllers/common/datafile/NexusServerEntryConfig.cpp
      	src/controllers/common/fcu/gui/nomadfcugui.jar
      	src/controllers/common/sample_environment/magneticfield/gui/nomadmagneticfieldgui.jar
      	src/controllers/common/sample_environment/sample_temperature/gui/nomadsampletemperaturegui.jar
      	src/controllers/common/scanlegacy/GenericScan1D.cpp
      	src/controllers/common/scanlegacy/gui/nomadscanlegacygui.jar
      	src/controllers/common/selector/gui/nomadselectorgui.jar
      	src/controllers/common/utilities/gui/nomadutilitiesgui.jar
      	src/controllers/common/utilities/serializer/AcquisitionSerializer.cpp
      	src/controllers/dif/common/gui/nomaddifgui.jar
      	src/controllers/dif/d19/D19ScanFlying.cpp
      	src/controllers/dif/d19/D19ScanFlying.h
      	src/controllers/dif/d19/DetectorElement.cpp
      	src/controllers/dif/d2b/gui/nomadd2bgui.jar
      	src/controllers/dif/salsa/gui/nomadsalsagui.jar
      	src/controllers/lss/common/SampleChangerController.cpp
      	src/controllers/lss/common/gui/nomadlssgui.jar
      	src/controllers/lss/d11/gui/nomadd11gui.jar
      	src/controllers/lss/d17/gui/nomadd17gui.jar
      	src/controllers/lss/d22/D22Settings.cpp
      	src/controllers/lss/d22/D22Settings.h
      	src/controllers/lss/d22/gui/hplccontroller/hplccontroller.properties
      	src/controllers/lss/d22/gui/hplccontroller/hplccontrollerView.xml
      	src/controllers/lss/d22/gui/nomadd22gui.jar
      	src/controllers/lss/d22/hplc/HplcController.cpp
      	src/controllers/lss/d22/hplc/UVUsbDetectorController.cpp
      	src/controllers/lss/ladi/LadiController.h
      	src/controllers/tas/common/gui/nomadtasgui.jar
      	src/controllers/tas/in22/commandline/IN22DriveCmd.cpp
      	src/controllers/tas/in22/commandline/IN22PrintCmd.cpp
      	src/controllers/tof/in4/gui/nomadin4gui.jar
      	src/drivers/ces/rioqcl/gui/nomadrioqclgui.jar
      	src/drivers/ioxos/mpda/RealMpdaDriver.cpp
      	src/drivers/ioxos/mpda/RealMpdaDriver.h
      	src/drivers/ioxos/mpda/SimulatedMpdaDriver.cpp
      	src/drivers/knauer/foxy/RealFoxyR1Driver.cpp
      	src/drivers/legacy/ces/riochopper/gui/nomadriochoppergui.jar
      	src/drivers/oxford/ips120/gui/nomadips120gui.jar
      	src/drivers/oxford/ips120/gui/nomadtcpips120gui.jar
      	src/drivers/tcpower/ag10xx/RealAg10xxDriver.cpp
      	src/drivers/wago/wagoqcl/RealWagoAxisDriver.cpp
      3ef15e5b
    • Locatelli's avatar
      Add info for color limits · a0abd053
      Locatelli authored
      a0abd053
  10. 01 Apr, 2020 2 commits