Changeset 471 for library/bdm/base/datasources.cpp

Timestamp:

08/05/09 00:01:58 (15 years ago)

Author:

mido

Message:

1) ad UserInfo?: UI::get a UI::build predelany tak, ze vraci fals / NULL v pripade neexistence pozadovaneho Settingu, pridana enumericky typ UI::SettingPresence?, predelany stavajici UI implementace, dodelana UI dokumentace
2) dokoncena konfigurace ASTYLERU, brzy bude aplikovan
3) doxygen nastaven tak, ze vytvari soubor doxy_warnings.txt

Files:

• library/bdm/base/datasources.cpp (modified) (5 diffs)

library/bdm/base/datasources.cpp

@@ -56 +56 @@
 void ArxDS::from_setting( const Setting &set ) 
 {       
-        RV *yrv = UI::build<RV>( set, "y" );
-        RV *urv = UI::build<RV>( set, "u" );
-        RV *rrv = UI::build<RV>( set, "rgr" ); 
+        RV *yrv = UI::build<RV>( set, "y" , UI::compulsory);
+        RV *urv = UI::build<RV>( set, "u" , UI::compulsory);
+        RV *rrv = UI::build<RV>( set, "rgr" , UI::compulsory); 
                                 
         mat Th;
-        UI::get( Th, set, "theta" );
+        UI::get( Th, set, "theta", UI::compulsory );
 
         vec mu0;
-        if( set.exists( "offset" ))
-                UI::get( mu0, set, "offset" );
-        else
+        if( !UI::get( mu0, set, "offset" ) )
                 mu0= zeros( yrv->_dsize() );
 
         mat sqR;
-        UI::get( sqR, set, "r" );
+        UI::get( sqR, set, "r", UI::compulsory );
         set_parameters(Th,mu0,sqR);
         set_drv(*yrv,*urv,*rrv);
@@ -77 +75 @@
                 set_options(set["opt"]);
 }
-
-/*void ArxDS::to_setting( Setting &set ) const
-{       
-        Transport::to_setting( set );
-
-        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
-        kilometers_setting = kilometers;
-
-        UI::save( passengers, set, "passengers" );
-}*/
-
 
 CsvFileDS::CsvFileDS ( const string& fname, const string& orientation ) :FileDS() {
@@ -125 +112 @@
 void ITppFileDS::from_setting( const Setting &set ) 
 {       
-        RV* rvtmp = UI::build<RV>(set, "rv" );
+        RV* rvtmp = UI::build<RV>(set, "rv" , UI::compulsory);
 
         it_file it ( set["filename"] );
@@ -136 +123 @@
 }
 
-/*void ITppFileDS::to_setting( Setting &set ) const
-{       
-        Transport::to_setting( set );
-
-        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
-        kilometers_setting = kilometers;
-
-        UI::save( passengers, set, "passengers" );
-}*/
-
 void stateDS::from_setting( const Setting &set ) 
 {       
-        IM = UI::build<mpdf>(set, "IM");
-        OM = UI::build<mpdf>(set, "OM");
+        IM = UI::build<mpdf>(set, "IM", UI::compulsory);                        
+        OM = UI::build<mpdf>(set, "OM", UI::compulsory);
 
         dt.set_length( OM->dimension() );
@@ -155 +132 @@
         ut.set_length(0);
         
-        RV* rvtmp = UI::build<RV>(set["IM"], "rvu");                    
+        RV* rvtmp = UI::build<RV>(set["IM"], "rvu", UI::compulsory);                    
         //set_drv(rvtmp);
 }
-
-/*void stateDS::to_setting( Setting &set ) const
-{       
-        Transport::to_setting( set );
-
-        Setting &kilometers_setting = set.add("kilometers", Setting::TypeInt );
-        kilometers_setting = kilometers;
-
-        UI::save( passengers, set, "passengers" );
-}*/
-
-