#3185 creaImageIO Feature New Normal - Clean code

[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 56a4f55aa1a8aff907fdef8160ff5f84583ccda8..ef9ee5c956af0a4a31b86f6e2c2a28850e56caff 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -204,8 +204,8 @@ namespace creaImageIO
     /// \TODO fix warning: unused variable hsize
     int hsize = size.GetHeight();
 
-    int top_minsize = 450;
-    int bottom_minsize = 50;
+    int top_minsize    = 450;
+    int bottom_minsize         = 50;
 
     mSplitter->SetMinimumPaneSize( bottom_minsize );
     mSplitter->SplitHorizontally( mNotebook, mBottomPanel, 
@@ -358,7 +358,7 @@ namespace creaImageIO
                                        bool mult, const std::string out_model)
   {
        // First we select the files
-        std::vector<std::string> files;
+   std::vector<std::string> files;
        std::string db_name = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
        GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
 
@@ -369,6 +369,7 @@ namespace creaImageIO
        mGimmick->GetSetting(SETTINGS_OUTPUT_ASK, asking);
        mGimmick->GetSetting(SETTINGS_OUTPUT_DIM, dim);
 
+
        if (asking == "true")
        {
                // display the output dialog box
@@ -381,37 +382,35 @@ namespace creaImageIO
                        dim = dlg->getDim();
                        mGimmick->UpdateSetting(SETTINGS_OUTPUT_ASK, dlg->getAsking());
                        mGimmick->UpdateSetting(SETTINGS_OUTPUT_DIM, dim);
-               }
-               else
-               {
+               } else {
                        return;
                } 
-       }
-       else
-       {
+       } else {
        }
        sscanf(dim.c_str(),"%d",&i_dim_out);
 
-
        // Next we create the structure for dicom output infos
        OutputAttr Oattr;
+//EED 01/09/2014
+          if (i_dim_out==2)
+               {
+                       Oattr.mult=true;
+               } // i_dim_out
+
+
        Oattr.db = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
        if(i_attr.empty())
        {
                // We don't send informations!
-       }
-       else if( i_attr.size() == 1 && i_attr.front() == "ALL")
+       } else if( i_attr.size() == 1 && i_attr.front() == "ALL")
        {
                // we send all database
                Oattr.inside.push_back("ALL");
-       }
-       else if( (i_attr.size() == 1 && i_attr.front() != "ALL") 
+       } else if( (i_attr.size() == 1 && i_attr.front() != "ALL") 
                || (i_attr.size() >1) )
        {
                mGimmick->fillVectInfos(i_attr, Oattr);
-       }
-       else
-       {
+       } else {
                // nothing
        }
 
@@ -1176,9 +1175,9 @@ namespace creaImageIO
   //========================================================================
   void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector<std::string> names, std::vector<std::string> keys)
   {
-    wxDialog* dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
-    wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL);
-    WxEditFieldsPanel* ef = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
+    wxDialog           *dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
+    wxBoxSizer         *siz = new wxBoxSizer(wxVERTICAL);
+    WxEditFieldsPanel  *ef  = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
 
     siz->Add( ef,1,wxGROW  ,0); 
     dial->SetSizer(siz);