Commit ada28179 authored by aorlati's avatar aorlati
Browse files

merging latest64 into master

parents 2457a532 836b5f06

.gitignore

+5 −38
Original line number Diff line number Diff line 
.branchenv

introot*

bin/

lib/

object/

*~

.svn

*.swp
 


# Python 

*.pyc

__pycache__



# Prerequisites

*.d



# Compiled Object files

*.slo

*.lo

*.o

*.obj



# Precompiled Headers

*.gch

*.pch



# Compiled Dynamic libraries

*.so

*.dylib

*.dll



# Fortran module files

*.mod

*.smod



# Compiled Static libraries

*.lai

*.la

*.a

*.lib



# Executables

*.exe

*.out

*.app

.svnignore

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
rtai

object

lib

.purifydir

.idl-compilation-end

.idl-compilation-start

Common/Clients/AntennaBossTextClient/src/AntennaBossTextClient.cpp

+5 −5
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ 


using namespace TW;



static bool terminate;

static bool terminate_;



void quintHandler(int sig)

{

	terminate=true;

	terminate_=true;

}



IRA::CLogGuard guard(GUARDINTERVAL*1000);
@@ -163,7 +163,7 @@ int main(int argc, char *argv[]) { 
	TW::CLabel *output_label;

	TW::CInputCommand *userInput;



	terminate=false;

	terminate_=false;



	// mainframe 

	TW::CFrame window(CPoint(0,0),CPoint(WINDOW_WIDTH,WINDOW_HEIGHT),'|','|','-','-');
@@ -569,10 +569,10 @@ int main(int argc, char *argv[]) { 
	

	window.showFrame();

	 

	while(!terminate) {

	while(!terminate_) {

		//if ((fieldCounter=userInput->parseCommand(fields,MAXFIELDNUMBER))>0) {  // there is something input

		if (userInput->readCommand(inputCommand)) {

			if (inputCommand=="exit") terminate=true;

			if (inputCommand=="exit") terminate_=true;

			else if (component->_is_a("IDL:alma/Management/CommandInterpreter:1.0")) {

				try {

					char * outputAnswer;

Common/Clients/CaltoolClient/src/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -188,12 +188,15 @@ endif 
#

# TARGETS

# -------



.DEFAULT_GOAL := all



all:	gui do_all 

	@echo " . . . 'all' done" 



clean : clean_all 

	@echo " . . . clean done"

	@rm calibrationtool_ui.py

	@rm -f calibrationtool_ui.py*



clean_dist : clean_all clean_dist_all 

	@echo " . . . clean_dist done"

Common/Clients/ObservatoryTextClient/include/ObservatoryTextClient.h

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ 
/* *************************************************************************** */



/* define the main frame dimension */

#define WINDOW_WIDTH 69      /*columns */

#define WINDOW_HEIGHT 16     /* rows */  

#define WINDOW_WIDTH 73      /*columns */

#define WINDOW_HEIGHT 17     /* rows */  

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



/* define the routine name here, to be used for logging */