Added classes to manage simple tabular data of known structure using a
popup containing a wxGrid object.
BasePicker : Abstract class adding a popup to wxPickerBase styled with
a wxTextCtrl.
BaseGridPicker : Abstract class adding a wxGrid in the popup.
JsonGridPickerCtrl : UI control storing the tabular data in a JSON
array.
LBoundJsonGridPicker : connect JsonGridPicker to database.
LGridJsonCellEditor : use LBoundJsonGridPicker in other wxGrid objects.
LGridJsonCellRenderer : render cell JSON data.
XmlGridPickerCtrl : UI control storing the tabular data in as XML
document.
LBoundXmlGridPicker : connect XmlGridPicker to database.
LGridXmlCellEditor : grid editor for LBoundXmlGridPicker.
LGridXmlCellRenderer : grid renderer for LBoundXmlGridPicker.
JsonHelper and XmlHelper : for applications to quickly get intent value
from database data..
The structure of managed tabular data :
Column 1 : Intent - this is what we want to store/edit. This can be
telephone numbers, email addresses, instant messaging addresses...
any single line piece of information that can exist many times for one
entity (person, company...).
Column 2 : Type - A short description of the intent : 'Home, Work,
Mobile, Fax, Other...'. It is displayed in a non editable wxComboBox.
Column 3 : Preferred - One line of data can be selected as the preferred
one. It is not mandatory, but it must be a single choice.
Column 4 : Notes - single line notes.
Adjust sql scripts and L7.dox.
Applied ANSI formatting style to all files.
Other changes :
Work around a nasty misbehavior.
Grid columns edited by a translated combobox expect full string
data as cell values. LResultSet::BEData() will report these mapped strings,
instead of database real data. LBoundComboBox::IsDirty() will always be
true even if the editor is unchanged once created.
Simplest workaround : disconnect m_BoundComboBox if unchanged.
LGridTextEditor::ProvideFormEditor() : set the form editor's value
explicitely.; wxTextCtrl does not interpret data it receives
LBoundControl::SetNull must be void.
LBoundGrid : Unbind:: instructions should limit to the widget's id, like Bind::
LConnection::GetReturnedKeys should return NULL.
LConnection::SetData should return void.
Notes : wxJSON must be configured with the same prefix as wxWidgets,
here /usr/local/{wxWidgets,wxWidgets-Release}.
This commit is contained in:
@@ -10,16 +10,15 @@
|
||||
#include "LBoundCheckBox.h"
|
||||
|
||||
LBoundCheckBox::LBoundCheckBox(wxWindow* parent, wxWindowID id, long style)
|
||||
: wxCheckBox(parent, id, _T("LCheckBox"), wxDefaultPosition, wxDefaultSize, style)
|
||||
{
|
||||
: wxCheckBox(parent, id, _T("LCheckBox"), wxDefaultPosition, wxDefaultSize, style) {
|
||||
m_sqlQuote = wxEmptyString;
|
||||
SetNull();
|
||||
}
|
||||
|
||||
LBoundCheckBox::~LBoundCheckBox()
|
||||
{
|
||||
LBoundCheckBox::~LBoundCheckBox() {
|
||||
if (m_rs) m_rs->UnRegisterControl(this);
|
||||
}
|
||||
|
||||
const wxAny LBoundCheckBox::GetData() {
|
||||
if (Is3State()) {
|
||||
if (Get3StateValue() == wxCHK_UNDETERMINED) return L_SQLNULL;
|
||||
@@ -30,7 +29,8 @@ const wxAny LBoundCheckBox::GetData() {
|
||||
if (GetValue() == wxCHK_CHECKED) return 1;
|
||||
}
|
||||
}
|
||||
bool LBoundCheckBox::SetData(const wxAny& newData) {
|
||||
|
||||
void LBoundCheckBox::SetData(const wxAny& newData) {
|
||||
/* The interpretation of literal non is not documented
|
||||
* as it's for internal use.
|
||||
*/
|
||||
@@ -40,7 +40,7 @@ bool LBoundCheckBox::SetData(const wxAny& newData) {
|
||||
if (snewData.IsEmpty()
|
||||
|| snewData == L_SQLNULL) {
|
||||
Set3StateValue(wxCHK_UNDETERMINED);
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
if (snewData == _T("0")
|
||||
|| snewData.Lower() == _T("no")) {
|
||||
@@ -48,7 +48,7 @@ bool LBoundCheckBox::SetData(const wxAny& newData) {
|
||||
} else {
|
||||
Set3StateValue(wxCHK_CHECKED);
|
||||
}
|
||||
return true;
|
||||
return;
|
||||
} else {
|
||||
if (snewData == _T("0")
|
||||
|| snewData.IsEmpty()
|
||||
@@ -58,14 +58,14 @@ bool LBoundCheckBox::SetData(const wxAny& newData) {
|
||||
SetValue(wxCHK_CHECKED);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
void LBoundCheckBox::SetResultSet(LResultSet* newResultSet)
|
||||
{
|
||||
|
||||
void LBoundCheckBox::SetResultSet(LResultSet* newResultSet) {
|
||||
m_rs = newResultSet;
|
||||
if (m_rs == NULL) return;
|
||||
m_rs->RegisterControl(this);
|
||||
}
|
||||
|
||||
bool LBoundCheckBox::IsNull() {
|
||||
if (Is3State()) {
|
||||
return (Get3StateValue() == wxCHK_UNDETERMINED);
|
||||
@@ -73,25 +73,28 @@ bool LBoundCheckBox::IsNull() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
bool LBoundCheckBox::SetNull() {
|
||||
return SetData(wxEmptyString);
|
||||
|
||||
void LBoundCheckBox::SetNull() {
|
||||
SetData(wxEmptyString);
|
||||
}
|
||||
|
||||
bool LBoundCheckBox::IsDirty() {
|
||||
wxASSERT_MSG(m_rs != NULL, "m_rs est NULL.");
|
||||
wxAny ctrlData = GetData(); // 0, 1 or L_SQLNULL
|
||||
wxAny BEData = m_rs->GetData(m_columnName);
|
||||
int iBEData; BEData.GetAs(&iBEData);
|
||||
int iBEData;
|
||||
BEData.GetAs(&iBEData);
|
||||
if (Is3State()) {
|
||||
if (BEData.IsNull()
|
||||
|| BEData.As<wxString>().IsEmpty()) {
|
||||
|| BEData.As<wxString>().IsEmpty()) {
|
||||
BEData = L_SQLNULL;
|
||||
} else if (iBEData != 0) {
|
||||
BEData = 1;
|
||||
}
|
||||
} else {
|
||||
if (BEData.IsNull()
|
||||
|| iBEData == 0
|
||||
|| BEData.As<wxString>().IsEmpty()) {
|
||||
|| iBEData == 0
|
||||
|| BEData.As<wxString>().IsEmpty()) {
|
||||
BEData = 0;
|
||||
} else {
|
||||
BEData = 1;
|
||||
@@ -99,6 +102,7 @@ bool LBoundCheckBox::IsDirty() {
|
||||
}
|
||||
return (ctrlData.As<wxString>() != BEData.As<wxString>());
|
||||
}
|
||||
|
||||
const wxString LBoundCheckBox::GetDisplayedData() {
|
||||
if (Is3State()) {
|
||||
if (Get3StateValue() == wxCHK_UNDETERMINED) return L_SQLNULL;
|
||||
|
||||
Reference in New Issue
Block a user