Commit ba0f91ad authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Merge branch 'centos_7_compatibility' of https://github.com/discos/discos into srt-bandQ-receiver

parents 5133ef63 59b36e16

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -50,3 +50,4 @@ SRT/Clients/SRTActiveSurfaceGUIClient/include/SRTActiveSurfaceGUI.h 
SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceCore.cpp

SRT/Clients/SRTActiveSurfaceGUIClient/src/moc_SRTActiveSurfaceGUIui.cpp

SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.idl

.vscode/settings.json

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line
@@ -101,7 +101,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 
    issue #791 - Nodding added for TotalPower and Sardara components via the `enable` command. This command can only be issued from a schedule and not via the operatorInput CLI.

                 The syntax for the command is the following: `enable=X;Y` with X and Y representing the 2 feeds the user would like to use for the Nodding observation.

                 This command must be placed in the <schedule_name>.bck file in order to work properly.

    issue #619 - Active surface components are now capable of changing look-up tables on the fly via the `asSetLUT` command

    issue #806   Added support for the C-band receiver at the SRT

    project #2 - Completed integration of new SRT Minor Servos



## Fixed

## Changed

	issue #689 - The dataset provided by weather station has been enlarged by the wind direction. The correctponding RAL 'wx' command will noe provided wind direction readout, as well

    issue #621 - The maximum number of chars of the schedule file name is now 37 (extension included). This is done for fits file and archive issue with the lenght of the schedule name.

    issue #853 - The setSection command can now accept a wildcard (*) as section identifier. This will allow to configure all backend sections with a single command

Common/Clients/CaltoolClient/src/_ctc.py

+4 −4
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ class Application(Qt.QDialog,calibrationtool_ui.Ui_CalibrationToolDialog): 
        else:

            self.scanAxisLabel.setText('ScanAxis - Focus')

            xaxis_text="Distance (mm)"

            hpbw_label_text='HPBW(mm)'

            hpbw_label_text='HPBW (arcmin)'

            peakOffsetLabel_text='PeakOffset (mm)'

            self.qwtPlot_datax.setAxisTitle(Qwt.QwtPlot.xBottom, xaxis_text)

            self.qwtPlot_datay.setAxisTitle(Qwt.QwtPlot.xBottom, xaxis_text)

Common/Clients/MinorServoBossTextClient/include/MinorServoBossTextClient.h

+3 −1
Original line number Diff line number Diff line
@@ -78,10 +78,12 @@ 
/* define name and component interface */

/* ********************************** */

#define COMPONENT_NAME "MINORSERVO/Boss"              /* the name of the instantiation of the component */

#define COMPONENT_INTERFACE_TPYE "IDL:alma/MinorServo/MinorServoBoss:1.0"  /* the type of the interface */

#define COMPONENT_IDL_MODULE MinorServo	/* the IDL module that contains the component interface */

#define COMPONENT_IDL_INTERFACE MinorServoBoss  /* the IDL interface of the component */

#define COMPONENT_SMARTPOINTER MinorServoBoss_var /* the component type */

#ifndef COMPONENT_INTERFACE_TPYE

    #define COMPONENT_INTERFACE_TPYE "IDL:alma/MinorServo/MinorServoBoss:1.0"

#endif

/* ********************************** */



/* define user input command style */

Common/Clients/MinorServoBossTextClient/src/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ _tui_MinorServoBossTextClient_LIBS = MinorServoBossStubs IRALibrary Managme 
         TextWindowLibrary ClientErrors ComponentErrors ManagementErrors MinorServoErrors AntennaDefinitionsStubs \

		 MinorServoDefinitionsStubs



ifeq ($(STATION),SRT)

	MinorServoBossTextClient_CFLAGS = -DCOMPONENT_INTERFACE_TPYE="\"IDL:alma/MinorServo/SRTMinorServoBoss:1.0\""

endif



SCRIPTS         = minorservoBossTui