From: Eduardo Davila Date: Wed, 22 Jul 2009 14:47:06 +0000 (+0000) Subject: no message X-Git-Tag: EED.02Oct2009~5 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=52a1f20d5f8d78cc829b536860ac3ed0e9c50bcd;p=creaContours.git no message --- diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx index 1597c26..6a30829 100644 --- a/lib/Interface_Icons_NDimensions/interfMainPanel.cxx +++ b/lib/Interface_Icons_NDimensions/interfMainPanel.cxx @@ -18,21 +18,23 @@ interfMainPanel::interfMainPanel(wxWindow * parent, int sizex, int sizey, wxEvtH : wxPanel(parent, -1, wxDefaultPosition, wxSize(sizex, sizey), wxBORDER_SUNKEN) { - PANEL = "New Contour"; - PANEL1 = "I/O"; - PANEL2 = "Edit"; - PANEL3 = "Delete"; - PANEL4 = "Tools"; - PANEL5 = "Segmentation"; - segmentPanel = NULL; - segmentPanelITK = NULL; - configPanel = NULL; - spreadPanel = NULL; - infoWin = NULL; - informationPanel = NULL; - mirrorPanel = NULL; - thresholdPanel = NULL; - currentWindow = NULL; + PANEL = "New Contour"; + PANEL1 = "I/O"; + PANEL2 = "Edit"; + PANEL3 = "Delete"; + PANEL4 = "Tools"; + PANEL5 = "Segmentation"; + segmentPanel = NULL; + segmentPanelITK = NULL; + configPanel = NULL; + spreadPanel = NULL; + infoWin = NULL; + infoPanel = NULL; + infoPanelMask = NULL; + informationPanel = NULL; + mirrorPanel = NULL; + thresholdPanel = NULL; + currentWindow = NULL; splitterwindow = new wxSplitterWindow(this,-1, wxDefaultPosition, wxSize(sizex, sizey), wxSP_3DSASH, wxString(_T(""))); @@ -489,25 +491,20 @@ void interfMainPanel::onInterpolation(bool interpolate) wxContourMainFrame::getInstance()->onInterpolation(interpolate); } -void interfMainPanel::onConfigurationPressed(){ +void interfMainPanel::onConfigurationPressed(){ if(configPanel == NULL){ configPanel = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T(""))); wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1); configPanel->SetSizer(flexsizer, true); configPanel->SetAutoLayout( true ); //configPanel->SetEventHandler(this->contourevent); - wxPanel* panel = new interfConfigurationPanel(configPanel); - wxStaticText* stattext = new wxStaticText(configPanel, -1, wxString(_T(" Interface Configuration ")), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T(""))); - flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE); - flexsizer->Add(panel, wxEXPAND); configPanel->Layout(); - } showPanel(configPanel); } @@ -556,6 +553,8 @@ void interfMainPanel::setStringSpread(std::string stringtemp){ } void interfMainPanel::onInformationPressed(){ + + // Statistics frame if(infoWin ==NULL){ infoWin = new wxFrame (this, -1,_T(" Statistics "), wxDefaultPosition, wxDefaultSize, wxFRAME_TOOL_WINDOW|wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN |wxFRAME_FLOAT_ON_PARENT | wxRESIZE_BORDER ); infoWin->SetSize( wxSize(825,650) ); @@ -569,9 +568,7 @@ void interfMainPanel::onInformationPressed(){ infoWin->SetSizer( sizerPanel ); infoWin->SetAutoLayout( true ); infoWin->Layout(); - infoWin->Show(); - }else { if (infoWin->IsShown()==true) @@ -582,6 +579,26 @@ void interfMainPanel::onInformationPressed(){ infoWin->Show(true); } } + + // mask view control panel + if(infoPanelMask == NULL){ + infoPanelMask = new wxPanel(interfMainPanel::getInstance()->getInfoPanel(), -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER, wxString(_T(""))); + wxFlexGridSizer* flexsizer = new wxFlexGridSizer(1); + infoPanelMask->SetSizer(flexsizer, true); + infoPanelMask->SetAutoLayout( true ); + //configPanel->SetEventHandler(this->contourevent); + wxPanel *panel = wxContourMainFrame::getInstance()->getThresholdImageViewPanel( infoPanelMask ); + wxStaticText* stattext = new wxStaticText(infoPanelMask, -1, wxString(_T(" Mask segmentation ")), wxDefaultPosition, + wxDefaultSize, wxALIGN_CENTRE|wxBORDER_SIMPLE|wxFULL_REPAINT_ON_RESIZE, wxString(_T(""))); + + flexsizer->Add(stattext,wxALIGN_CENTER | wxALIGN_CENTRE); + + flexsizer->Add(panel, wxEXPAND); + infoPanelMask->Layout(); + + } + showPanel(infoPanelMask); + wxContourMainFrame::getInstance()->changeInstant(); } void interfMainPanel::getInstantVector(std::vector& tempVector){ @@ -761,4 +778,7 @@ void interfMainPanel::ShowResultImages(int typeContourGroup, int selection, int wxContourMainFrame::getInstance()->ShowResultImages(typeContourGroup, selection, minZ, maxZ); } - +void interfMainPanel::SetContourGroup(int contourGroup) +{ + wxContourMainFrame::getInstance()->SetContourGroup( contourGroup); +} diff --git a/lib/Interface_Icons_NDimensions/interfMainPanel.h b/lib/Interface_Icons_NDimensions/interfMainPanel.h index 0e85143..a91c086 100644 --- a/lib/Interface_Icons_NDimensions/interfMainPanel.h +++ b/lib/Interface_Icons_NDimensions/interfMainPanel.h @@ -211,6 +211,8 @@ public: void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ); + void SetContourGroup(int contourGroup); + private: @@ -229,6 +231,7 @@ private: wxSplitterWindow* splitterwindow; wxPanel* infoPanel; + wxPanel* infoPanelMask; wxStaticText* statictext; wxStaticText* statictext1; @@ -258,6 +261,7 @@ private: wxPanel* thresholdPanel; interfThresholdPanel* panelThreshold; + bool axisshown; bool refLineShown; diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx index 5b2b1c2..a93ae0a 100644 --- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx +++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx @@ -189,15 +189,19 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent) lstOptions[0]=_T("Current Slice"); lstOptions[1]=_T("Range Slices"); // lstOptions[2]=_T("All Slices"); - _informationRadiobox = new wxRadioBox(this, -1, _T("Slice analysis"), wxDefaultPosition, wxSize(270,45), 2 , lstOptions, 2, wxRA_SPECIFY_COLS); + _informationRadiobox = new wxRadioBox(this, -1, _T("Slice analysis"), wxDefaultPosition, wxSize(270,45), 2 , lstOptions, 2, wxRA_SPECIFY_COLS); + wxString lstOptContOperation[5]; lstOptContOperation[0]=_T("AND"); lstOptContOperation[1]=_T("OR"); lstOptContOperation[2]=_T("XOR"); lstOptContOperation[3]=_T("ALL"); _radiolstboxContourGroup = new wxRadioBox(this, -1, _T("Contour group"), wxDefaultPosition, wxSize(270,45), 4 , lstOptContOperation, 4, wxRA_SPECIFY_COLS); - + _radiolstboxContourGroup->SetSelection(1); + Connect( _radiolstboxContourGroup->GetId(), wxEVT_COMMAND_RADIOBOX_SELECTED , (wxObjectEventFunction) &interfInformationPanel::onContourGroup ); + + _XYZValues = new wxCheckBox(this, -1, _T("Save Contour Values") ); _XYZValues->SetValue(true); @@ -440,3 +444,14 @@ wxString interfInformationPanel::getCellValue(int j,int i){ return _grid->GetCellValue( j , i ); } +void interfInformationPanel::onContourGroup(wxCommandEvent& event) +{ + printf("EED interfInformationPanel::onContourGroup \n"); + int contourGroup=_radiolstboxContourGroup->GetSelection(); + if (contourGroup==3) + { + contourGroup=0; + } + interfMainPanel::getInstance()->SetContourGroup( _radiolstboxContourGroup->GetSelection() ); +} + diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.h b/lib/Interface_Icons_NDimensions/interfToolsPanels.h index fb21b95..093349e 100644 --- a/lib/Interface_Icons_NDimensions/interfToolsPanels.h +++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.h @@ -23,6 +23,7 @@ private: void OnInterpolation(wxCommandEvent& event); + wxSlider* _withOfContourLine; wxSlider* _brithtnessWindowLevel; wxSlider* _brithtnessColorLevel; @@ -83,6 +84,8 @@ private: void onExtractInformation(wxCommandEvent& event); void onShowResultImages(wxCommandEvent& event); void onSaveResults(wxCommandEvent& event); + void onContourGroup(wxCommandEvent& event); + void FillGridWithContoursInformation(); diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index aef8ba2..c6293c3 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -15,6 +15,8 @@ #include "ConceptDataWrap.h" #include + + //---------------------------------------------------------------------------------------------------------------- // Class implementation //---------------------------------------------------------------------------------------------------------------- @@ -33,6 +35,7 @@ char wxContourMainFrame::COPY = 'C'; : wxPanel(parent, id, pos, size, style) { m_mgr.SetManagedWindow(this); + _contourGroup = 1; _creatingContoursActive = false; _theViewPanel = NULL; // _modelManager = NULL; @@ -64,12 +67,15 @@ char wxContourMainFrame::COPY = 'C'; //wxContour_ActionCommandsID a; _contourextractdata = NULL; + _viewMaskImage = NULL; + _viewMaskImagePanel = NULL; } wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style,std::string datadir) : wxPanel(parent, id, pos, size, style) { m_mgr.SetManagedWindow(this); + _contourGroup = 1; _creatingContoursActive = false; _theViewPanel = NULL; @@ -82,6 +88,8 @@ char wxContourMainFrame::COPY = 'C'; _thresholdMapper = NULL; _thresholdActor = NULL; _actorPresent = false; + _viewMaskImage = NULL; + _viewMaskImagePanel = NULL; // set up default notebook style m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER; @@ -637,6 +645,19 @@ void wxContourMainFrame::changeInstant() kernelManager->setInstant(instantVect); //_modelManager->setInstant( _actualInstant ); + + if(_viewMaskImage!=NULL){ + int actualSlice = instantVect[1]; + _viewMaskImage->SetZ(actualSlice); + + if (_viewMaskImagePanel->IsVisible()==true) + { + vtkImageData *mask, *value; + getMaskValue(&mask,&value, _contourGroup , 0, -1, -1); + _viewMaskImage->onThreshold(); + } + } + onThresholdChange(); updateInstantOutlines(); updateInstantImageData(); @@ -2368,15 +2389,10 @@ std::vector wxContourMainFrame::getOutlinesName(int slide){ } -void wxContourMainFrame::GenerateContourExtractData() -{ - if (_contourextractdata==NULL) { _contourextractdata = new ContourExtractData(true); } -} - void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ,int grayRangeMin, int grayRangeMax) { - GenerateContourExtractData(); +//EED01Juillet2009 GenerateContourExtractData(); wxString tempString; int maxContourGroup = 0; @@ -2401,7 +2417,7 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel std::vector tempVector; _instantPanel->getInstant( tempVector ); - vtkImageData *imagedata = _theViewPanel->getImageData(); +//EED01Juillet2009 vtkImageData *imagedata = _theViewPanel->getImageData(); // int sizeZ = _theViewPanel->GetImageDataSizeZ(); int z; int ii,sizeLstContourThings; @@ -2412,7 +2428,6 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel double porcent; wxString tmpString; -//????? if (selection==0 ) // actual slice { @@ -2426,7 +2441,7 @@ void wxContourMainFrame::onInformationContourLabels(int typeContourGroup,int sel totalZ = maxZ-minZ+1; - _contourextractdata->SetImage( imagedata); +//EED01Juillet2009 _contourextractdata->SetImage( imagedata); _contourextractdata->InitVolumeStatistics(); @@ -2640,7 +2655,6 @@ void wxContourMainFrame::onSaveResults(std::string directory,std::string namefil fprintf(pFile,"\n\n" ); -// ?????? if (selection==0 ) // actual slice { @@ -2682,7 +2696,7 @@ void wxContourMainFrame::onSaveResults(std::string directory,std::string namefil void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefile,int typeContourGroup) { wxBusyCursor wait; - GenerateContourExtractData(); +//EED01Juillet2009 GenerateContourExtractData(); //int typeContourGroup = this->_radiolstboxContourGroup->GetSelection(); _contourextractdata ->SetTypeOperation( typeContourGroup % 3 ); @@ -2698,7 +2712,7 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil std::vector tempVector; _instantPanel->getInstant( tempVector ); - vtkImageData *imagedata = _theViewPanel->getSceneManager()->GetImageData(); +//EED01Juillet2009 vtkImageData *imagedata = _theViewPanel->getSceneManager()->GetImageData(); int sizeZ = _theViewPanel->getSceneManager()->GetImageDataSizeZ(); int z; int ii,sizeLstContourThings; @@ -2712,7 +2726,7 @@ void wxContourMainFrame::SaveValuesXYZ(std::string directory,std::string namefil maxZ = sizeZ;//_mbarrange->GetEnd(); totalZ = maxZ-minZ+1; - _contourextractdata->SetImage( imagedata); +//EED01Juillet2009 _contourextractdata->SetImage( imagedata); // For each slice.. for ( z=0 ; z_radiolstboxContourGroup->GetSelection(); if (typeContourGroup==3) @@ -2824,7 +2838,10 @@ void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value std::vector tempVector; _instantPanel->getInstant( tempVector ); - vtkImageData *imagedata = _theViewPanel->getImageData(); + vtkImageData *imagedata = _theViewPanel->getImageData(); + int ext[6]; + imagedata->GetExtent(ext); + int sizeZimage = ext[5]-ext[4]+1; int z; int ii,sizeLstContourThings; @@ -2844,8 +2861,18 @@ void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value totalZ = maxZ-minZ; - _contourextractdata->SetImage( imagedata); +//EED01Juillet2009 _contourextractdata->SetImage( imagedata); + // cleanning image before range + for (z=0; zResetImageResult(z); + } + // cleanning image after range + for (z=maxZ+1; zResetImageResult(z); + } + + // For each slice.. for ( z=minZ ; z<=maxZ ; z++) { @@ -2994,3 +3021,49 @@ void wxContourMainFrame::ShowToolsPanel(bool show){ _pannew->Show(show); } + +//EED01Juillet2009 +/* +void wxContourMainFrame::GenerateContourExtractData() +{ + if (_contourextractdata==NULL) { } +} +*/ + + +wxPanel *wxContourMainFrame::getThresholdImageViewPanel(wxWindow *parent) +{ + + if (_viewMaskImagePanel==NULL) + { + _contourextractdata = new ContourExtractData(true); + _contourextractdata->SetImage( _theViewPanel->getImageData() ); + + double range[2]; + _theViewPanel->getImageData()->GetScalarRange(range); + //int min = (int)floor (range[0]); + //int max = (int)ceil (range[1]); + int min = 0; + int max = 255; + + _viewMaskImagePanel = new ThresholdImageViewPanel( parent, min, max , 0); + _viewMaskImage = new ThresholdImageView(); + _viewMaskImage->SetImage(_contourextractdata->GetVtkImageMaskResult() ); + _viewMaskImage->SetminMaxValue( 254, 256); + _viewMaskImage->SetBaseColor( 0,0,1 ); + _viewMaskImagePanel->SetThresholdImageView( _viewMaskImage ); + _viewMaskImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() ); + + } + return _viewMaskImagePanel; +} + +void wxContourMainFrame::SetContourGroup(int contourGroup) +{ + printf("EED wxContourMainFrame::SetContourGroup \n"); + _contourGroup = contourGroup; +} + + + + diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index 1e464e9..4c148e6 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -36,6 +36,10 @@ #include "manualContourModelLine.h" #include "manualViewLine.h" +#include "ThresholdImageView.h" +#include "ThresholdImageViewPanel.h" + + //#include "ContourThing.h" //#include "AxeThing.h" //#include "ImageSourceThing.h" @@ -310,7 +314,11 @@ class wxContourMainFrame : public wxPanel { void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ ); + wxPanel *getThresholdImageViewPanel(wxWindow *parent); + void SetContourGroup(int contourGroup); + + private: //------------------------------------------------------------------------------------------------------------ // Private methods @@ -321,6 +329,8 @@ private: // Attributtes //------------------------------------------------------------------------------------------------------------ + int _contourGroup; + static wxContourMainFrame* instance; KernelManagerContour* kernelManager; @@ -349,15 +359,24 @@ private: long m_notebook_theme; int _numberOfVariablesStatistics; - vtkImageReslice * _imageReslicer; - vtkLookupTable * _thresholdTable; + vtkImageReslice * _imageReslicer; + vtkLookupTable * _thresholdTable; vtkImageMapToColors * _thresholdMapper; - vtkImageActor * _thresholdActor; + vtkImageActor * _thresholdActor; + + ThresholdImageView *_viewMaskImage; + ThresholdImageViewPanel *_viewMaskImagePanel; + + + std::vector _images; bool _actorPresent; + + + //OutlineModelManager * _modelManager; @@ -397,7 +416,8 @@ private: ContourExtractData *_contourextractdata; - void GenerateContourExtractData(); +//EED void GenerateContourExtractData(); + void saveState(); void loadState(std::string filename); void loadContours( FILE *pFile, bool staticContour ); diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002 b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002 index 31932cd..37c5699 100644 --- a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002 +++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002 @@ -1,6 +1,6 @@ format 66 "GeneralArchitecture" // GeneralArchitecture - revision 6 + revision 7 modified_by 2 "davila" // class settings //class diagram settings diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002.diagram b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002.diagram index cc42138..72dfe02 100644 --- a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002.diagram +++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/128002.diagram @@ -24,7 +24,7 @@ classcanvas 129026 class_ref 128514 // KernelManagerContour end classcanvas 129282 class_ref 128642 // interfMainPanel draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 284 859 2000 + xyz 287 850 2000 end classcanvas 129666 class_ref 128770 // PerformingOperation draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default @@ -85,7 +85,7 @@ end classcanvas 136194 class_ref 128258 // wxPanel draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default color lightorange - xyz 522 793 2000 + xyz 466 887 2000 end note 136450 "segmentPanel segmentationPanel @@ -102,39 +102,39 @@ menubar3 menubar4 menubar5 " - xyzwh 649 725 2000 144 230 + xyzwh 582 924 2000 144 230 classcanvas 136706 class_ref 131458 // interfSpreadPanel draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 23 774 2000 + xyz 24 770 2000 end classcanvas 136962 class_ref 131586 // interfMirrorPanel draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 21 817 2000 + xyz 24 817 2000 end classcanvas 137346 class_ref 131714 // interfThresholdPanel draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 21 861 2005 + xyz 22 863 2005 end classcanvas 137986 class_ref 131842 // wxWindow draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default color lightorange - xyz 445 1023 2005 + xyz 499 1061 2005 end note 138242 "currentWindow infoWin" - xyzwh 538 1008 2000 118 52 + xyzwh 413 1116 2000 118 52 classcanvas 138498 class_ref 131970 // wxSplitterWindow draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default color lightorange - xyz 498 863 2000 + xyz 520 835 2000 end classcanvas 138754 class_ref 132098 // interfToolsSpreadPanel draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 19 904 2000 + xyz 20 912 2000 end note 139010 "-Buttons -Options" - xyzwh 542 925 2000 79 50 + xyzwh 648 764 2000 79 50 classcanvas 139394 class_ref 132226 // vtkImageData draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default color mediumblue @@ -146,36 +146,36 @@ classcanvas 140290 class_ref 132354 // wxVtkBaseView_SceneManager end classcanvas 140930 class_ref 132482 // wxMaracas_N_ViewersWidget draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 101 705 2007 + xyz 95 691 2007 end classcanvas 141314 class_ref 132610 // interfInformationPanel draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 443 699 2000 + xyz 417 702 2000 end note 141570 "interToolsPanel (cxx/h)" xyzwh 612 654 2000 163 39 classcanvas 142978 class_ref 133890 // interfNewContourMenu draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 42 1084 2000 + xyz 33 1125 2000 end classcanvas 143106 class_ref 134018 // interfIOMenu draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 310 1040 2000 + xyz 301 1081 2000 end classcanvas 143234 class_ref 134146 // interfEditMenu draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 182 1043 2000 + xyz 173 1084 2000 end classcanvas 143362 class_ref 134274 // interfDeleteMenu draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 45 1014 2000 + xyz 36 1055 2000 end classcanvas 143490 class_ref 134402 // interfSegmentationMenu draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default - xyz 205 1083 2000 + xyz 196 1124 2000 end fragment 144258 "buttons" - color lightred xyzwh 35 989 1995 376 143 + color lightred xyzwh 26 1030 1995 376 143 end relationcanvas 128258 relation_ref 128002 // from ref 128002 z 2001 to ref 128130 @@ -199,7 +199,7 @@ relationcanvas 129154 relation_ref 128514 // kernelManager no_multiplicity_a no_multiplicity_b end relationcanvas 129410 relation_ref 128642 // _pannew - from ref 128130 z 2001 label "_pannew" italic xyz 314 584 2001 to ref 129282 + from ref 128130 z 2001 label "_pannew" italic xyz 315 579 2001 to ref 129282 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -280,17 +280,17 @@ relationcanvas 136322 relation_ref 132994 // no_multiplicity_a no_multiplicity_b end relationcanvas 136834 relation_ref 133122 // panelSpread - from ref 129282 z 2001 label "panelSpread" italic xyz 176 821 2001 to ref 136706 + from ref 129282 z 2001 label "panelSpread" italic xyz 194 812 2001 to ref 136706 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 137090 relation_ref 133250 // panelMirror - from ref 129282 z 2001 label "panelMirror" italic xyz 176 841 2001 to ref 136962 + from ref 129282 z 2001 label "panelMirror" italic xyz 184 834 2001 to ref 136962 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 137474 relation_ref 133378 // panelThreshold - from ref 129282 z 2006 label "panelThreshold" italic xyz 162 873 2006 to ref 137346 + from ref 129282 z 2006 label "panelThreshold" italic xyz 179 860 2006 to ref 137346 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -301,12 +301,13 @@ relationcanvas 138114 relation_ref 133506 // no_multiplicity_a no_multiplicity_b end relationcanvas 138626 relation_ref 133634 // splitterwindow - from ref 129282 z 2001 label "splitterwindow" italic xyz 402 864 2001 to ref 138498 + decenter_begin 230 + from ref 129282 z 2001 label "splitterwindow" italic xyz 417 846 2001 to ref 138498 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 138882 relation_ref 133762 // toolspread - from ref 129282 z 2001 label "toolspread" italic xyz 183 905 2001 to ref 138754 + from ref 129282 z 2001 label "toolspread" italic xyz 186 886 2001 to ref 138754 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -321,7 +322,7 @@ relationcanvas 140546 relation_ref 134146 // _sceneManager no_multiplicity_a no_multiplicity_b end relationcanvas 141058 relation_ref 134274 // theViewPanel - from ref 129922 z 2008 label "theViewPanel" italic xyz 182 666 2008 to ref 140930 + from ref 129922 z 2008 label "theViewPanel" italic xyz 179 659 2008 to ref 140930 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -331,18 +332,19 @@ relationcanvas 141186 relation_ref 134018 // _theViewPanel no_multiplicity_a no_multiplicity_b end relationcanvas 141442 relation_ref 134402 // informatonPanel - from ref 129282 z 2001 label "informatonPanel" italic xyz 378 783 2001 to ref 141314 + from ref 129282 z 2001 label "informatonPanel" italic xyz 367 780 2001 to ref 141314 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 142338 relation_ref 134786 // decenter_end 695 - from ref 141314 z 2001 to point 492 816 + from ref 141314 z 2001 to point 488 814 line 142466 z 2001 to ref 129282 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 142594 relation_ref 134914 // + decenter_begin 638 from ref 129282 z 2001 to point 384 735 line 142850 z 2001 to point 375 424 line 142722 z 2001 to ref 128130 @@ -350,11 +352,13 @@ relationcanvas 142594 relation_ref 134914 // no_multiplicity_a no_multiplicity_b end relationcanvas 143618 relation_ref 136066 // + decenter_begin 295 from ref 129282 z 2001 to ref 142978 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 143746 relation_ref 136194 // + decenter_begin 95 from ref 129282 z 2001 to ref 143362 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -365,11 +369,13 @@ relationcanvas 143874 relation_ref 136322 // no_multiplicity_a no_multiplicity_b end relationcanvas 144002 relation_ref 136450 // + decenter_begin 380 from ref 129282 z 2001 to ref 143234 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 144130 relation_ref 136578 // + decenter_begin 457 from ref 129282 z 2001 to ref 143490 no_role_a no_role_b no_multiplicity_a no_multiplicity_b diff --git a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/2.session b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/2.session index 89cddb2..44d099e 100644 --- a/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/2.session +++ b/lib/doxygen/bouml/GeneralArchitecture/GeneralArchitecture/2.session @@ -1,7 +1,7 @@ -window_sizes 1070 859 329 735 732 70 +window_sizes 1024 1258 266 752 1131 70 diagrams active classdiagram_ref 128002 // GeneralArchitecture - 731 712 100 4 420 11 + 748 1111 100 4 123 0 sequencediagram_ref 129154 // Sequence diagram btnStatistics 664 712 100 4 0 7 sequencediagram_ref 129282 // Sequnce diagram btnSave @@ -10,7 +10,7 @@ diagrams 990 709 100 4 0 0 end show_stereotypes -selected classdiagram_ref 128002 // GeneralArchitecture +selected sequencediagram_ref 129154 // Sequence diagram btnStatistics open classview_ref 128002 // GeneralArchitecture end