Commit 18d74fa0 authored by marco-buttu's avatar marco-buttu
Browse files

Fix issue 500

parent d1904b67

Common/Simulators/Components/PyPositioner/idl/ComponentErrors.xml

deleted100755 → 0
+0 −19
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>



<Type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

 xmlns="Alma/ACSError" xsi:schemaLocation="Alma/ACSError ACSError.xsd"

 name="ComponentErrors" type="2001" _prefix="alma">



 <Code 

     name="NoError" 

     shortDescription="No error" 

     description="No error condition found"/>



 <ErrorCode 

     name="NotAllowed" 

     shortDescription="Operation not allowed" 

     description="Operation not allowed in this configuration">

	<Member name="Reason" type="string" description="Reason" />

</ErrorCode>



</Type>

Common/Simulators/Components/PyPositioner/idl/TestNamespaceInterface.idl

+1 −3
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#define __TESTNAMESPACE_INTERFACE__IDL__ 



#include <baci.idl>

#include <ComponentErrors.idl>



#pragma prefix "alma"
@@ -24,8 +23,7 @@ module TestNamespaceInterface { 
    {

   

        /** Set the position */

        void setPosition(in double position) 

            raises (ComponentErrors::ComponentErrorsEx);

        void setPosition(in double position);





        /** Return the actual position */

Common/Simulators/Components/PyPositioner/src/Makefile

+2 −14
Original line number Diff line number Diff line
@@ -5,16 +5,12 @@ 
# Marco Buttu <marco.buttu@inaf.it>

#*****************************************************************



ACSERRDEF= ComponentErrors



ERRXMLFILE= ../idl/ComponentErrors.xml



# Interface

# ----------------------------

CDB_SCHEMAS = Positioner

IDL_FILES = TestNamespaceInterface

TestNamespaceInterfaceStubs_LIBS = baciStubs acscomponentStubs ACSErrTypeCommon \

								 ComponentErrors

TestNamespaceInterfaceStubs_LIBS = baciStubs acscomponentStubs





# Python directives
@@ -72,15 +68,7 @@ clean_dist : clean_all clean_dist_all 
man   : do_man 

	@echo " . . . man page(s) done"



install : xmlpatch_pre install_all

	@chmod $(PERM) $(ERRXMLFILE)

	@echo "Patch applied" 

install : install_all

	@rm -rf /tmp/tmp.txt

	@echo " . . . installation done"

	@echo " . . . installation done"
 




xmlpatch_pre :

	@echo "File permissions: " $(PERM)

	@chmod a+w $(ERRXMLFILE)

	@echo $(PERM) > /tmp/tmp.txt

Common/Simulators/Components/PyPositioner/src/Positioner/PositionerImpl.py

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ class PositionerImpl(POA, cc, services, lcycle): 
        cc.__init__(self)

        services.__init__(self)

        self.position = 0

        self.sequence = (1.1, 2.2, 3.3)

        self.sequence = [1.1, 2.2, 3.3]



    def initialize(self):

        addProperty(self, 'status', devio_ref=GenericDevIO())