wxConvAuto(wxFONTENCODING_SYSTEM) dans l'export, à voir sous windows…

Les touches gauche-droite dans la fenêtre de résultats sautent jusqu'à la prochaine consultation à examiner

CosMoS/bdd.cpp

@@ -141,16 +141,11 @@ void class_bdd::Importer(const wxString& filename)
 
 void class_bdd::Exporter(const wxString& filename)
 {
-	/*#ifdef __WXMSW__
-		file_import->ReadAll(&fichier, wxConvAuto(wxFONTENCODING_SYSTEM));
-	#elif defined(__WXGTK__)
-		file_import->ReadAll(&fichier);
-	#endif*/
 	wxProgressDialog dialog_progress("Export", "Export de la base...", grid_consults->GetNumberRows(), NULL, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH | wxPD_ELAPSED_TIME | wxPD_REMAINING_TIME);
 	wxFFile* file_export = new wxFFile(filename, "w");
 	wxString line;
 	line = "Travail numéro;Dossier numéro;Nom demandeur;Prénom demandeur;Service libellé;Etablissement libellé;Type travail libellé;Thème;Nom responsable;Consultant responsable;Date dernier RDV eff;Publi;Publi CHU;Consultant associé;Date de publication 1;Revue 1;Lien 1;Date de publication 2;Revue 2;Lien 2\n";
-	file_export->Write(line);
+	file_export->Write(line, wxConvAuto(wxFONTENCODING_SYSTEM));
 	for (int i=0; i < grid_consults->GetNumberRows(); i++)
 	{
 		wxString id = grid_consults->GetCellValue(i,13);
@@ -185,7 +180,7 @@ void class_bdd::Exporter(const wxString& filename)
 			}
 		}
 		line << "\n";
-		file_export->Write(line);
+		file_export->Write(line, wxConvAuto(wxFONTENCODING_SYSTEM));
 		dialog_progress.Update(i);
 	}
 	

CosMoS/resultats.cpp

@@ -240,10 +240,35 @@ void resultats::OnKey( wxKeyEvent& event )
 	wxCommandEvent e;
 	
 	if ((event.GetKeyCode() == WXK_LEFT) && (current_row_consult>0))
-		OnPrev(e);
+	{
+		if (changed)
+			Commit();
+		changed = false;
+		do
+		{
+			current_row_consult--;
+			
+		}while ((current_row_consult > 0) && (wxAtoi(grid_consults->GetCellValue(current_row_consult, 0)) == 0));
+		Update();
+		
+		if (current_row_consult == 0)
+			wxMessageBox(_T("Début de la liste de consultations"));
+	}
 	
 	if ((event.GetKeyCode() == WXK_RIGHT) && (current_row_consult < grid_consults->GetNumberRows() - 1))
-		OnNext(e);
+	{
+		if (changed)
+			Commit();
+		changed = false;
+		do
+		{
+			current_row_consult++;
+		}while ((current_row_consult < grid_consults->GetNumberRows() - 1) && (wxAtoi(grid_consults->GetCellValue(current_row_consult, 0)) == 0));
+		Update();
+		
+		if (current_row_consult == grid_consults->GetNumberRows() - 1)
+			wxMessageBox(_T("Fin de la liste de consultations"));
+	}
 		
 	if ((event.GetKeyCode() == WXK_SPACE) && (list_publi.GetCount() > 0))
 	{

Sante_Pub.workspace.session

@@ -1,22 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Session Name="/home/satamaxx/Programmes/Sante_Pub/Sante_Pub.workspace">
-  <int Value="1" Name="m_selectedTab"/>
+  <int Value="3" Name="m_selectedTab"/>
   <wxString Value="/home/satamaxx/Programmes/Sante_Pub/Sante_Pub.workspace" Name="m_workspaceName"/>
   <TabInfoArray Name="TabInfoArray">
+    <TabInfo>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/config.h" Name="FileName"/>
+      <int Value="13" Name="FirstVisibleLine"/>
+      <int Value="47" Name="CurrentLine"/>
+      <wxArrayString Name="Bookmarks"/>
+    </TabInfo>
+    <TabInfo>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmos.cpp" Name="FileName"/>
+      <int Value="48" Name="FirstVisibleLine"/>
+      <int Value="83" Name="CurrentLine"/>
+      <wxArrayString Name="Bookmarks"/>
+    </TabInfo>
     <TabInfo>
       <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/bdd.h" Name="FileName"/>
-      <int Value="0" Name="FirstVisibleLine"/>
-      <int Value="0" Name="CurrentLine"/>
+      <int Value="5" Name="FirstVisibleLine"/>
+      <int Value="38" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/bdd.cpp" Name="FileName"/>
-      <int Value="363" Name="FirstVisibleLine"/>
-      <int Value="363" Name="CurrentLine"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/resultats.cpp" Name="FileName"/>
+      <int Value="238" Name="FirstVisibleLine"/>
+      <int Value="264" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
-      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmos.cpp" Name="FileName"/>
+      <wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/misc.h" Name="FileName"/>
       <int Value="0" Name="FirstVisibleLine"/>
       <int Value="0" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>