From: jean-pierre roux Date: Wed, 28 Apr 2010 22:19:59 +0000 (+0000) Subject: re indent X-Git-Tag: CREATOOLS.2-0-3~46 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e5759b9960326cfbe5f585fd296a355706f5fd01;p=bbtk.git re indent --- diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index 7ddf177..f118bef 100644 --- a/kernel/src/bbtkFactory.cxx +++ b/kernel/src/bbtkFactory.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkFactory.cxx,v $ Language: C++ - Date: $Date: 2010/01/21 16:03:17 $ - Version: $Revision: 1.47 $ + Date: $Date: 2010/04/28 22:19:59 $ + Version: $Revision: 1.48 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -833,7 +833,6 @@ namespace bbtk void Factory::ShowGraphTypes(const std::string& name) const { - bool found = false; PackageMapType::const_iterator i; for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i ) @@ -888,7 +887,7 @@ namespace bbtk std::string title; typedef std::map > IndexType; + std::vector > IndexType; IndexType index; // Builds the index map PackageMapType::const_iterator i; @@ -938,7 +937,6 @@ namespace bbtk title = "Boxes by category"; } - std::vector::const_iterator k; for (k=keys.begin(); k!=keys.end(); ++k ) { @@ -955,7 +953,6 @@ namespace bbtk index[*k] = v; } } - } } // Creates the file diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.cxx b/kernel/src/bbtkWxGUIPackageBrowser2.cxx index f80ec6f..d9ba9d7 100644 --- a/kernel/src/bbtkWxGUIPackageBrowser2.cxx +++ b/kernel/src/bbtkWxGUIPackageBrowser2.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIPackageBrowser2.cxx,v $ Language: C++ - Date: $Date: 2010/04/13 14:20:30 $ - Version: $Revision: 1.19 $ + Date: $Date: 2010/04/28 22:19:59 $ + Version: $Revision: 1.20 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -64,7 +64,6 @@ namespace bbtk { - BEGIN_EVENT_TABLE(WxGUIBlackBoxList, wxListCtrl) EVT_LIST_BEGIN_DRAG(LIST_CTRL, WxGUIBlackBoxList::OnBeginDrag) EVT_LIST_BEGIN_RDRAG(LIST_CTRL, WxGUIBlackBoxList::OnBeginRDrag) @@ -270,8 +269,7 @@ namespace bbtk wxTextDataObject tdo(wxT(sendtext)); wxDropSource tds(tdo, this); tds.DoDragDrop(); - - + // const wxPoint& pt = event.m_pointDrag; @@ -515,15 +513,15 @@ namespace bbtk wxString where; switch ( flags ) { - case wxLIST_HITTEST_ABOVE: where = _T("above"); break; - case wxLIST_HITTEST_BELOW: where = _T("below"); break; - case wxLIST_HITTEST_NOWHERE: where = _T("nowhere near"); break; - case wxLIST_HITTEST_ONITEMICON: where = _T("on icon of"); break; - case wxLIST_HITTEST_ONITEMLABEL: where = _T("on label of"); break; - case wxLIST_HITTEST_ONITEMRIGHT: where = _T("right on"); break; - case wxLIST_HITTEST_TOLEFT: where = _T("to the left of"); break; - case wxLIST_HITTEST_TORIGHT: where = _T("to the right of"); break; - default: where = _T("not clear exactly where on"); break; + case wxLIST_HITTEST_ABOVE: where = _T("above"); break; + case wxLIST_HITTEST_BELOW: where = _T("below"); break; + case wxLIST_HITTEST_NOWHERE: where = _T("nowhere near"); break; + case wxLIST_HITTEST_ONITEMICON: where = _T("on icon of"); break; + case wxLIST_HITTEST_ONITEMLABEL: where = _T("on label of"); break; + case wxLIST_HITTEST_ONITEMRIGHT: where = _T("right on"); break; + case wxLIST_HITTEST_TOLEFT: where = _T("to the left of"); break; + case wxLIST_HITTEST_TORIGHT: where = _T("to the right of"); break; + default: where = _T("not clear exactly where on"); break; } //wxLogMessage(_T("Right double click %s item %ld, subitem %ld"), @@ -615,7 +613,6 @@ namespace bbtk mCategory = new wxStaticText(this,-1,_T("")); sizer->Add(mCategory,0,wxGROW); - wxBoxSizer *inputs = new wxStaticBoxSizer ( new wxStaticBox(this, wxID_ANY, _T("Inputs")), wxVERTICAL ); @@ -624,8 +621,7 @@ namespace bbtk wxDefaultSize, wxLC_REPORT //wxLC_LIST | wxSUNKEN_BORDER); - - + inputs->Add(mInputList,1,wxGROW); sizer->Add(inputs,1,wxGROW); @@ -640,8 +636,7 @@ namespace bbtk outputs->Add(mOutputList,1,wxGROW); sizer->Add(outputs,1,wxGROW); - - + SetSizer(sizer); SetAutoLayout(true); Layout(); @@ -802,7 +797,6 @@ namespace bbtk id_fc3 }; - //================================================================ WxGUIPackageBrowser2::WxGUIPackageBrowser2( wxWindow *parent, WxGUIPackageBrowser2User* user ) @@ -842,7 +836,6 @@ namespace bbtk .Bottom() .MinSize(wxSize(100,300)) ); - wxPanel* filters = new wxPanel(this,-1); wxBoxSizer *fsizer = new wxBoxSizer(wxVERTICAL ); @@ -919,7 +912,6 @@ namespace bbtk foutnat->Add(mOutputNatureFilter,1,wxGROW); fsizer->Add(foutnat,0,wxGROW); - mShowWidgetsFilter = new wxCheckBox(filters,id_fc1,_T("Show widgets")); mShowWidgetsFilter->SetValue(true); fsizer->Add(mShowWidgetsFilter,0,wxGROW); @@ -942,8 +934,6 @@ namespace bbtk .Right() .MinSize(wxSize(100,100)) ); - - // sizer->Add(fsizer,1,wxGROW); m_mgr.Update(); @@ -983,7 +973,6 @@ namespace bbtk return _actualSelected; } - //================================================================ //================================================================ @@ -1153,7 +1142,6 @@ namespace bbtk } if (!found) return false; } - return true; } //======================================================================== @@ -1168,9 +1156,9 @@ namespace bbtk EVT_TEXT_ENTER(id_f6, WxGUIPackageBrowser2::OnFilter ) EVT_TEXT_ENTER(id_f7, WxGUIPackageBrowser2::OnFilter ) EVT_TEXT_ENTER(id_f8, WxGUIPackageBrowser2::OnFilter ) - EVT_CHECKBOX( id_fc1, WxGUIPackageBrowser2::OnFilter ) - EVT_CHECKBOX( id_fc2, WxGUIPackageBrowser2::OnFilter ) - EVT_CHECKBOX( id_fc3, WxGUIPackageBrowser2::OnFilter ) + EVT_CHECKBOX( id_fc1, WxGUIPackageBrowser2::OnFilter ) + EVT_CHECKBOX( id_fc2, WxGUIPackageBrowser2::OnFilter ) + EVT_CHECKBOX( id_fc3, WxGUIPackageBrowser2::OnFilter ) END_EVENT_TABLE() //======================================================================== @@ -1178,12 +1166,10 @@ namespace bbtk //================================================================ WxGUIPackageBrowser2Window::WxGUIPackageBrowser2Window( wxWindow *parent, - wxString title, - wxSize size) + wxString title, + wxSize size) : wxFrame((wxFrame *)parent, -1, title, wxDefaultPosition, size) - { - - + { wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); mBrowser = new WxGUIPackageBrowser2(this); diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index 381961c..621fa5d 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $ Language: C++ - Date: $Date: 2010/03/30 07:33:43 $ - Version: $Revision: 1.43 $ + Date: $Date: 2010/04/28 22:19:59 $ + Version: $Revision: 1.44 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -110,13 +110,13 @@ namespace bbtk menuAbout->Append( ID_Menu_About, _T("&About...") ); wxMenu *menuTools = new wxMenu; - menuTools->Append( ID_Menu_CreatePackage, _T("Create &package") ); + menuTools->Append( ID_Menu_CreatePackage, _T("Create &package") ); menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &black box") ); - menuTools->Append( ID_Menu_PlugPackage, _T("&Plug package") ); + menuTools->Append( ID_Menu_PlugPackage, _T("&Plug package") ); menuTools->AppendSeparator(); menuTools->Append( ID_Menu_RegeneratePackageDoc,_T("Regenerate package &doc") ); menuTools->Append( ID_Menu_RegenerateBoxesLists,_T("Regenerate boxes &lists") ); - menuTools->Append( ID_Menu_RegenerateAll,_T("Regenerate &all") ); + menuTools->Append( ID_Menu_RegenerateAll, _T("Regenerate &all") ); menuTools->AppendSeparator(); menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last graph") ); @@ -281,8 +281,7 @@ namespace bbtk style, 1000, 0, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxSTAY_ON_TOP); - - + if (ConfigurationFile::GetInstance().DotBbtkIsNew()) { @@ -573,7 +572,6 @@ namespace bbtk command = "include toolsbbtk/appli/GUICreatePackage"; bbtkMessage("Debug",1,"Executing : '"<SendCommand(command); - } //================================================================ @@ -606,8 +604,7 @@ namespace bbtk doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator(); std::string pack_name("User"); - std::string pack_path = doc_path + pack_name; - + std::string pack_path = doc_path + pack_name; #if defined(WIN32) std::string strappli="start "; @@ -617,8 +614,7 @@ namespace bbtk #else std::string strappli="gnome-open "; #endif -#endif - +#endif std::string strcommand = strappli +pack_path+"/workspace_workspacePrototype.png"; // std::cout << "system: " << strcommand << std::endl; system ( strcommand.c_str() ); @@ -669,9 +665,6 @@ namespace bbtk err += bbtk::std2wx(command) + _T("'"); wxMessageBox(err,_T("Regenerate package doc"),wxOK | wxICON_ERROR); } - - - } @@ -708,6 +701,7 @@ namespace bbtk command += " -q"; bbtkMessage("debug",1,"Executing system command '"<> pname; f.close(); - bbtk::ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path ); DoRegeneratePackageDoc(pname); DoRegenerateBoxesLists(); - - } + } } //================================================================ @@ -813,9 +805,9 @@ namespace bbtk { size_t s = target.length(); if ((s>3) && (target[s-1]=='s') - && (target[s-2]=='b') - && (target[s-3]=='b') - && (target[s-4]=='.')) + && (target[s-2]=='b') + && (target[s-3]=='b') + && (target[s-4]=='.')) { mWxGUITextEditor->Open(target); #if NOTEBOOK @@ -826,9 +818,9 @@ namespace bbtk } if ((s>3) && (target[s-1]=='f') - && (target[s-2]=='d') - && (target[s-3]=='p') - && (target[s-4]=='.')) + && (target[s-2]=='d') + && (target[s-3]=='p') + && (target[s-4]=='.')) { // Open pdf in linux @@ -873,7 +865,6 @@ namespace bbtk } } - //================================================================ void WxGUIScriptingInterface::OnMenuWindowsFiles(wxCommandEvent& event) { diff --git a/packages/demo/bbs/appli/demoPlane3Pts.bbs b/packages/demo/bbs/appli/demoPlane3Pts.bbs index 086d812..6ad8ac6 100644 --- a/packages/demo/bbs/appli/demoPlane3Pts.bbs +++ b/packages/demo/bbs/appli/demoPlane3Pts.bbs @@ -46,17 +46,18 @@ new CommandButton execplanes #connect execplanes.BoxChange viewer.BoxExecute new LayoutLine layoutline0 -connect showpoints.Widget layoutline0.Widget1 -connect execplanes.Widget layoutline0.Widget2 + connect showpoints.Widget layoutline0.Widget1 + connect execplanes.Widget layoutline0.Widget2 new LayoutLine layoutline1 -connect viewernv.Widget layoutline1.Widget1 + connect viewernv.Widget layoutline1.Widget1 new LayoutSplit mainSplit -set mainSplit.Orientation H -set mainSplit.Proportion 30 -connect layoutline0.Widget mainSplit.Widget1 -connect layoutline1.Widget mainSplit.Widget2 + set mainSplit.WinWidth 1500 + set mainSplit.Orientation H + set mainSplit.Proportion 15 + connect layoutline0.Widget mainSplit.Widget1 + connect layoutline1.Widget mainSplit.Widget2 exec mainSplit diff --git a/packages/vtk/src/bbvtkConcatImages.h b/packages/vtk/src/bbvtkConcatImages.h index 6c3d7da..3cd5797 100644 --- a/packages/vtk/src/bbvtkConcatImages.h +++ b/packages/vtk/src/bbvtkConcatImages.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkConcatImages.h,v $ Language: C++ - Date: $Date: 2010/04/08 14:39:46 $ - Version: $Revision: 1.1 $ + Date: $Date: 2010/04/28 22:20:02 $ + Version: $Revision: 1.2 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -63,7 +63,11 @@ namespace bbvtk BBTK_DECLARE_OUTPUT(Out, vtkImageData*); BBTK_PROCESS(Process); void Process(); + private : + bool CheckConsistency(vtkImageData *firstImage, int dim[], int nbComponents, int scalarType); protected: + + // Attributes : private: vtkImageData *mConcat; };