Changeset 132

Show
Ignore:
Timestamp:
09/12/04 20:46:10 (7 years ago)
Author:
ansgar
Message:

merged in r83:131 from trunk to get final v1 snapshot before moving v2 to trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tags/v1/SConstruct

    r77 r132  
    4646            
    4747boost_generic_libs = ["boost_filesystem"+boost_suffix,"boost_regex"+boost_suffix] 
    48 env.Append(LIBS = boost_generic_libs + ["fftw3", "xerces-c"] +  string.split(env["EXTRA_LIBS"])) 
     48env.Append(LIBS = boost_generic_libs + ["fftw3", "xerces-c", "pthread"] +  string.split(env["EXTRA_LIBS"])) 
    4949 
    5050# the Pymod environment adds the necessary flags and builder 
    …… 
    5353platform.SetPythonInfo(pymod_env, env["PYTHON_VERSION"]) 
    5454platform.SetPymodBuilder(pymod_env) 
    55 pymod_env.Append(LIBPATH = "#lib") 
     55pymod_env.Prepend(LIBPATH = "#lib") 
    5656pymod_env.Append(LIBS = ["iplt","boost_python"+boost_suffix]) 
    5757 
    …… 
    5959# algorithm environment, based on basic env 
    6060alg_env = env.Copy() 
    61 alg_env.Append(LIBPATH = "#lib") 
     61alg_env.Prepend(LIBPATH = "#lib") 
    6262alg_env.Append(LIBS = ["iplt"]) 
    6363 
    …… 
    7777app_env = env.Copy() 
    7878app_env.Append(LIBS = "iplt") 
    79 app_env.Append(LIBPATH = '#/lib') 
     79app_env.Prepend(LIBPATH = '#/lib') 
    8080 
    8181# unit tests env 

  • tags/v1/src/alg/common/lib/stat.cc

    r80 r132  
    1717 
    1818  // total of data values 
    19   for(DataIterator it(data->GetExtent());!it.AtEnd(); it++) { 
     19  for(DataIterator it(data->GetExtent());!it.AtEnd(); ++it) { 
    2020    double v=data->GetReal(it); 
    2121    _min=(v<_min) ? v : _min; 
    …… 
    3232  _ave_dev = 0.0; 
    3333  _var = 0.0; 
    34   for(DataIterator it(data->GetExtent());!it.AtEnd(); it++) { 
     34  for(DataIterator it(data->GetExtent());!it.AtEnd(); ++it) { 
    3535    double diff = data->GetReal(it)-_mean; 
    3636    _ave_dev += fabs(diff); 

  • tags/v1/src/alg/common/pymod/wrap_common.cc

    r31 r132  
    3838    .def("GetMinimum",&Stat::GetMinimum) 
    3939    .def("GetMaximum",&Stat::GetMaximum) 
    40     .def("GetMean",&Stat::GetMean) 
    4140    .def("GetVariance",&Stat::GetVariance) 
    4241    .def("GetStandardDeviation",&Stat::GetStandardDeviation) 

  • tags/v1/src/base/lib/algorithm.hh

    r73 r132  
    6363  //! visitor implementation for functions 
    6464  virtual void VisitFunction(const Function* f) = 0; 
    65 private: 
     65protected: 
    6666  //! assignement op 
    6767  ConstAlgorithm& operator=(const ConstAlgorithm& a) {return *this;} 
    …… 
    9191  //! copy ctor 
    9292  ModAlgorithm(const ModAlgorithm& a): AlgorithmBase(a) {} 
    93 private: 
     93//private: 
    9494  //! assignement op 
    9595  ModAlgorithm& operator=(const ModAlgorithm& a) {return *this;} 
    …… 
    124124  ModIPAlgorithm(const string& name): ModAlgorithm(name) {} 
    125125  ModIPAlgorithm(const ModIPAlgorithm& a): ModAlgorithm(a) {} 
    126 private: 
     126//private: 
    127127  ModIPAlgorithm& operator=(const ModIPAlgorithm& a) {return *this;} 
    128128}; 
    …… 
    148148  ModOPAlgorithm(const string& name): ModAlgorithm(name) {} 
    149149  ModOPAlgorithm(const ModOPAlgorithm& a): ModAlgorithm(a) {} 
    150 private: 
     150//private: 
    151151  ModOPAlgorithm& operator=(const ModOPAlgorithm& a) {return *this;} 
    152152}; 
    …… 
    176176  ImageStateAlgorithmOP(const ModAlgorithm& a): ModAlgorithm(a) {} 
    177177 
    178 private: 
     178//private: 
    179179  ImageStateAlgorithmOP& operator=(const ImageStateAlgorithmOP& a) {return *this;} 
    180180}; 
    …… 
    209209  ImageStateAlgorithmIP(const ModAlgorithm& a): ModAlgorithm(a) {} 
    210210 
    211 private: 
     211//private: 
    212212  ImageStateAlgorithmIP& operator=(const ImageStateAlgorithmIP& a) {return *this;} 
    213213}; 

  • tags/v1/src/base/perf/SConscript

    r1 r132  
    44p_env.Append(LIBS = 'dl', CPPPATH='../lib') 
    55p_env.Program('perf1',['perf1.cc',base_static_lib]) 
     6#p_env.Program('perf2',['perf2.cc',base_static_lib]) 
    67 

  • tags/v1/src/base/pymod/SConscript

    r78 r132  
    1414export_normalizer.cc 
    1515export_message.cc 
     16export_data_iterator.cc 
    1617""") 
    1718 

  • tags/v1/src/base/pymod/export_point.cc

    r51 r132  
    3030} 
    3131 
     32int point_len() {return 3;} 
     33int point_getitem(const Point& p, int i) {return p[i];} 
     34void point_setitem(Point& p, int i, int v) {p[i]=v;} 
     35 
    3236void export_Point() 
    3337{ 
    …… 
    4145    .def("ToVec4",&Point::ToVec4) 
    4246    .def(self_ns::str(self)) 
     47    .def("__len__",point_len) 
     48    .def("__getitem__",point_getitem) 
     49    .def("__setitem__",point_setitem) 
    4350    ; 
    4451} 

  • tags/v1/src/base/pymod/export_size.cc

    r48 r132  
    2121namespace iplt { 
    2222 
     23int size_len() {return 3;} 
     24int size_getitem(const Size& s, int i) {return s[i];} 
     25void size_setitem(Size& s, int i, int v)  
     26{ 
     27  if(v<1) throw Error("negative size value"); 
     28  s[i]=v; 
     29} 
     30 
    2331void export_Size() 
    2432{ 
    2533  // size wrapper 
    26   class_<Size>("Size", init<int, optional <int, int> >() ) 
     34  class_<Size, bases<Point> >("Size", init<int, optional <int, int> >() ) 
    2735    .def("GetHeight",&Size::GetHeight) 
    2836    .def("GetWidth",&Size::GetWidth) 
    2937    .def("GetDepth",&Size::GetDepth) 
    3038    .def(self_ns::str(self)) 
     39    .def("__len__",size_len) 
     40    .def("__getitem__",size_getitem) 
     41    .def("__setitem__",size_setitem) 
    3142    ; 
    3243} 

  • tags/v1/src/base/pymod/wrap_iplt.cc

    r78 r132  
    3737void export_Normalizer(); 
    3838void export_Message(); 
     39void export_DataIterator(); 
    3940 
    4041// exception translator 
    …… 
    7172 
    7273  export_Message(); 
     74   
     75  export_DataIterator(); 
    7376} 
    7477 

  • tags/v1/src/gui/shell.cc

    r74 r132  
    5050  _border[3]=20; 
    5151 
    52   SetShellFont(wxFont(8,wxMODERN,wxNORMAL,wxNORMAL)); 
     52  SetShellFont(wxFont(12,wxMODERN,wxNORMAL,wxNORMAL)); 
    5353   
    5454  SetVirtualSize(calc_size());