wxSize(200,400),
wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS
);
+ this->actualTreeItem.Unset();
panel_Properties = new wxCDMMainDescriptionPanel(
this,
auiManager.Update();
//populate tree control
- tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
tree_Projects->Unselect();
- tree_Projects->SelectItem(this->model->GetProject()->GetId());
- wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
+ this->actualTreeItem.Unset();
+ tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
+ tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId());
+ //wxMessageBox(wxT("ProjectSelected") ,_T("New Project - Success!"),wxOK | wxICON_ERROR);
}
}
void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
std::cout << "building ui" << std::endl;
//populate tree control
+ tree_Projects->Unselect();
+ this->actualTreeItem.Unset();
tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
- tree_Projects->Unselect();
- tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
-
+ tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
//change project's actions panel
auiManager.Update();
}
-
- event.Skip();
}
void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
}
tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
-
+ this->actualTreeItem.Unset();
if(this->panel_Properties != NULL)
{
auiManager.DetachPane(this->panel_Properties);
- this->panel_Properties->Destroy();
- this->panel_Properties = NULL;
+ this->panel_Properties->Hide();
}
if(this->panel_ProjectActions != NULL)
{
auiManager.DetachPane(this->panel_ProjectActions);
- this->panel_ProjectActions->Destroy();
- this->panel_ProjectActions = NULL;
+ this->panel_ProjectActions->Hide();
}
this->panel_Properties = new wxCDMMainDescriptionPanel(
auiManager.AddPane(panel_Properties, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
auiManager.Update();
- event.Skip();
}
void wxCDMMainFrame::OnMenuExportHierarchy(wxCommandEvent& event)
this->auiManager.Update();
this->tree_Projects->Unselect();
- this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+ this->tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
}
event.Skip();
}
//get selected element
wxTreeItemId elementId = event.GetItem();
- if(elementId.IsOk() && this->tree_Projects->IsSelected(elementId))
+ //elementId.IsOk() && this->tree_Projects->IsSelected(elementId)
+ if(elementId.IsOk() && this->actualTreeItem != elementId)
{
- std::cout << "Tree Selection id: " << elementId << std::endl;
+
+ std::cout << "Tree Selection id: " << elementId.m_pItem << std::endl;
//get element from model
modelCDMIProjectTreeNode* element = this->model->GetModelElements()[elementId];
if (element == NULL)
return;
std::cout << "Tree Selection: " << element->GetName() << std::endl;
-
- //TODO get element type
+
+ //std::stringstream ss;
+ //ss << this->actualTreeItem.m_pItem << ":" << event.GetOldItem().m_pItem << " --> " << elementId.m_pItem;
+ //wxMessageBox( wxT("Tree Selection id: " + ss.str() + " by " + element->GetName()), wxT("Refresh Project - Error"), wxICON_ERROR);
+ this->actualTreeItem = elementId;
+
+ //get element type
//project
modelCDMProject* elementProject = dynamic_cast<modelCDMProject*>(element);
wxPanel* description;
{
this->panel_Properties->Hide();
auiManager.DetachPane(this->panel_Properties);
- this->panel_Properties->Destroy();
- this->panel_Properties = NULL;
+ //this->panel_Properties->Destroy();
+ //this->panel_Properties = NULL;
}
//set new view
auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
this->panel_Properties = description;
auiManager.Update();
- event.Skip();
}
+ else
+ {
+ event.Skip();
+ }
return;
void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
{
modelCDMIProjectTreeNode* myItem = NULL;
+ wxPanel* description = NULL;
switch(event.GetId())
{
case 0:
myItem = ((modelCDMIProjectTreeNode*)event.GetClientData());
//select out old one to generate selection event
this->tree_Projects->Unselect();
- this->tree_Projects->SelectItem(myItem->GetId(), true);
- this->tree_Projects->Expand(myItem->GetId());
+ this->tree_Projects->SelectItem(myItem->GetId().GetWxId());
+ this->tree_Projects->Expand(myItem->GetId().GetWxId());
break;
case 1:
- wxPanel* description = NULL;
+
if(event.GetString() == wxT("manage_packages"))
{
//this->tree_Projects->Expand(this->model->GetProject()->GetId());
//this->tree_Projects->Unselect();
- description = new wxCDMPackageManagerPanel(
+ this->actualTreeItem.Unset();
+ description = new wxCDMPackageManagerPanel(
this,
this->model->GetProject(),
ID_WINDOW_PROPERTIES,
}
else if(event.GetString() == wxT("manage_libraries"))
{
- this->tree_Projects->SelectItem(this->model->GetProject()->GetLib()->GetId(), true);
- this->tree_Projects->Expand(this->model->GetProject()->GetLib()->GetId());
+ this->tree_Projects->SelectItem(this->model->GetProject()->GetLib()->GetId().GetWxId());
+ this->tree_Projects->Expand(this->model->GetProject()->GetLib()->GetId().GetWxId());
break;
}
else if(event.GetString() == wxT("manage_applications"))
{
- this->tree_Projects->SelectItem(this->model->GetProject()->GetAppli()->GetId(), true);
- this->tree_Projects->Expand(this->model->GetProject()->GetAppli()->GetId());
+ this->tree_Projects->SelectItem(this->model->GetProject()->GetAppli()->GetId().GetWxId());
+ this->tree_Projects->Expand(this->model->GetProject()->GetAppli()->GetId().GetWxId());
break;
}
else if(event.GetString() == wxT("blackbox"))
{
modelCDMBlackBox* bb = (modelCDMBlackBox*)event.GetClientData();
+ this->actualTreeItem.Unset();
description = new wxCDMBlackBoxDescriptionPanel(
this,
bb,
wxSize(600, 400),
0
);
+
}
//delete old view
auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
this->panel_Properties = description;
auiManager.Update();
-
break;
+ default:
+ event.Skip();
}
- event.Skip();
+
}
void wxCDMMainFrame::OnElementSelected(wxCommandEvent& event)
{
//std::cout << "element " << event.GetInt() << std::endl;
modelCDMIProjectTreeNode* item = (modelCDMIProjectTreeNode*)event.GetClientData();
- this->tree_Projects->EnsureVisible(item->GetId());
- this->tree_Projects->SetItemBold(item->GetId(), true);
- this->tree_Projects->SetItemTextColour(item->GetId(), wxColour(0,0,255));
- this->tree_Projects->SetItemBackgroundColour(item->GetId(), wxColour(230,230,255));
+ this->tree_Projects->EnsureVisible(item->GetId().GetWxId());
+ this->tree_Projects->SetItemBold(item->GetId().GetWxId(), true);
+ this->tree_Projects->SetItemTextColour(item->GetId().GetWxId(), wxColour(0,0,255));
+ this->tree_Projects->SetItemBackgroundColour(item->GetId().GetWxId(), wxColour(230,230,255));
this->tree_Projects->UpdateWindowUI(wxUPDATE_UI_RECURSE);
auiManager.Update();
}
void wxCDMMainFrame::OnElementDeselected(wxCommandEvent& event)
{
modelCDMIProjectTreeNode* item = (modelCDMIProjectTreeNode*)event.GetClientData();
- this->tree_Projects->SetItemBold(item->GetId(), false);
- this->tree_Projects->SetItemTextColour(item->GetId(), wxColour(0,0,0));
- this->tree_Projects->SetItemBackgroundColour(item->GetId(), wxColour(255,255,255));
+ this->tree_Projects->SetItemBold(item->GetId().GetWxId(), false);
+ this->tree_Projects->SetItemTextColour(item->GetId().GetWxId(), wxColour(0,0,0));
+ this->tree_Projects->SetItemBackgroundColour(item->GetId().GetWxId(), wxColour(255,255,255));
this->tree_Projects->UpdateWindowUI(wxUPDATE_UI_RECURSE);
auiManager.Update();
}