X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=1b80f28ac7e938366333e0e7095b3b2a58503b3d;hb=03aef77bacc41f53b1d21b88e683302e7e1600c2;hp=a5b1315fd05814df8c2c0494190141a88e33cedb;hpb=921c85646eb457d9e8cfc1a9031481df176970ce;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index a5b1315..1b80f28 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -29,6 +29,7 @@
 #include "wxCDMMainFrame.h"
 
 #include <iostream>
+#include <sstream>
 
 #include <creaWx.h>
 #include "creaSystem.h"
@@ -218,6 +219,7 @@ void wxCDMMainFrame::CreateControls()
       wxSize(200,400),
 	  wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS
   );
+  this->actualTreeItem.Unset();
 
   panel_Properties = new wxCDMMainDescriptionPanel(
       this,
@@ -274,13 +276,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           event.Skip();
           return;
         }
-
-      //populate tree control
-      tree_Projects->BuildTree(this->model->GetModelElements(),this->model->GetProject());
-      tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
-      tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
-
-
+      
       //show project actions panel
       if(this->panel_ProjectActions != NULL)
         {
@@ -288,7 +284,7 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           this->panel_ProjectActions->Destroy();
           this->panel_ProjectActions = NULL;
         }
-
+	  
       panel_ProjectActions = new wxCDMProjectActionsPanel(
           this,
           this->model->GetProject(),
@@ -298,18 +294,17 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           wxSize(800,200),
           0
       );
-      panel_ProjectActions->SetMinSize(wxSize(500, 100));
-
-
+      
       auiManager.AddPane(panel_ProjectActions, wxAuiPaneInfo().Bottom().MinSize(800,50).Name(wxT("panel_ProjectActions")).Caption(wxT("General Project Actions")).BestSize(800,70).CloseButton(false));
-
       auiManager.Update();
 
-      //wxMessageBox(_T("New Project created!"),_T("New Project - Success!"), wxOK | wxICON_INFORMATION);
-
+      //populate tree control
+      tree_Projects->Unselect();
+	  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);
     }
-
-  event.Skip();
 }
 void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
 {
@@ -351,10 +346,10 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
       std::cout << "building ui" << std::endl;
 
       //populate tree control
-      tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
-      tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
-      tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
-
+          tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
+          tree_Projects->Unselect();
+          this->actualTreeItem.Unset();
+	  tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
 
 
       //change project's actions panel
@@ -381,8 +376,6 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
       auiManager.Update();
 
     }
-
-  event.Skip();
 }
 
 void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
@@ -396,18 +389,16 @@ 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(
@@ -422,7 +413,6 @@ void wxCDMMainFrame::OnMenuCloseProject(wxCommandEvent& event)
   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)
@@ -438,7 +428,7 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event)
     {
       std::cout << "error closing project: " << *result << std::endl;
     }
-  tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
+
   if(this->panel_Properties != NULL)
     {
       auiManager.DetachPane(this->panel_Properties);
@@ -446,6 +436,13 @@ void wxCDMMainFrame::OnMenuExit(wxCommandEvent& event)
       this->panel_Properties = NULL;
     }
   
+  if(this->tree_Projects != NULL)
+    {
+      auiManager.DetachPane(this->tree_Projects);
+      this->tree_Projects->Destroy();
+      this->tree_Projects = NULL;
+    }
+
   if(this->panel_ProjectActions != NULL)
     {
       auiManager.DetachPane(this->panel_ProjectActions);
@@ -469,8 +466,8 @@ void wxCDMMainFrame::OnMenuRefreshProject(wxCommandEvent& event)
       this->tree_Projects->BuildTree(this->model->GetModelElements(), this->model->GetProject());
       this->auiManager.Update();
 
-      this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
-      this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), true);
+      this->tree_Projects->Unselect();
+      this->tree_Projects->SelectItem(this->model->GetProject()->GetId().GetWxId(), true);
     }
   event.Skip();
 }
@@ -525,7 +522,42 @@ void wxCDMMainFrame::OnMenuAboutCreaDevManager(wxCommandEvent& event)
 
   html = new wxHtmlWindow(&dlg, wxID_ANY, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
   html -> SetBorders(0);
-  html -> LoadPage(wxT("about.html"));
+
+  std::string content = ""
+      "<html>"
+      "<body bgcolor=\"#3333CC\">"
+      "<table cellspacing=3 cellpadding=4 width=\"100%\">"
+      "  <tr>"
+      "    <td bgcolor=\"#3333CC\">"
+      "    <center>"
+      "    <font size=+2 color=\"#FFFFFF\"><b>CREA Development Manager</b>"
+      "    </font>"
+      "    </center>"
+      "    </td>"
+      "  </tr>"
+      "  <tr>"
+      "    <td bgcolor=\"#FFFFFF\">"
+      "    <p><b><font size=+1>Creatis 2012 - Lyon, France</font></b></p>"
+      "    <font size=-1>"
+      "      <table cellpadding=0 cellspacing=0 width=\"100%\">"
+      "        <tr>"
+      "          <td width=\"65%\">"
+      "            <p>Created by Daniel Gonz&aacute;lez - daniel.gonzalez@creatis.insa-lyon.fr</p>"
+      "          </td>"
+      "        </tr>"
+      "      </table>"
+      "      <font size=1>"
+      "        <p>This software is governed by the CeCILL-B license under French law and abiding by the rules of distribution of free software.</p>"
+      "      </font>"
+      "    </font>"
+      "    </td>"
+      "  </tr>"
+      "</table>"
+      "</body>"
+      "</html>"
+      ;
+
+  html -> SetPage(crea::std2wx(content));
   html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(),
       html -> GetInternalRepresentation() -> GetHeight());
 
@@ -555,16 +587,25 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 
   //get selected element
   wxTreeItemId elementId = event.GetItem();
-  if(this->tree_Projects->IsSelected(elementId))
+  std::cout << "Tree Selection id: " << elementId.m_pItem << this->actualTreeItem.m_pItem << std::endl;
+  //elementId.IsOk() && this->tree_Projects->IsSelected(elementId)
+  if(elementId.IsOk() && this->actualTreeItem != elementId)
     {
-      std::cout << "Tree Selection id: " << elementId << std::endl;
+      
+      std::cout << "Valid 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;
@@ -604,7 +645,7 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
             {
               //application
               modelCDMApplication* elementApplication = dynamic_cast<modelCDMApplication*>(element);
-              if(elementApplication != NULL)
+			  if(elementApplication != NULL)
                 {
                   //create element description
                   description = new wxCDMApplicationDescriptionPanel(
@@ -760,27 +801,24 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
             }
         }
 
-      if(this->panel_Properties!= NULL)
-        this->panel_Properties->Hide();
-
-      auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
-      auiManager.Update();
-
       //delete old view
       if(this->panel_Properties!= NULL)
         {
+          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.AddPane(panel_Properties, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("Properties")).BestSize(600,400).CloseButton(false));
       auiManager.Update();
-      event.Skip();
     }
+  else
+    {
+      event.Skip();
+	}
 
   return;
 
@@ -789,22 +827,24 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
 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->SelectItem(myItem->GetId(), false);
-    this->tree_Projects->SelectItem(myItem->GetId(), true);
-    this->tree_Projects->Expand(myItem->GetId());
+    this->tree_Projects->Unselect();
+    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->SelectItem(this->model->GetProject()->GetId(), false);
-        this->tree_Projects->Expand(this->model->GetProject()->GetId());
-        description = new wxCDMPackageManagerPanel(
+        //this->tree_Projects->Expand(this->model->GetProject()->GetId());
+        //this->tree_Projects->Unselect();
+        this->actualTreeItem.Unset();
+		  description = new wxCDMPackageManagerPanel(
             this,
             this->model->GetProject(),
             ID_WINDOW_PROPERTIES,
@@ -816,20 +856,20 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
       }
     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"))
       {
-        this->tree_Projects->SelectItem(this->model->GetProject()->GetId(), false);
         modelCDMBlackBox* bb = (modelCDMBlackBox*)event.GetClientData();
+		this->actualTreeItem.Unset();
         description = new wxCDMBlackBoxDescriptionPanel(
             this,
             bb,
@@ -839,38 +879,36 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
             wxSize(600, 400),
             0
         );
+		
       }
 
-    if(this->panel_Properties!= NULL)
-      this->panel_Properties->Hide();
-
-    auiManager.AddPane(description, wxAuiPaneInfo().Center().Name(wxT("panel_Properties")).Caption(wxT("")).BestSize(600,400).CloseButton(false));
-    auiManager.Update();
-
     //delete old view
     if(this->panel_Properties!= NULL)
       {
+        this->panel_Properties->Hide();
         auiManager.DetachPane(this->panel_Properties);
         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();
     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();
 }
@@ -878,9 +916,9 @@ void wxCDMMainFrame::OnElementSelected(wxCommandEvent& event)
 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();
 }