EEC
/
CosMoS
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Ajout de la fenêtre de corrections

master
Maxime Wack 11 years ago
parent
e40565fa1e
commit
f29fe31301
9 changed files with 310 additions and 361 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +15
    -10
      CosMoS/CosMoS.project
  2. +21
    -46
      CosMoS/correc.cpp
  3. +113
    -252
      CosMoS/correc.fbp
  4. +20
    -38
      CosMoS/correc.h
  5. +59
    -11
      CosMoS/correcGUI.cpp
  6. +49
    -0
      CosMoS/correcGUI.h
  7. +3
    -0
      CosMoS/cosmos.cpp
  8. +2
    -0
      CosMoS/cosmos.h
  9. +28
    -4
      Sante_Pub.workspace.session

+ 15
- 10
CosMoS/CosMoS.project View File

@@ -11,24 +11,25 @@
<File Name="main.cpp"/>
<File Name="bdd.cpp"/>
<File Name="cosmos.cpp"/>
<File Name="cosmosGUI.cpp"/>
<VirtualDirectory Name="options">
<File Name="config.cpp"/>
<File Name="options.cpp"/>
<VirtualDirectory Name="GUI">
<File Name="optionsGUI.cpp"/>
<File Name="cosmosGUI.cpp"/>
<File Name="correcGUI.cpp"/>
</VirtualDirectory>
<File Name="config.cpp"/>
<File Name="options.cpp"/>
<File Name="correc.cpp"/>
<File Name="correcGUI.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="include">
<File Name="bdd.h"/>
<File Name="cosmos.h"/>
<File Name="cosmosGUI.h"/>
<VirtualDirectory Name="options">
<File Name="config.h"/>
<File Name="options.h"/>
<VirtualDirectory Name="GUI">
<File Name="optionsGUI.h"/>
<File Name="cosmosGUI.h"/>
<File Name="correcGUI.h"/>
</VirtualDirectory>
<File Name="config.h"/>
<File Name="options.h"/>
<File Name="correc.h"/>
</VirtualDirectory>
<VirtualDirectory Name="resources">
@@ -68,6 +69,7 @@
<General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[
]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
@@ -108,6 +110,7 @@
<General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug_WIN" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[
]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
@@ -145,7 +148,8 @@
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
<General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[]]>
<![CDATA[
]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
<PostConnectCommands/>
@@ -185,6 +189,7 @@
<General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release_WIN" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[
]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">


+ 21
- 46
CosMoS/correc.cpp View File

@@ -1,61 +1,36 @@
/*#include "correc.h"
#include "correc.h"

// Classe pour une ligne de correction
ligne_correc::ligne_correc(wxWindow* parent)
correc::correc( wxWindow* parent )
:
wxBoxSizer(wxHORIZONTAL)
dialog_correc( parent )
{
textctrl_orig = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
Add( textctrl_orig, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
text_egal = new wxStaticText( this, wxID_ANY, "=", wxDefaultPosition, wxDefaultSize, 0 );
text_egal->Wrap( -1 );
Add( text_egal, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
textctrl_dest = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
Add( textctrl_dest, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bouton_suppr = new wxButton( this, wxID_ANY, "X", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
Add( bouton_suppr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
//Connect events
textctrl_dest->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ligne_correc::OnTextChange ), NULL, this );
textctrl_dest->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( ligne_correc::OnTextChange ), NULL, this );
bouton_suppr->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ligne_correc::OnDelCorrec ), NULL, this );
grid_Correcs->AppendRows(25);
grid_Correcs->SetCellValue(0, 0, "Texte\noriginal");
grid_Correcs->SetCellValue(0, 1, "Correction");
grid_Correcs->SetCellValue(0, 2, "X");
grid_Correcs->AutoSizeRows(false);
grid_Correcs->AutoSizeColumns(false);
grid_Correcs->Fit();
}

ligne_correc::~ligne_correc()
void correc::OnCellChange( wxGridEvent& event )
{
// TODO: Implement OnCellChange
}

void ligne_correc::OnTextChange( wxCommandEvent& event )
void correc::OnCellLeftClick( wxGridEvent& event )
{
// TODO: Implement OnTextChange
// TODO: Implement OnCellLeftClick
if (event.GetCol() == 2)
event.Skip();
else
{
}
}

void ligne_correc::OnDelCorrec( wxCommandEvent& event )
{
// TODO: Implement OnDelCorrec
}


// Classe pour la fenêtre de corrections
correc::correc( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Corrections"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 523,363 ), long style = wxDEFAULT_DIALOG_STYLE );
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* verticalsizer;
verticalsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* sizer_liste;
sizer_liste = new wxBoxSizer( wxVERTICAL );
}



void correc::OnOk( wxCommandEvent& event )
{
// TODO: Implement OnOk
Close();
}
*/

+ 113
- 252
CosMoS/correc.fbp View File

@@ -37,8 +37,8 @@
<property name="minimum_size"></property>
<property name="name">dialog_correc</property>
<property name="pos"></property>
<property name="size">523,363</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="size">324,344</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property>
<property name="title">Corrections</property>
<property name="tooltip"></property>
@@ -86,257 +86,118 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxGrid" expanded="1">
<property name="autosize_cols">0</property>
<property name="autosize_rows">1</property>
<property name="bg"></property>
<property name="cell_bg"></property>
<property name="cell_font"></property>
<property name="cell_horiz_alignment">wxALIGN_LEFT</property>
<property name="cell_text"></property>
<property name="cell_vert_alignment">wxALIGN_CENTRE</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="col_label_size">30</property>
<property name="col_label_values">&quot;Texte d&apos;origine&quot; &quot;Correction&quot; &quot;Supprimer&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="cols">3</property>
<property name="column_sizes">114,82,80</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="drag_col_move">0</property>
<property name="drag_col_size">1</property>
<property name="drag_grid_size">1</property>
<property name="drag_row_size">1</property>
<property name="editing">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="grid_line_color"></property>
<property name="grid_lines">1</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label_bg"></property>
<property name="label_font"></property>
<property name="label_text"></property>
<property name="margin_height">0</property>
<property name="margin_width">0</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">sizer_liste</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">sizer_correc</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="minimum_size"></property>
<property name="name">textctrl_orig</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxTE_MULTILINE|wxTE_READONLY</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">=</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">text_egal</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="minimum_size"></property>
<property name="name">textctrl_dest</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxTE_PROCESS_ENTER</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText">OnTextChange</event>
<event name="OnTextEnter">OnTextChange</event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">X</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">bouton_suppr</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxBU_EXACTFIT</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnDelCorrec</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
<property name="name">grid_Correcs</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="row_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="row_label_size">0</property>
<property name="row_label_values"></property>
<property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="row_sizes"></property>
<property name="rows">0</property>
<property name="size"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnGridCellChange">OnCellChange</event>
<event name="OnGridCellLeftClick">OnCellLeftClick</event>
<event name="OnGridCellLeftDClick"></event>
<event name="OnGridCellRightClick"></event>
<event name="OnGridCellRightDClick"></event>
<event name="OnGridCmdCellChange"></event>
<event name="OnGridCmdCellLeftClick"></event>
<event name="OnGridCmdCellLeftDClick"></event>
<event name="OnGridCmdCellRightClick"></event>
<event name="OnGridCmdCellRightDClick"></event>
<event name="OnGridCmdColSize"></event>
<event name="OnGridCmdEditorCreated"></event>
<event name="OnGridCmdEditorHidden"></event>
<event name="OnGridCmdEditorShown"></event>
<event name="OnGridCmdLabelLeftClick"></event>
<event name="OnGridCmdLabelLeftDClick"></event>
<event name="OnGridCmdLabelRightClick"></event>
<event name="OnGridCmdLabelRightDClick"></event>
<event name="OnGridCmdRangeSelect"></event>
<event name="OnGridCmdRowSize"></event>
<event name="OnGridCmdSelectCell"></event>
<event name="OnGridColSize"></event>
<event name="OnGridEditorCreated"></event>
<event name="OnGridEditorHidden"></event>
<event name="OnGridEditorShown"></event>
<event name="OnGridLabelLeftClick"></event>
<event name="OnGridLabelLeftDClick"></event>
<event name="OnGridLabelRightClick"></event>
<event name="OnGridLabelRightDClick"></event>
<event name="OnGridRangeSelect"></event>
<event name="OnGridRowSize"></event>
<event name="OnGridSelectCell"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">


+ 20
- 38
CosMoS/correc.h View File

@@ -1,46 +1,28 @@
/*#ifndef __correc__
#ifndef __correc__
#define __correc__

#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/stattext.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/dialog.h>
/**
@file
Subclass of dialog_correc, which is generated by wxFormBuilder.
*/

#include "correcGUI.h"

// Classe pour une ligne de correction
class ligne_correc : public wxBoxSizer
{
protected:
wxTextCtrl* textctrl_orig;
wxStaticText* text_egal;
wxTextCtrl* textctrl_dest;
wxButton* bouton_suppr;
void OnTextChange( wxCommandEvent& event );
void OnDelCorrec( wxCommandEvent& event );
public:
ligne_correc (wxWindow* parent);
~ligne_correc();

};

//// end generated include

// Classe pour la fenêtre de corrections
class correc : public wxDialog
/** Implementing dialog_correc */
class correc : public dialog_correc
{
protected:
ligne_correc** lignes;
wxButton* bouton_ok;
void OnOk( wxCommandEvent& event );
public:
correc( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = "Corrections", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,300 ), long style = wxDEFAULT_DIALOG_STYLE );
~correc();
protected:
// Handlers for dialog_correc events.
void OnCellChange( wxGridEvent& event );
void OnCellLeftClick( wxGridEvent& event );
void OnOk( wxCommandEvent& event );
public:
/** Constructor */
correc( wxWindow* parent );
//// end generated class members
};

#endif // __correc__*/
#endif // __correc__

+ 59
- 11
CosMoS/correcGUI.cpp View File

@@ -1,20 +1,71 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 8 2010)
// C++ code generated with wxFormBuilder (version Sep 15 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
/*
#include "correcGUI.h"

///////////////////////////////////////////////////////////////////////////

dialog_correc::dialog_correc( 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 );
wxBoxSizer* verticalsizer;
verticalsizer = new wxBoxSizer( wxVERTICAL );
grid_Correcs = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
// Grid
grid_Correcs->CreateGrid( 0, 3 );
grid_Correcs->EnableEditing( true );
grid_Correcs->EnableGridLines( true );
grid_Correcs->EnableDragGridSize( true );
grid_Correcs->SetMargins( 0, 0 );
// Columns
grid_Correcs->SetColSize( 0, 114 );
grid_Correcs->SetColSize( 1, 82 );
grid_Correcs->SetColSize( 2, 80 );
grid_Correcs->EnableDragColMove( false );
grid_Correcs->EnableDragColSize( true );
grid_Correcs->SetColLabelSize( 30 );
grid_Correcs->SetColLabelValue( 0, wxT("Texte d'origine") );
grid_Correcs->SetColLabelValue( 1, wxT("Correction") );
grid_Correcs->SetColLabelValue( 2, wxT("Supprimer") );
grid_Correcs->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
// Rows
grid_Correcs->EnableDragRowSize( true );
grid_Correcs->SetRowLabelSize( 0 );
grid_Correcs->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
grid_Correcs->SetDefaultEditor(new wxGridCellTextEditor);
grid_Correcs->SetDefaultRenderer(new wxGridCellStringRenderer);
col_orig = new wxGridCellAttr();
col_orig->SetReadOnly();
col_orig->SetAlignment(wxALIGN_LEFT, wxALIGN_CENTRE);
col_orig->SetRenderer(new wxGridCellStringRenderer);
col_suppr = new wxGridCellAttr();
col_suppr->SetReadOnly();
col_suppr->SetAlignment(wxALIGN_CENTRE, wxALIGN_CENTRE);
wxFont font;
col_suppr->SetFont(font.Bold());
col_suppr->SetTextColour(*wxRED);
col_suppr->SetBackgroundColour(*wxLIGHT_GREY);
grid_Correcs->SetColAttr(0, col_orig);
grid_Correcs->SetColAttr(2, col_suppr);
sizer_liste->Add( sizer_correc, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
// Label Appearance
verticalsizer->Add( sizer_liste, 1, wxEXPAND, 5 );
// Cell Defaults
grid_Correcs->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
verticalsizer->Add( grid_Correcs, 1, wxALL | wxEXPAND, 5 );
bouton_ok = new wxButton( this, wxID_ANY, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
verticalsizer->Add( bouton_ok, 0, wxALL|wxALIGN_RIGHT, 5 );
@@ -25,19 +76,16 @@ dialog_correc::dialog_correc( wxWindow* parent, wxWindowID id, const wxString& t
this->Centre( wxBOTH );
// Connect Events
textctrl_dest->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( dialog_correc::OnTextChange ), NULL, this );
textctrl_dest->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( dialog_correc::OnTextChange ), NULL, this );
bouton_suppr->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_correc::OnDelCorrec ), NULL, this );
grid_Correcs->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( dialog_correc::OnCellChange ), NULL, this );
grid_Correcs->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( dialog_correc::OnCellLeftClick ), NULL, this );
bouton_ok->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_correc::OnOk ), NULL, this );
}

dialog_correc::~dialog_correc()
{
// Disconnect Events
textctrl_dest->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( dialog_correc::OnTextChange ), NULL, this );
textctrl_dest->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( dialog_correc::OnTextChange ), NULL, this );
bouton_suppr->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_correc::OnDelCorrec ), NULL, this );
grid_Correcs->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( dialog_correc::OnCellChange ), NULL, this );
grid_Correcs->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( dialog_correc::OnCellLeftClick ), NULL, this );
bouton_ok->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_correc::OnOk ), NULL, this );
}
*/

+ 49
- 0
CosMoS/correcGUI.h View File

@@ -0,0 +1,49 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 15 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////

#ifndef __correcGUI__
#define __correcGUI__

#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/string.h>
#include <wx/font.h>
#include <wx/grid.h>
#include <wx/gdicmn.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/dialog.h>

///////////////////////////////////////////////////////////////////////////


///////////////////////////////////////////////////////////////////////////////
/// Class dialog_correc
///////////////////////////////////////////////////////////////////////////////
class dialog_correc : public wxDialog
{
private:
protected:
wxGrid* grid_Correcs;
wxButton* bouton_ok;
wxGridCellAttr* col_orig, *col_suppr;
// Virtual event handlers, overide them in your derived class
virtual void OnCellChange( wxGridEvent& event ) { event.Skip(); }
virtual void OnCellLeftClick( wxGridEvent& event ) { event.Skip(); }
virtual void OnOk( wxCommandEvent& event ) { event.Skip(); }
public:
dialog_correc( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Corrections"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 324,344 ), long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );
~dialog_correc();
};

#endif //__correcGUI__

+ 3
- 0
CosMoS/cosmos.cpp View File

@@ -14,6 +14,7 @@ cosmosGUI( parent )
}

bdd = new class_bdd(configuration->GetDbpath(), grid_Consults);
fenetre_corrections = new correc(this);
}

void cosmos::OnImport( wxCommandEvent& event )
@@ -35,6 +36,7 @@ void cosmos::OnExport( wxCommandEvent& event )

void cosmos::OnQuit( wxCommandEvent& event )
{
delete fenetre_corrections;
delete bdd;
delete fenetre_options;
delete configuration;
@@ -54,6 +56,7 @@ void cosmos::OnOptionsRche( wxCommandEvent& event )
void cosmos::OnCorrections( wxCommandEvent& event )
{
// TODO: Implement OnCorrections
fenetre_corrections->ShowModal();
}

void cosmos::OnSearch( wxCommandEvent& event )


+ 2
- 0
CosMoS/cosmos.h View File

@@ -10,6 +10,7 @@ Subclass of cosmosGUI, which is generated by wxFormBuilder.
#include "options.h"
#include "bdd.h"
#include "config.h"
#include "correc.h"

/** Implementing cosmosGUI */
class cosmos : public cosmosGUI
@@ -18,6 +19,7 @@ protected:
config* configuration;
options* fenetre_options;
class_bdd* bdd;
correc* fenetre_corrections;
// Handlers for cosmosGUI events.
void OnImport( wxCommandEvent& event );
void OnExport( wxCommandEvent& event );


+ 28
- 4
Sante_Pub.workspace.session View File

@@ -1,18 +1,42 @@
<?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/bdd.h" Name="FileName"/>
<int Value="0" Name="FirstVisibleLine"/>
<int Value="9" Name="CurrentLine"/>
<int Value="19" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/bdd.cpp" Name="FileName"/>
<int Value="42" Name="FirstVisibleLine"/>
<int Value="60" Name="CurrentLine"/>
<int Value="0" Name="FirstVisibleLine"/>
<int Value="133" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmosGUI.h" Name="FileName"/>
<int Value="29" Name="FirstVisibleLine"/>
<int Value="42" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmosGUI.cpp" Name="FileName"/>
<int Value="150" Name="FirstVisibleLine"/>
<int Value="155" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmos.cpp" Name="FileName"/>
<int Value="4" Name="FirstVisibleLine"/>
<int Value="4" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmos.h" Name="FileName"/>
<int Value="0" Name="FirstVisibleLine"/>
<int Value="14" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
</TabInfoArray>


Write Preview
Loading…
Cancel
Save