: 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("")));
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);
}
}
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) );
infoWin->SetSizer( sizerPanel );
infoWin->SetAutoLayout( true );
infoWin->Layout();
-
infoWin->Show();
-
}else {
if (infoWin->IsShown()==true)
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<int>& tempVector){
wxContourMainFrame::getInstance()->ShowResultImages(typeContourGroup, selection, minZ, maxZ);
}
-
+void interfMainPanel::SetContourGroup(int contourGroup)
+{
+ wxContourMainFrame::getInstance()->SetContourGroup( contourGroup);
+}
void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ);
+ void SetContourGroup(int contourGroup);
+
private:
wxSplitterWindow* splitterwindow;
wxPanel* infoPanel;
+ wxPanel* infoPanelMask;
wxStaticText* statictext;
wxStaticText* statictext1;
wxPanel* thresholdPanel;
interfThresholdPanel* panelThreshold;
+
bool axisshown;
bool refLineShown;
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);
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() );
+}
+
void OnInterpolation(wxCommandEvent& event);
+
wxSlider* _withOfContourLine;
wxSlider* _brithtnessWindowLevel;
wxSlider* _brithtnessColorLevel;
void onExtractInformation(wxCommandEvent& event);
void onShowResultImages(wxCommandEvent& event);
void onSaveResults(wxCommandEvent& event);
+ void onContourGroup(wxCommandEvent& event);
+
void FillGridWithContoursInformation();
#include "ConceptDataWrap.h"
#include <creaWx.h>
+
+
//----------------------------------------------------------------------------------------------------------------
// Class implementation
//----------------------------------------------------------------------------------------------------------------
: wxPanel(parent, id, pos, size, style)
{
m_mgr.SetManagedWindow(this);
+ _contourGroup = 1;
_creatingContoursActive = false;
_theViewPanel = NULL;
// _modelManager = NULL;
//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<vtkImageData*> images, long style,std::string datadir)
: wxPanel(parent, id, pos, size, style)
{
m_mgr.SetManagedWindow(this);
+ _contourGroup = 1;
_creatingContoursActive = false;
_theViewPanel = NULL;
_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;
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();
}
-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;
std::vector<int> tempVector;
_instantPanel->getInstant( tempVector );
- vtkImageData *imagedata = _theViewPanel->getImageData();
+//EED01Juillet2009 vtkImageData *imagedata = _theViewPanel->getImageData();
// int sizeZ = _theViewPanel->GetImageDataSizeZ();
int z;
int ii,sizeLstContourThings;
double porcent;
wxString tmpString;
-//?????
if (selection==0 ) // actual slice
{
totalZ = maxZ-minZ+1;
- _contourextractdata->SetImage( imagedata);
+//EED01Juillet2009 _contourextractdata->SetImage( imagedata);
_contourextractdata->InitVolumeStatistics();
fprintf(pFile,"\n\n" );
-// ??????
if (selection==0 ) // actual slice
{
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 );
std::vector<int> 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;
maxZ = sizeZ;//_mbarrange->GetEnd();
totalZ = maxZ-minZ+1;
- _contourextractdata->SetImage( imagedata);
+//EED01Juillet2009 _contourextractdata->SetImage( imagedata);
// For each slice..
for ( z=0 ; z<sizeZ ; z++)
void wxContourMainFrame::getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup, int selection, int minZ, int maxZ){
wxBusyCursor wait;
- GenerateContourExtractData();
+//EED01Juillet2009 GenerateContourExtractData();
//int typeContourGroup = this->_radiolstboxContourGroup->GetSelection();
if (typeContourGroup==3)
std::vector<int> 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;
totalZ = maxZ-minZ;
- _contourextractdata->SetImage( imagedata);
+//EED01Juillet2009 _contourextractdata->SetImage( imagedata);
+ // cleanning image before range
+ for (z=0; z<minZ; z++){
+ _contourextractdata->ResetImageResult(z);
+ }
+ // cleanning image after range
+ for (z=maxZ+1; z<sizeZimage; z++){
+ _contourextractdata->ResetImageResult(z);
+ }
+
+
// For each slice..
for ( z=minZ ; z<=maxZ ; z++)
{
_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;
+}
+
+
+
+
#include "manualContourModelLine.h"
#include "manualViewLine.h"
+#include "ThresholdImageView.h"
+#include "ThresholdImageViewPanel.h"
+
+
//#include "ContourThing.h"
//#include "AxeThing.h"
//#include "ImageSourceThing.h"
void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ );
+ wxPanel *getThresholdImageViewPanel(wxWindow *parent);
+ void SetContourGroup(int contourGroup);
+
+
private:
//------------------------------------------------------------------------------------------------------------
// Private methods
// Attributtes
//------------------------------------------------------------------------------------------------------------
+ int _contourGroup;
+
static wxContourMainFrame* instance;
KernelManagerContour* kernelManager;
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<vtkImageData*> _images;
bool _actorPresent;
+
+
+
//OutlineModelManager * _modelManager;
ContourExtractData *_contourextractdata;
- void GenerateContourExtractData();
+//EED void GenerateContourExtractData();
+
void saveState();
void loadState(std::string filename);
void loadContours( FILE *pFile, bool staticContour );
format 66
"GeneralArchitecture" // GeneralArchitecture
- revision 6
+ revision 7
modified_by 2 "davila"
// class settings
//class diagram settings
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
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
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
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 // <unidirectional association>
from ref 128002 z 2001 to ref 128130
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
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
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
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
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 // <dependency>
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 // <dependency>
+ 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
no_multiplicity_a no_multiplicity_b
end
relationcanvas 143618 relation_ref 136066 // <unidirectional association>
+ 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 // <unidirectional association>
+ decenter_begin 95
from ref 129282 z 2001 to ref 143362
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
no_multiplicity_a no_multiplicity_b
end
relationcanvas 144002 relation_ref 136450 // <unidirectional association>
+ 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 // <unidirectional association>
+ decenter_begin 457
from ref 129282 z 2001 to ref 143490
no_role_a no_role_b
no_multiplicity_a no_multiplicity_b
-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
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
git://git.creatis.insa-lyon.fr / creaContours.git / commitdiff