Modification de la fenêtre de résultats et des noms des fichiers source

Ajout de checks sur les xml des résultats
Début des fonctions intrinsèques à la fenêtre de résultats.
Todo : problème d'encodage au niveau des auteurs…

CosMoS/CosMoS.project

@@ -16,7 +16,7 @@
       <File Name="cosmosGUI.cpp"/>
       <File Name="correcGUI.cpp"/>
       <File Name="optionsRcheGUI.cpp"/>
-      <File Name="RcheGUI.cpp"/>
+      <File Name="resultatsGUI.cpp"/>
     </VirtualDirectory>
     <File Name="config.cpp"/>
     <File Name="options.cpp"/>
@@ -24,7 +24,7 @@
     <File Name="optionsRche.cpp"/>
     <File Name="recherche.cpp"/>
     <File Name="misc.cpp"/>
-    <File Name="rche.cpp"/>
+    <File Name="resultats.cpp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="include">
     <File Name="bdd.h"/>
@@ -34,7 +34,7 @@
       <File Name="cosmosGUI.h"/>
       <File Name="correcGUI.h"/>
       <File Name="optionsRcheGUI.h"/>
-      <File Name="RcheGUI.h"/>
+      <File Name="resultatsGUI.h"/>
     </VirtualDirectory>
     <File Name="config.h"/>
     <File Name="options.h"/>
@@ -42,7 +42,7 @@
     <File Name="optionsRche.h"/>
     <File Name="recherche.h"/>
     <File Name="misc.h"/>
-    <File Name="rche.h"/>
+    <File Name="resultats.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="resources">
     <File Name="cosmos.fbp"/>
@@ -57,7 +57,7 @@
     </VirtualDirectory>
     <File Name="correc.fbp"/>
     <File Name="optionsRche.fbp"/>
-    <File Name="rche.fbp"/>
+    <File Name="resultats.fbp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="tinyxml">
     <File Name="tinyxml2.h"/>

CosMoS/bdd.cpp

@@ -350,7 +350,7 @@ wxArrayString class_bdd::getidresult(const wxString& id, bool stripped)
 
 void class_bdd::addidresult(const wxString& id, const wxString& idresult)
 {
-	sqlite3_prepare_v2(db, "SELECT id_result FROM Result Where id=" + id + ";", -1, &stmt, NULL);
+	sqlite3_prepare_v2(db, "SELECT id_result FROM Result WHERE id=" + id + ";", -1, &stmt, NULL);
 	sqlite3_step(stmt);
 	wxString list = _W(sqlite3_column_text(stmt, 0));
 	sqlite3_finalize(stmt);
@@ -387,3 +387,18 @@ void class_bdd::addpubli(wxString id, wxString titre, wxString auteurs, wxString
 	if (rc)
 		wxMessageBox(_itoW(rc) + "\n" + requete);
 }
+
+wxArrayString class_bdd::getpubli(wxString id)
+{
+	wxArrayString out;
+	sqlite3_prepare_v2(db, "SELECT * FROM Publi WHERE id=" + id + ";", -1, &stmt, NULL);
+	sqlite3_step(stmt);
+	out.Add(_W(sqlite3_column_text(stmt, 1)));
+	out.Add(_W(sqlite3_column_text(stmt, 2)));
+	out.Add(_W(sqlite3_column_text(stmt, 3)));
+	out.Add(_W(sqlite3_column_text(stmt, 4)));
+	out.Add(_W(sqlite3_column_text(stmt, 5)));
+	out.Add(_W(sqlite3_column_text(stmt, 6)));
+	
+	return out;
+}

CosMoS/bdd.h

@@ -42,6 +42,7 @@ class class_bdd
 		
 		bool publiexists(const wxString& id);
 		void addpubli(wxString id, wxString titre, wxString auteurs, wxString abstract, wxString revue, wxString lien, wxString date);
+		wxArrayString getpubli(wxString id);
 };
 
 #endif //__bdd__

CosMoS/cosmos.cpp

@@ -20,6 +20,7 @@ cosmosGUI( parent )
 	bdd->updategrid();
 	fenetre_corrections = new correc(this, bdd);
 	recherche = new class_recherche(configuration, bdd, grid_Consults);
+	fenetre_resultats = new resultats(this, bdd, grid_Consults);
 }
 
 void cosmos::OnImport( wxCommandEvent& event )
@@ -41,6 +42,7 @@ void cosmos::OnExport( wxCommandEvent& event )
 
 void cosmos::OnQuit( wxCommandEvent& event )
 {
+	delete fenetre_resultats;
 	delete recherche;
 	delete fenetre_corrections;
 	delete bdd;
@@ -122,5 +124,7 @@ void cosmos::OnCellChange( wxGridEvent& event )
 	
 void cosmos::OnCellDbClick( wxGridEvent& event )
 {
-// TODO: Implement OnCellDbClick
+	fenetre_resultats->SetCurrentrow(event.GetRow());
+	fenetre_resultats->update();
+	fenetre_resultats->Show();
 }

CosMoS/cosmos.h

@@ -13,6 +13,7 @@ Subclass of cosmosGUI, which is generated by wxFormBuilder.
 #include "correc.h"
 #include "optionsRche.h"
 #include "recherche.h"
+#include "resultats.h"
 
 /** Implementing cosmosGUI */
 class cosmos : public cosmosGUI
@@ -24,6 +25,7 @@ protected:
 		correc* fenetre_corrections;
 		optionsRche* fenetre_optionsRche;
 		class_recherche* recherche;
+		resultats* fenetre_resultats;
 		// Handlers for cosmosGUI events.
 		void OnImport( wxCommandEvent& event );
 		void OnExport( wxCommandEvent& event );

CosMoS/rche.cpp

@@ -1,33 +0,0 @@
-#include "rche.h"
-
-rche::rche( wxWindow* parent )
-:
-dialog_rche( parent )
-{
-
-}
-
-void rche::OnCellClick( wxGridEvent& event )
-{
-// TODO: Implement OnCellClick
-}
-
-void rche::OnRadio( wxCommandEvent& event )
-{
-// TODO: Implement OnRadio
-}
-
-void rche::OnPrev( wxCommandEvent& event )
-{
-// TODO: Implement OnPrev
-}
-
-void rche::OnNext( wxCommandEvent& event )
-{
-// TODO: Implement OnNext
-}
-
-void rche::OnOk( wxCommandEvent& event )
-{
-// TODO: Implement OnOk
-}

CosMoS/rche.h

@@ -1,30 +0,0 @@
-#ifndef __rche__
-#define __rche__
-
-/**
-@file
-Subclass of dialog_rche, which is generated by wxFormBuilder.
-*/
-
-#include "RcheGUI.h"
-
-//// end generated include
-
-/** Implementing dialog_rche */
-class rche : public dialog_rche
-{
-	protected:
-		// Handlers for dialog_rche events.
-		void OnCellClick( wxGridEvent& event );
-		void OnRadio( wxCommandEvent& event );
-		void OnPrev( wxCommandEvent& event );
-		void OnNext( wxCommandEvent& event );
-		void OnOk( wxCommandEvent& event );
-	public:
-		/** Constructor */
-		rche( wxWindow* parent );
-	//// end generated class members
-	
-};
-
-#endif // __rche__

CosMoS/recherche.cpp

@@ -54,7 +54,7 @@ void class_recherche::go(int row, rule regle)
 	wxString requete = build(row, regle);
 	esearch(requete);
 	parsesearch();
-	
+
 	wxArrayString idresultbdd = bdd->getidresult(id, true);
 	
 	wxArrayString temp;
@@ -133,7 +133,8 @@ void class_recherche::parsefetch()
 					XMLElement* parcoursauteurs = parcours->FirstChildElement("Author");				//   Author
 					do
 					{
-						auteurs << parcoursauteurs->FirstChildElement("LastName")->GetText();
+						if (parcoursauteurs->FirstChildElement("LastName"))
+							auteurs << parcoursauteurs->FirstChildElement("LastName")->GetText();
 						if (parcoursauteurs->FirstChildElement("ForeName"))
 							auteurs << " " << parcoursauteurs->FirstChildElement("ForeName")->GetText() << ",";
 						else if (parcoursauteurs->FirstChildElement("Initials"))
@@ -202,6 +203,14 @@ void class_recherche::parsesearch()
 	doc->Parse(curldata.content);
 	
 	XMLElement* parcours = doc->RootElement();
+	if (parcours->FirstChildElement("ERROR"))
+	{
+		nbresult = 0;
+		delete(doc);
+		if (curldata.content)
+			free (curldata.content);
+		return;
+	}
 	parcours = parcours->FirstChildElement("Count");
 		nbresult = atoi(parcours->GetText());
 	parcours = parcours->NextSiblingElement("RetMax");
@@ -261,7 +270,7 @@ void class_recherche::esearch(wxString requete)
 
 wxString class_recherche::build(int row, rule regle)
 {
-	wxString requete="http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi?db=pubmed&term=";
+	wxString requete = "http://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi?db=pubmed&term=";
 	bool both = false;
 	if (grid->GetCellValue(row, 5) == "")
 		regle.usedemandeur = false;

CosMoS/resultats.cpp

@@ -0,0 +1,98 @@
+#include "resultats.h"
+
+resultats::resultats( wxWindow* parent, class_bdd* bdd, wxGrid* grid )
+:
+dialog_resultats( parent )
+{
+	this->bdd = bdd;
+	this->grid = grid;
+}
+
+void resultats::OnCellClick( wxGridEvent& event )
+{
+	currentpubli = event.GetRow();
+	grid_publis->SelectRow(currentpubli);
+	update_detail();
+}
+
+void resultats::OnCheckPubli( wxCommandEvent& event )
+{
+// TODO: Implement OnCheckPubli
+}
+
+void resultats::OnPrev( wxCommandEvent& event )
+{
+// TODO: Implement OnPrev
+}
+
+void resultats::OnNext( wxCommandEvent& event )
+{
+// TODO: Implement OnNext
+}
+
+void resultats::OnOk( wxCommandEvent& event )
+{
+// TODO: Implement OnOk
+}
+
+void resultats::update()
+{
+	list_publi.Clear();
+	list_publi = bdd->getidresult(grid->GetCellValue(currentrow, 13));
+	if (grid_publis->GetNumberRows() != 0)
+	{
+		grid_publis->DeleteRows(0, grid_publis->GetNumberRows()); //reset de la grille
+	}
+	if (list_publi.GetCount() > 0)
+	{
+		grid_publis->AppendRows(list_publi.GetCount());
+		for (unsigned int i=0; i < list_publi.GetCount(); i++)
+		{
+			wxString publi_id = list_publi[i];
+			if (publi_id.Left(1) == "!")
+			{
+				publi_id = publi_id.AfterFirst('!');
+				grid_publis->SetCellBackgroundColour(i, 0, *wxLIGHT_GREY);
+			}
+			else if (publi_id.Left(1) == "@")
+			{
+				publi_id = publi_id.AfterFirst('@');
+				grid_publis->SetCellBackgroundColour(i, 0, *wxGREEN);
+			}
+			else
+				grid_publis->SetCellBackgroundColour(i, 0, grid_publis->GetDefaultCellBackgroundColour());
+				
+			grid_publis->SetCellValue(i, 0, publi_id);
+		}
+		if (currentrow == 0)
+			bouton_prec->Disable();
+		else
+			bouton_prec->Enable();
+		if (currentrow == (grid->GetNumberRows() - 1))
+			bouton_suiv->Disable();
+		else
+			bouton_suiv->Enable();
+		currentpubli = 0;
+		grid_publis->SelectRow(currentpubli);
+		update_detail();
+	}
+}
+
+void resultats::update_detail()
+{
+	wxArrayString detail_publi = bdd->getpubli(grid_publis->GetCellValue(currentpubli, 0));
+	textctrl_titre->SetValue(detail_publi[0]);
+	textctrl_auteurs->SetValue(detail_publi[1]);
+	textctrl_abstract->SetValue(detail_publi[2]);
+	textctrl_revue->SetValue(detail_publi[3]);
+	statictext_date->SetLabel("Date de publication : " + detail_publi[5]);
+	hyperlink_lien->SetURL(detail_publi[4]);
+	wxCheckBoxState etat;
+	if (list_publi[currentpubli].Left(1) == "!")
+		etat = wxCHK_UNDETERMINED;
+	else if (list_publi[currentpubli].Left(1) == '@')
+		etat = wxCHK_CHECKED;
+	else
+		etat = wxCHK_UNCHECKED;
+	checkbox_publi->Set3StateValue(etat);
+}

CosMoS/rche.fbp → CosMoS/resultats.fbp

@@ -9,7 +9,7 @@
         <property name="disconnect_python_events">0</property>
         <property name="encoding">UTF-8</property>
         <property name="event_generation">connect</property>
-        <property name="file">RcheGUI</property>
+        <property name="file">resultatsGUI</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
         <property name="internationalize">0</property>
@@ -34,11 +34,11 @@
             <property name="hidden">0</property>
             <property name="id">wxID_ANY</property>
             <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">dialog_rche</property>
+            <property name="minimum_size">525,400</property>
+            <property name="name">dialog_resultats</property>
             <property name="pos"></property>
             <property name="size">-1,-1</property>
-            <property name="style">wxDEFAULT_DIALOG_STYLE</property>
+            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass"></property>
             <property name="title">Résultats</property>
             <property name="tooltip"></property>
@@ -96,7 +96,7 @@
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
                             <property name="flag">wxALL|wxEXPAND</property>
-                            <property name="proportion">1</property>
+                            <property name="proportion">0</property>
                             <object class="wxGrid" expanded="1">
                                 <property name="autosize_cols">0</property>
                                 <property name="autosize_rows">0</property>
@@ -180,7 +180,7 @@
                                 <event name="OnGridEditorCreated"></event>
                                 <event name="OnGridEditorHidden"></event>
                                 <event name="OnGridEditorShown"></event>
-                                <event name="OnGridLabelLeftClick"></event>
+                                <event name="OnGridLabelLeftClick">OnLabelClick</event>
                                 <event name="OnGridLabelLeftDClick"></event>
                                 <event name="OnGridLabelRightClick"></event>
                                 <event name="OnGridLabelRightDClick"></event>
@@ -212,7 +212,7 @@
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND</property>
-                            <property name="proportion">3</property>
+                            <property name="proportion">1</property>
                             <object class="wxBoxSizer" expanded="1">
                                 <property name="minimum_size"></property>
                                 <property name="name">sizer_detail</property>
@@ -800,11 +800,11 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="flag">wxALL</property>
                                     <property name="proportion">0</property>
-                                    <object class="wxRadioBox" expanded="1">
+                                    <object class="wxCheckBox" expanded="1">
                                         <property name="bg"></property>
-                                        <property name="choices">&quot;Publi&quot; &quot;Publi CHU&quot; &quot;Consultant associé&quot; &quot;Pas cette publi&quot;</property>
+                                        <property name="checked">0</property>
                                         <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="enabled">1</property>
@@ -812,16 +812,14 @@
                                         <property name="font"></property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Publication</property>
-                                        <property name="majorDimension">3</property>
+                                        <property name="label">Publication ?</property>
                                         <property name="maximum_size"></property>
                                         <property name="minimum_size"></property>
-                                        <property name="name">m_radioBox1</property>
+                                        <property name="name">checkbox_publi</property>
                                         <property name="permission">protected</property>
                                         <property name="pos"></property>
-                                        <property name="selection">0</property>
                                         <property name="size"></property>
-                                        <property name="style">wxRA_SPECIFY_COLS</property>
+                                        <property name="style">wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER</property>
                                         <property name="subclass"></property>
                                         <property name="tooltip"></property>
                                         <property name="validator_data_type"></property>
@@ -832,6 +830,7 @@
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
                                         <event name="OnChar"></event>
+                                        <event name="OnCheckBox">OnCheckPubli</event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
                                         <event name="OnKeyDown"></event>
@@ -848,7 +847,6 @@
                                         <event name="OnMouseEvents"></event>
                                         <event name="OnMouseWheel"></event>
                                         <event name="OnPaint"></event>
-                                        <event name="OnRadioBox">OnRadio</event>
                                         <event name="OnRightDClick"></event>
                                         <event name="OnRightDown"></event>
                                         <event name="OnRightUp"></event>

CosMoS/resultats.h

@@ -0,0 +1,41 @@
+#ifndef __resultats__
+#define __resultats__
+
+/**
+@file
+Subclass of dialog_resultats, which is generated by wxFormBuilder.
+*/
+
+#include "resultatsGUI.h"
+#include "bdd.h"
+
+//// end generated include
+
+/** Implementing dialog_resultats */
+class resultats : public dialog_resultats
+{
+protected:
+	class_bdd* bdd;
+	wxGrid* grid;
+	int currentrow;
+	int currentpubli;
+	wxArrayString list_publi;
+	// Handlers for dialog_resultats events.
+	void OnCellClick( wxGridEvent& event );
+	void OnCheckPubli( wxCommandEvent& event );
+	void OnPrev( wxCommandEvent& event );
+	void OnNext( wxCommandEvent& event );
+	void OnOk( wxCommandEvent& event );
+	void update_detail();
+public:
+	/** Constructor */
+	resultats( wxWindow* parent, class_bdd* bdd, wxGrid* grid );
+	void update();
+	
+	void SetCurrentrow(int currentrow) {this->currentrow = currentrow;}
+	int GetCurrentrow() const {return currentrow;}
+//// end generated class members
+	
+};
+
+#endif // __resultats__

CosMoS/RcheGUI.cpp → CosMoS/resultatsGUI.cpp

@@ -5,13 +5,13 @@
 // PLEASE DO "NOT" EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "RcheGUI.h"
+#include "resultatsGUI.h"
 
 ///////////////////////////////////////////////////////////////////////////
 
-dialog_rche::dialog_rche( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+dialog_resultats::dialog_resultats( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetSizeHints( wxSize( 525,400 ), wxDefaultSize );
 	
 	wxBoxSizer* verticalsizer;
 	verticalsizer = new wxBoxSizer( wxVERTICAL );
@@ -43,7 +43,7 @@ dialog_rche::dialog_rche( wxWindow* parent, wxWindowID id, const wxString& title
 	
 	// Cell Defaults
 	grid_publis->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	horizontalsizer->Add( grid_publis, 1, wxALL|wxEXPAND, 5 );
+	horizontalsizer->Add( grid_publis, 0, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* sizer_detail;
 	sizer_detail = new wxBoxSizer( wxVERTICAL );
@@ -83,13 +83,10 @@ dialog_rche::dialog_rche( wxWindow* parent, wxWindowID id, const wxString& title
 	hyperlink_lien = new wxHyperlinkCtrl( this, wxID_ANY, wxT("Lien vers la page PubMed"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
 	sizer_detail->Add( hyperlink_lien, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
 	
-	wxString m_radioBox1Choices[] = { wxT("Publi"), wxT("Publi CHU"), wxT("Consultant associé"), wxT("Pas cette publi") };
-	int m_radioBox1NChoices = sizeof( m_radioBox1Choices ) / sizeof( wxString );
-	m_radioBox1 = new wxRadioBox( this, wxID_ANY, wxT("Publication"), wxDefaultPosition, wxDefaultSize, m_radioBox1NChoices, m_radioBox1Choices, 3, wxRA_SPECIFY_COLS );
-	m_radioBox1->SetSelection( 0 );
-	sizer_detail->Add( m_radioBox1, 0, wxALL|wxEXPAND, 5 );
+	checkbox_publi = new wxCheckBox( this, wxID_ANY, wxT("Publication ?"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER );
+	sizer_detail->Add( checkbox_publi, 0, wxALL, 5 );
 	
-	horizontalsizer->Add( sizer_detail, 3, wxEXPAND, 5 );
+	horizontalsizer->Add( sizer_detail, 1, wxEXPAND, 5 );
 	
 	verticalsizer->Add( horizontalsizer, 1, wxEXPAND, 5 );
 	
@@ -117,20 +114,22 @@ dialog_rche::dialog_rche( wxWindow* parent, wxWindowID id, const wxString& title
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	grid_publis->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( dialog_rche::OnCellClick ), NULL, this );
-	m_radioBox1->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( dialog_rche::OnRadio ), NULL, this );
-	bouton_prec->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_rche::OnPrev ), NULL, this );
-	bouton_suiv->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_rche::OnNext ), NULL, this );
-	bouton_ok->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_rche::OnOk ), NULL, this );
+	grid_publis->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( dialog_resultats::OnCellClick ), NULL, this );
+	grid_publis->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( dialog_resultats::OnLabelClick ), NULL, this );
+	checkbox_publi->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_resultats::OnCheckPubli ), NULL, this );
+	bouton_prec->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_resultats::OnPrev ), NULL, this );
+	bouton_suiv->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_resultats::OnNext ), NULL, this );
+	bouton_ok->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_resultats::OnOk ), NULL, this );
 }
 
-dialog_rche::~dialog_rche()
+dialog_resultats::~dialog_resultats()
 {
 	// Disconnect Events
-	grid_publis->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( dialog_rche::OnCellClick ), NULL, this );
-	m_radioBox1->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( dialog_rche::OnRadio ), NULL, this );
-	bouton_prec->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_rche::OnPrev ), NULL, this );
-	bouton_suiv->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_rche::OnNext ), NULL, this );
-	bouton_ok->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_rche::OnOk ), NULL, this );
+	grid_publis->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( dialog_resultats::OnCellClick ), NULL, this );
+	grid_publis->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( dialog_resultats::OnLabelClick ), NULL, this );
+	checkbox_publi->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_resultats::OnCheckPubli ), NULL, this );
+	bouton_prec->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_resultats::OnPrev ), NULL, this );
+	bouton_suiv->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_resultats::OnNext ), NULL, this );
+	bouton_ok->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_resultats::OnOk ), NULL, this );
 	
 }

CosMoS/RcheGUI.h → CosMoS/resultatsGUI.h

@@ -5,8 +5,8 @@
 // PLEASE DO "NOT" EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __RcheGUI__
-#define __RcheGUI__
+#ifndef __resultatsGUI__
+#define __resultatsGUI__
 
 #include <wx/colour.h>
 #include <wx/settings.h>
@@ -17,7 +17,7 @@
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 #include <wx/hyperlink.h>
-#include <wx/radiobox.h>
+#include <wx/checkbox.h>
 #include <wx/sizer.h>
 #include <wx/button.h>
 #include <wx/dialog.h>
@@ -26,9 +26,9 @@
 
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class dialog_rche
+/// Class dialog_resultats
 ///////////////////////////////////////////////////////////////////////////////
-class dialog_rche : public wxDialog 
+class dialog_resultats : public wxDialog 
 {
 	private:
 	
@@ -44,7 +44,7 @@ class dialog_rche : public wxDialog
 		wxTextCtrl* textctrl_revue;
 		wxStaticText* statictext_date;
 		wxHyperlinkCtrl* hyperlink_lien;
-		wxRadioBox* m_radioBox1;
+		wxCheckBox* checkbox_publi;
 		wxButton* bouton_prec;
 		wxButton* bouton_suiv;
 		
@@ -52,7 +52,8 @@ class dialog_rche : public wxDialog
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnCellClick( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnRadio( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLabelClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnCheckPubli( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnPrev( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnNext( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnOk( wxCommandEvent& event ) { event.Skip(); }
@@ -60,9 +61,9 @@ class dialog_rche : public wxDialog
 	
 	public:
 		
-		dialog_rche( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Résultats"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-		~dialog_rche();
+		dialog_resultats( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Résultats"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		~dialog_resultats();
 	
 };
 
-#endif //__RcheGUI__
+#endif //__resultatsGUI__

Sante_Pub.workspace.session

@@ -12,37 +12,55 @@
     <TabInfo>
       <wxString Value="C:\Projets\CosMoS\cosmos.h" Name="FileName"/>
       <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="0" Name="CurrentLine"/>
+      <int Value="15" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
       <wxString Value="C:\Projets\CosMoS\cosmos.cpp" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="0" Name="CurrentLine"/>
+      <int Value="82" Name="FirstVisibleLine"/>
+      <int Value="128" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
       <wxString Value="C:\Projets\CosMoS\bdd.h" Name="FileName"/>
-      <int Value="2" Name="FirstVisibleLine"/>
+      <int Value="1" Name="FirstVisibleLine"/>
       <int Value="43" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
       <wxString Value="C:\Projets\CosMoS\bdd.cpp" Name="FileName"/>
-      <int Value="343" Name="FirstVisibleLine"/>
-      <int Value="364" Name="CurrentLine"/>
+      <int Value="356" Name="FirstVisibleLine"/>
+      <int Value="0" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
       <wxString Value="C:\Projets\CosMoS\recherche.h" Name="FileName"/>
-      <int Value="8" Name="FirstVisibleLine"/>
+      <int Value="0" Name="FirstVisibleLine"/>
       <int Value="8" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
       <wxString Value="C:\Projets\CosMoS\recherche.cpp" Name="FileName"/>
-      <int Value="87" Name="FirstVisibleLine"/>
-      <int Value="102" Name="CurrentLine"/>
+      <int Value="79" Name="FirstVisibleLine"/>
+      <int Value="101" Name="CurrentLine"/>
+      <wxArrayString Name="Bookmarks"/>
+    </TabInfo>
+    <TabInfo>
+      <wxString Value="C:\Projets\CosMoS\resultats.h" Name="FileName"/>
+      <int Value="0" Name="FirstVisibleLine"/>
+      <int Value="0" Name="CurrentLine"/>
+      <wxArrayString Name="Bookmarks"/>
+    </TabInfo>
+    <TabInfo>
+      <wxString Value="C:\Projets\CosMoS\resultats.cpp" Name="FileName"/>
+      <int Value="50" Name="FirstVisibleLine"/>
+      <int Value="88" Name="CurrentLine"/>
+      <wxArrayString Name="Bookmarks"/>
+    </TabInfo>
+    <TabInfo>
+      <wxString Value="C:\Projets\CosMoS\resultatsGUI.h" Name="FileName"/>
+      <int Value="18" Name="FirstVisibleLine"/>
+      <int Value="35" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
   </TabInfoArray>