Changeset 685 for applications/bdmtoolbox/mex/merger.cpp

Timestamp:

10/29/09 23:23:56 (16 years ago)

Author:

smidl

Message:

mex tutorial cleanup + working mexDS

Files:

• applications/bdmtoolbox/mex/merger.cpp (modified) (1 diff)

applications/bdmtoolbox/mex/merger.cpp

@@ -58 +58 @@
 #endif
         // Sources
-        Array<shared_ptr<mpdf> > Sources;
-        //abuse Mer to store sources
-        Setting& _Sources = Cfg.lookup ( "Sources" );
-        int Slen = _Sources.getLength();
-        Sources.set_size ( Slen );
-        for ( int i = 0; i < Slen; i++ ) {
-                try {
-                        shared_ptr<mpdf> mtmp = UI::build<mpdf> ( _Sources, i );
-                        Sources ( i ) = mtmp;
-                } catch ( UIException ) {
-                        // it is not mpdf - see if it is epdf
-                        try {
-                                shared_ptr<epdf> etmp = UI::build<epdf> ( _Sources, i );
-                                if ( etmp ) {
-                                        Sources ( i ) = new mepdf ( etmp ); // hopefully OK
-                                }
-                        } catch ( UIException &e ) {
-                                it_error ( "No mpdfs or epdfs found! " + string ( e.what() ) );
-                        } catch ( std::exception e ) {
-                                it_error ( "Error in UI at " + _Sources[i].getPath() );
-                        }
-                } catch ( std::exception &e ) {
-                        it_error ( "Error in UI at " + _Sources[i].getPath() );
-                }
-        }
-
+        Array<shared_ptr<mpdf> >  Sources;
+        UI::get(Sources, Cfg, "Sources", UI::compulsory);
         shared_ptr<merger_base> Merger = UI::build<merger_base> ( Cfg, "Merger" );
 
         // Support
-        try {
-                shared_ptr<rectangular_support> RecSup = UI::build<rectangular_support> ( Cfg, "Support" );
+        try{
+        shared_ptr<rectangular_support> RecSup = UI::build<rectangular_support> ( Cfg, "Support" ,UI::optional);
+        if(RecSup){
                 Merger->set_support ( *RecSup );
-        } catch ( UIException &e ) {
-                shared_ptr<discrete_support> DisSup = UI::build<discrete_support> ( Cfg, "Support" );
-                Merger->set_support ( *DisSup );
+        } 
+        } catch (UIException &e) {
+                shared_ptr<discrete_support> DisSup = UI::build<discrete_support> ( Cfg, "Support", UI::optional );
+                if (DisSup){
+                        Merger->set_support ( *DisSup );
+                } else{bdm_error("Support not defined");}
         }
 // COMPUTE RESULTS