packages feed

HROOT 0.5.0.1 → 0.5.0.2

raw patch · 6 files changed

+2/−87 lines, 6 files

Files

HROOT.cabal view
@@ -1,5 +1,5 @@ Name:		HROOT-Version:	0.5.0.1+Version:	0.5.0.2 Synopsis:	Wrapper for ROOT Description: 	Haskell FFI binding for ROOT   Homepage:       http://ianwookim.org/HROOT
csrc/HROOT.cpp view
@@ -42,7 +42,7 @@ #include "TBRIK.h" #include "TTUBE.h" #include "TPCON.h"-#include "TPolyLineShape.h"+// #include "TPolyLineShape.h" #include "TSPHE.h" #include "TXTRU.h" #include "TBox.h"@@ -339,10 +339,6 @@ #define ROOT_TPCON_DEFINITIONVIRT(Type)\  -#undef ROOT_TPOLYLINESHAPE_DEFINITIONVIRT-#define ROOT_TPOLYLINESHAPE_DEFINITIONVIRT(Type)\-- #undef ROOT_TSPHE_DEFINITIONVIRT #define ROOT_TSPHE_DEFINITIONVIRT(Type)\ @@ -941,10 +937,6 @@ }\  -#undef ROOT_TPOLYLINESHAPE_DEFINITIONNONVIRT-#define ROOT_TPOLYLINESHAPE_DEFINITIONNONVIRT(Type)\-- #undef ROOT_TSPHE_DEFINITIONNONVIRT #define ROOT_TSPHE_DEFINITIONNONVIRT(Type)\ Type ## _p Type ## _newTSPHE ( const char * name, const char * title, const char * material, double rmin, double rmax, double themin, double themax, double phimin, double phimax )\@@ -1424,7 +1416,6 @@ ROOT_TATT3D_DEFINITIONVIRT(TH3) ROOT_TATT3D_DEFINITIONVIRT(TXTRU) ROOT_TATT3D_DEFINITIONVIRT(TSPHE)-ROOT_TATT3D_DEFINITIONVIRT(TPolyLineShape) ROOT_TATT3D_DEFINITIONVIRT(TPCON) ROOT_TATT3D_DEFINITIONVIRT(TTUBE) ROOT_TATT3D_DEFINITIONVIRT(TBRIK)@@ -1486,7 +1477,6 @@ ROOT_TATTFILL_DEFINITIONVIRT(TBox) ROOT_TATTFILL_DEFINITIONVIRT(TXTRU) ROOT_TATTFILL_DEFINITIONVIRT(TSPHE)-ROOT_TATTFILL_DEFINITIONVIRT(TPolyLineShape) ROOT_TATTFILL_DEFINITIONVIRT(TPCON) ROOT_TATTFILL_DEFINITIONVIRT(TTUBE) ROOT_TATTFILL_DEFINITIONVIRT(TBRIK)@@ -1557,7 +1547,6 @@ ROOT_TATTLINE_DEFINITIONVIRT(TBox) ROOT_TATTLINE_DEFINITIONVIRT(TXTRU) ROOT_TATTLINE_DEFINITIONVIRT(TSPHE)-ROOT_TATTLINE_DEFINITIONVIRT(TPolyLineShape) ROOT_TATTLINE_DEFINITIONVIRT(TPCON) ROOT_TATTLINE_DEFINITIONVIRT(TTUBE) ROOT_TATTLINE_DEFINITIONVIRT(TBRIK)@@ -1602,7 +1591,6 @@ ROOT_TATTMARKER_DEFINITIONVIRT(TNtuple) ROOT_TATTMARKER_DEFINITIONVIRT(TChain) ROOT_TATTMARKER_DEFINITIONVIRT(TTree)-ROOT_TATTMARKER_DEFINITIONVIRT(TPolyLineShape) ROOT_TATTMARKER_DEFINITIONVIRT(TGraphQQ) ROOT_TATTMARKER_DEFINITIONVIRT(TGraphPolar) ROOT_TATTMARKER_DEFINITIONVIRT(TGraphErrors)@@ -1784,7 +1772,6 @@ ROOT_TNAMED_DEFINITIONVIRT(TTree) ROOT_TNAMED_DEFINITIONVIRT(TXTRU) ROOT_TNAMED_DEFINITIONVIRT(TSPHE)-ROOT_TNAMED_DEFINITIONVIRT(TPolyLineShape) ROOT_TNAMED_DEFINITIONVIRT(TPCON) ROOT_TNAMED_DEFINITIONVIRT(TTUBE) ROOT_TNAMED_DEFINITIONVIRT(TBRIK)@@ -1863,7 +1850,6 @@ ROOT_TOBJECT_DEFINITIONVIRT(TBox) ROOT_TOBJECT_DEFINITIONVIRT(TXTRU) ROOT_TOBJECT_DEFINITIONVIRT(TSPHE)-ROOT_TOBJECT_DEFINITIONVIRT(TPolyLineShape) ROOT_TOBJECT_DEFINITIONVIRT(TPCON) ROOT_TOBJECT_DEFINITIONVIRT(TTUBE) ROOT_TOBJECT_DEFINITIONVIRT(TBRIK)@@ -1914,7 +1900,6 @@ ROOT_TPOLYLINE_DEFINITIONVIRT(TCurlyArc) ROOT_TPOLYLINE_DEFINITIONVIRT(TCurlyLine) ROOT_TPOLYLINE_DEFINITIONVIRT(TPolyLine)-ROOT_TPOLYLINESHAPE_DEFINITIONVIRT(TPolyLineShape) ROOT_TQOBJECT_DEFINITIONVIRT(TRint) ROOT_TQOBJECT_DEFINITIONVIRT(TApplication) ROOT_TQOBJECT_DEFINITIONVIRT(TSlider)@@ -1931,7 +1916,6 @@ ROOT_TSPHE_DEFINITIONVIRT(TSPHE) ROOT_TSHAPE_DEFINITIONVIRT(TXTRU) ROOT_TSHAPE_DEFINITIONVIRT(TSPHE)-ROOT_TSHAPE_DEFINITIONVIRT(TPolyLineShape) ROOT_TSHAPE_DEFINITIONVIRT(TPCON) ROOT_TSHAPE_DEFINITIONVIRT(TTUBE) ROOT_TSHAPE_DEFINITIONVIRT(TBRIK)@@ -1998,7 +1982,6 @@ ROOT_TBRIK_DEFINITIONNONVIRT(TBRIK) ROOT_TTUBE_DEFINITIONNONVIRT(TTUBE) ROOT_TPCON_DEFINITIONNONVIRT(TPCON)-ROOT_TPOLYLINESHAPE_DEFINITIONNONVIRT(TPolyLineShape) ROOT_TSPHE_DEFINITIONNONVIRT(TSPHE) ROOT_TXTRU_DEFINITIONNONVIRT(TXTRU) ROOT_TBOX_DEFINITIONNONVIRT(TBox)
csrc/HROOT.h view
@@ -153,10 +153,6 @@ #define ROOT_TPCON_DECLARATIONVIRT(Type) \  -#undef ROOT_TPOLYLINESHAPE_DECLARATIONVIRT-#define ROOT_TPOLYLINESHAPE_DECLARATIONVIRT(Type) \-- #undef ROOT_TSPHE_DECLARATIONVIRT #define ROOT_TSPHE_DECLARATIONVIRT(Type) \ @@ -573,9 +569,6 @@ #define ROOT_TPCON_DECLARATIONNONVIRT(Type) \ Type ## _p Type ## _newTPCON ( const char * name, const char * title, const char * material, double phi1, double dphi1, int  nz ); \ -#undef ROOT_TPOLYLINESHAPE_DECLARATIONNONVIRT-#define ROOT_TPOLYLINESHAPE_DECLARATIONNONVIRT(Type) \- #undef ROOT_TSPHE_DECLARATIONNONVIRT #define ROOT_TSPHE_DECLARATIONNONVIRT(Type) \ Type ## _p Type ## _newTSPHE ( const char * name, const char * title, const char * material, double rmin, double rmax, double themin, double themax, double phimin, double phimax ); \@@ -850,7 +843,6 @@ ROOT_TYPE_DECLARATION(TBRIK); ROOT_TYPE_DECLARATION(TTUBE); ROOT_TYPE_DECLARATION(TPCON);-ROOT_TYPE_DECLARATION(TPolyLineShape); ROOT_TYPE_DECLARATION(TSPHE); ROOT_TYPE_DECLARATION(TXTRU); ROOT_TYPE_DECLARATION(TBox);@@ -980,7 +972,6 @@ ROOT_TATT3D_DECLARATIONVIRT(TH3); ROOT_TATT3D_DECLARATIONVIRT(TXTRU); ROOT_TATT3D_DECLARATIONVIRT(TSPHE);-ROOT_TATT3D_DECLARATIONVIRT(TPolyLineShape); ROOT_TATT3D_DECLARATIONVIRT(TPCON); ROOT_TATT3D_DECLARATIONVIRT(TTUBE); ROOT_TATT3D_DECLARATIONVIRT(TBRIK);@@ -1042,7 +1033,6 @@ ROOT_TATTFILL_DECLARATIONVIRT(TBox); ROOT_TATTFILL_DECLARATIONVIRT(TXTRU); ROOT_TATTFILL_DECLARATIONVIRT(TSPHE);-ROOT_TATTFILL_DECLARATIONVIRT(TPolyLineShape); ROOT_TATTFILL_DECLARATIONVIRT(TPCON); ROOT_TATTFILL_DECLARATIONVIRT(TTUBE); ROOT_TATTFILL_DECLARATIONVIRT(TBRIK);@@ -1113,7 +1103,6 @@ ROOT_TATTLINE_DECLARATIONVIRT(TBox); ROOT_TATTLINE_DECLARATIONVIRT(TXTRU); ROOT_TATTLINE_DECLARATIONVIRT(TSPHE);-ROOT_TATTLINE_DECLARATIONVIRT(TPolyLineShape); ROOT_TATTLINE_DECLARATIONVIRT(TPCON); ROOT_TATTLINE_DECLARATIONVIRT(TTUBE); ROOT_TATTLINE_DECLARATIONVIRT(TBRIK);@@ -1158,7 +1147,6 @@ ROOT_TATTMARKER_DECLARATIONVIRT(TNtuple); ROOT_TATTMARKER_DECLARATIONVIRT(TChain); ROOT_TATTMARKER_DECLARATIONVIRT(TTree);-ROOT_TATTMARKER_DECLARATIONVIRT(TPolyLineShape); ROOT_TATTMARKER_DECLARATIONVIRT(TGraphQQ); ROOT_TATTMARKER_DECLARATIONVIRT(TGraphPolar); ROOT_TATTMARKER_DECLARATIONVIRT(TGraphErrors);@@ -1340,7 +1328,6 @@ ROOT_TNAMED_DECLARATIONVIRT(TTree); ROOT_TNAMED_DECLARATIONVIRT(TXTRU); ROOT_TNAMED_DECLARATIONVIRT(TSPHE);-ROOT_TNAMED_DECLARATIONVIRT(TPolyLineShape); ROOT_TNAMED_DECLARATIONVIRT(TPCON); ROOT_TNAMED_DECLARATIONVIRT(TTUBE); ROOT_TNAMED_DECLARATIONVIRT(TBRIK);@@ -1419,7 +1406,6 @@ ROOT_TOBJECT_DECLARATIONVIRT(TBox); ROOT_TOBJECT_DECLARATIONVIRT(TXTRU); ROOT_TOBJECT_DECLARATIONVIRT(TSPHE);-ROOT_TOBJECT_DECLARATIONVIRT(TPolyLineShape); ROOT_TOBJECT_DECLARATIONVIRT(TPCON); ROOT_TOBJECT_DECLARATIONVIRT(TTUBE); ROOT_TOBJECT_DECLARATIONVIRT(TBRIK);@@ -1470,7 +1456,6 @@ ROOT_TPOLYLINE_DECLARATIONVIRT(TCurlyArc); ROOT_TPOLYLINE_DECLARATIONVIRT(TCurlyLine); ROOT_TPOLYLINE_DECLARATIONVIRT(TPolyLine);-ROOT_TPOLYLINESHAPE_DECLARATIONVIRT(TPolyLineShape); ROOT_TQOBJECT_DECLARATIONVIRT(TRint); ROOT_TQOBJECT_DECLARATIONVIRT(TApplication); ROOT_TQOBJECT_DECLARATIONVIRT(TSlider);@@ -1487,7 +1472,6 @@ ROOT_TSPHE_DECLARATIONVIRT(TSPHE); ROOT_TSHAPE_DECLARATIONVIRT(TXTRU); ROOT_TSHAPE_DECLARATIONVIRT(TSPHE);-ROOT_TSHAPE_DECLARATIONVIRT(TPolyLineShape); ROOT_TSHAPE_DECLARATIONVIRT(TPCON); ROOT_TSHAPE_DECLARATIONVIRT(TTUBE); ROOT_TSHAPE_DECLARATIONVIRT(TBRIK);@@ -1586,8 +1570,6 @@ ROOT_TTUBE_DECLARATIONNONVIRT(TTUBE);  ROOT_TPCON_DECLARATIONNONVIRT(TPCON);--ROOT_TPOLYLINESHAPE_DECLARATIONNONVIRT(TPolyLineShape);  ROOT_TSPHE_DECLARATIONNONVIRT(TSPHE);
src/HROOT/Class.hs view
@@ -98,8 +98,6 @@  class ITPCON a where -class ITPolyLineShape a where- class ITSPHE a where  class ITXTRU a where@@ -385,10 +383,6 @@   cast = unsafeForeignPtrToPtr . castForeignPtr . get_fptr   uncast = cast_fptr_to_obj . castForeignPtr . unsafePerformIO . newForeignPtr_  -instance (ITPolyLineShape a, FPtr a) => Castable a (Ptr RawTPolyLineShape) where-  cast = unsafeForeignPtrToPtr . castForeignPtr . get_fptr-  uncast = cast_fptr_to_obj . castForeignPtr . unsafePerformIO . newForeignPtr_ - instance (ITSPHE a, FPtr a) => Castable a (Ptr RawTSPHE) where   cast = unsafeForeignPtrToPtr . castForeignPtr . get_fptr   uncast = cast_fptr_to_obj . castForeignPtr . unsafePerformIO . newForeignPtr_ @@ -757,8 +751,6 @@  instance ITPCON TPCON where -instance ITPolyLineShape TPolyLineShape where- instance ITSPHE TSPHE where  instance ITXTRU TXTRU where@@ -966,7 +958,6 @@ instance ITAtt3D TH3 where instance ITAtt3D TXTRU where instance ITAtt3D TSPHE where-instance ITAtt3D TPolyLineShape where instance ITAtt3D TPCON where instance ITAtt3D TTUBE where instance ITAtt3D TBRIK where@@ -1135,9 +1126,6 @@ instance ITAttFill TSPHE where   setFillColor = xform1 c_tsphe_setfillcolor   setFillStyle = xform1 c_tsphe_setfillstyle-instance ITAttFill TPolyLineShape where-  setFillColor = xform1 c_tpolylineshape_setfillcolor-  setFillStyle = xform1 c_tpolylineshape_setfillstyle instance ITAttFill TPCON where   setFillColor = xform1 c_tpcon_setfillcolor   setFillStyle = xform1 c_tpcon_setfillstyle@@ -1291,8 +1279,6 @@   setLineColor = xform1 c_txtru_setlinecolor instance ITAttLine TSPHE where   setLineColor = xform1 c_tsphe_setlinecolor-instance ITAttLine TPolyLineShape where-  setLineColor = xform1 c_tpolylineshape_setlinecolor instance ITAttLine TPCON where   setLineColor = xform1 c_tpcon_setlinecolor instance ITAttLine TTUBE where@@ -1355,7 +1341,6 @@ instance ITAttMarker TNtuple where instance ITAttMarker TChain where instance ITAttMarker TTree where-instance ITAttMarker TPolyLineShape where instance ITAttMarker TGraphQQ where instance ITAttMarker TGraphPolar where instance ITAttMarker TGraphErrors where@@ -1672,8 +1657,6 @@   setTitle = xform1 c_txtru_settitle instance ITNamed TSPHE where   setTitle = xform1 c_tsphe_settitle-instance ITNamed TPolyLineShape where-  setTitle = xform1 c_tpolylineshape_settitle instance ITNamed TPCON where   setTitle = xform1 c_tpcon_settitle instance ITNamed TTUBE where@@ -2011,11 +1994,6 @@   draw = xform1 c_tsphe_draw   saveAs = xform2 c_tsphe_saveas   write = xform3 c_tsphe_write-instance ITObject TPolyLineShape where-  getName = xform0 c_tpolylineshape_getname-  draw = xform1 c_tpolylineshape_draw-  saveAs = xform2 c_tpolylineshape_saveas-  write = xform3 c_tpolylineshape_write instance ITObject TPCON where   getName = xform0 c_tpcon_getname   draw = xform1 c_tpcon_draw@@ -2156,7 +2134,6 @@  instance ITShape TXTRU where instance ITShape TSPHE where-instance ITShape TPolyLineShape where instance ITShape TPCON where instance ITShape TTUBE where instance ITShape TBRIK where@@ -2295,8 +2272,6 @@ newTPCON :: String -> String -> String -> Double -> Double -> Int -> IO TPCON newTPCON = xform5 c_tpcon_newtpcon -- newTSPHE :: String -> String -> String -> Double -> Double -> Double -> Double -> Double -> Double -> IO TSPHE newTSPHE = xform8 c_tsphe_newtsphe @@ -2465,7 +2440,6 @@  newTRint :: String -> [Int] -> [String] -> IO TRint newTRint = xform2 c_trint_newtrint-
src/HROOT/Function.hsc view
@@ -463,23 +463,6 @@   :: CString -> CString -> CString -> CDouble -> CDouble -> CInt -> IO (Ptr RawTPCON)  -foreign import ccall "HROOT.h TPolyLineShape_SetTitle" c_tpolylineshape_settitle -  :: (Ptr RawTPolyLineShape) -> CString -> IO ()-foreign import ccall "HROOT.h TPolyLineShape_SetLineColor" c_tpolylineshape_setlinecolor -  :: (Ptr RawTPolyLineShape) -> CInt -> IO ()-foreign import ccall "HROOT.h TPolyLineShape_SetFillColor" c_tpolylineshape_setfillcolor -  :: (Ptr RawTPolyLineShape) -> CInt -> IO ()-foreign import ccall "HROOT.h TPolyLineShape_SetFillStyle" c_tpolylineshape_setfillstyle -  :: (Ptr RawTPolyLineShape) -> CInt -> IO ()-foreign import ccall "HROOT.h TPolyLineShape_GetName" c_tpolylineshape_getname -  :: (Ptr RawTPolyLineShape) -> IO CString-foreign import ccall "HROOT.h TPolyLineShape_Draw" c_tpolylineshape_draw -  :: (Ptr RawTPolyLineShape) -> CString -> IO ()-foreign import ccall "HROOT.h TPolyLineShape_SaveAs" c_tpolylineshape_saveas -  :: (Ptr RawTPolyLineShape) -> CString -> CString -> IO ()-foreign import ccall "HROOT.h TPolyLineShape_Write" c_tpolylineshape_write -  :: (Ptr RawTPolyLineShape) -> CString -> CInt -> CInt -> IO CInt- foreign import ccall "HROOT.h TSPHE_SetTitle" c_tsphe_settitle    :: (Ptr RawTSPHE) -> CString -> IO () foreign import ccall "HROOT.h TSPHE_SetLineColor" c_tsphe_setlinecolor
src/HROOT/Type.hs view
@@ -361,13 +361,6 @@    get_fptr (TPCON fptr) = fptr    cast_fptr_to_obj = TPCON -data RawTPolyLineShape-newtype TPolyLineShape = TPolyLineShape (ForeignPtr RawTPolyLineShape) deriving (Eq, Ord, Show)-instance FPtr TPolyLineShape where-   type Raw TPolyLineShape = RawTPolyLineShape-   get_fptr (TPolyLineShape fptr) = fptr-   cast_fptr_to_obj = TPolyLineShape- data RawTSPHE newtype TSPHE = TSPHE (ForeignPtr RawTSPHE) deriving (Eq, Ord, Show) instance FPtr TSPHE where