Changeset 471 for library/bdm/base/bdmbase.cpp
- Timestamp:
- 08/05/09 00:01:58 (15 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
library/bdm/base/bdmbase.cpp
r462 r471 173 173 } 174 174 175 void mpdf::from_setting(const Setting &set){ 176 if (set.exists("rv")) { 177 RV *r = UI::build<RV>(set, "rv");178 set_rv(*r);179 delete r;175 void mpdf::from_setting(const Setting &set){ 176 RV *r = UI::build<RV>(set, "rv"); 177 if (r) { 178 set_rv(*r); 179 delete r; 180 180 } 181 181 182 if (set.exists("rvc")) { 183 RV *r = UI::build<RV>(set, "rvc");184 set_rvc(*r);185 delete r;182 r = UI::build<RV>(set, "rvc"); 183 if (r) { 184 set_rvc(*r); 185 delete r; 186 186 } 187 187 } … … 281 281 { 282 282 Array<string> A; 283 if( set.exists("names")) 284 UI::get( A, set, "names" ); 285 else 283 if( !UI::get( A, set, "names" ) ) 286 284 A.set_length(0); 287 285 288 286 ivec szs; 289 if( set.exists("sizes")) 290 UI::get(szs,set,"sizes"); 291 else 287 if( !UI::get(szs,set,"sizes") ) 292 288 szs = ones_i(A.length()); 293 289 294 290 ivec tms; 295 if( set.exists( "times") ) 296 UI::get(tms,set,"times"); 297 else 291 if( !UI::get(tms,set,"times") ) 298 292 tms = zeros_i(A.length()); 299 293 … … 302 296 } 303 297 304 /*void RV::to_setting( Setting &set ) const305 {306 Transport::to_setting( set );307 308 Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );309 kilometers_setting = kilometers;310 311 UI::save( passengers, set, "passengers" );312 }*/313 314 298 RV concat ( const RV &rv1, const RV &rv2 ) { 315 299 RV pom = rv1; … … 322 306 323 307 void mepdf::from_setting(const Setting &set) { 324 shared_ptr<epdf> e(UI::build<epdf>(set, "epdf"));308 shared_ptr<epdf> e(UI::build<epdf>(set, "epdf", UI::compulsory)); 325 309 set_ep(e); 326 310 }