Add UI date editor

Fwk/AppFwk/cafUserInterface/CMakeLists.txt

@@ -23,6 +23,7 @@ set( QOBJECT_HEADERS
     cafPdmUiCheckBoxTristateEditor.h
     cafPdmUiColorEditor.h
     cafPdmUiComboBoxEditor.h
+    cafPdmUiDateEditor.h
     cafPdmUiDefaultObjectEditor.h
     cafPdmUiDoubleSliderEditor.h
     cafPdmUiFilePathEditor.h
@@ -64,6 +65,8 @@ set( PROJECT_FILES
     cafPdmUiColorEditor.h
     cafPdmUiComboBoxEditor.cpp
     cafPdmUiComboBoxEditor.h
+    cafPdmUiDateEditor.cpp
+    cafPdmUiDateEditor.h
     cafPdmUiDoubleSliderEditor.cpp
     cafPdmUiDoubleSliderEditor.h
     cafPdmUiDragDropInterface.h

Fwk/AppFwk/cafUserInterface/cafPdmUiDateEditor.cpp

@@ -0,0 +1,120 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
+//   for more details.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#include "cafPdmUiDateEditor.h"
+
+#include "cafFactory.h"
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+#include "cafPdmUiDefaultObjectEditor.h"
+#include "cafPdmUiFieldEditorHandle.h"
+#include "cafPdmUiOrdering.h"
+#include "cafSelectionManager.h"
+
+#include <QApplication>
+#include <QIntValidator>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMainWindow>
+#include <QMessageBox>
+#include <QPalette>
+#include <QStatusBar>
+#include <QString>
+#include <QDate>
+#include <QGridLayout>
+
+
+namespace caf
+{
+
+CAF_PDM_UI_FIELD_EDITOR_SOURCE_INIT(PdmUiDateEditor);
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void PdmUiDateEditor::configureAndUpdateUi(const QString& uiConfigName)
+{
+    CAF_ASSERT(!m_dateEdit.isNull());
+
+    QIcon ic = field()->uiIcon(uiConfigName);
+    if (!ic.isNull())
+    {
+        m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
+    }
+    else
+    {
+        m_label->setText(field()->uiName(uiConfigName));
+    }
+
+    m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
+
+    m_dateEdit->setEnabled(!field()->isUiReadOnly(uiConfigName));
+
+    m_dateEdit->setDate(field()->uiValue().toDate());
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QWidget* PdmUiDateEditor::createEditorWidget(QWidget* parent)
+{
+    m_dateEdit = new QDateEdit(parent);
+    m_dateEdit->setCalendarPopup(true);
+    connect(m_dateEdit, SIGNAL(editingFinished()), this, SLOT(slotEditingFinished()));
+    return m_dateEdit;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QWidget* PdmUiDateEditor::createLabelWidget(QWidget* parent)
+{
+    m_label = new QLabel(parent);
+    return m_label;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void PdmUiDateEditor::slotEditingFinished()
+{
+    this->setValueToField(m_dateEdit->date());
+}
+
+} // end namespace caf

Fwk/AppFwk/cafUserInterface/cafPdmUiDateEditor.h

@@ -0,0 +1,77 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
+//   for more details.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+
+#pragma once
+
+#include "cafPdmUiFieldEditorHandle.h"
+
+#include <QLabel>
+#include <QPointer>
+#include <QString>
+#include <QWidget>
+#include <QDateEdit>
+
+namespace caf 
+{
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+class PdmUiDateEditor : public PdmUiFieldEditorHandle
+{
+    Q_OBJECT
+    CAF_PDM_UI_FIELD_EDITOR_HEADER_INIT;
+
+public:
+    PdmUiDateEditor()          {} 
+    virtual ~PdmUiDateEditor() {} 
+
+protected:
+    virtual QWidget*    createEditorWidget(QWidget * parent);
+    virtual QWidget*    createLabelWidget(QWidget * parent);
+    virtual void        configureAndUpdateUi(const QString& uiConfigName);
+
+protected slots:
+    void                slotEditingFinished();
+
+private:
+    QPointer<QDateEdit> m_dateEdit;
+    QPointer<QLabel>    m_label;
+};
+
+
+} // end namespace caf

Fwk/AppFwk/cafUserInterface/cafPdmUiDefaultObjectEditor.cpp

@@ -46,9 +46,12 @@
 #include "cafPdmUiLineEditor.h"
 #include "cafPdmUiListEditor.h"
 #include "cafPdmUiOrdering.h"
+#include "cafPdmUiDateEditor.h"
 
 #include <QGridLayout>
 #include <QWidget>
+#include <QDate>
+#include <QDateTime>
 
 
 
@@ -59,6 +62,8 @@ namespace caf
 CAF_PDM_UI_REGISTER_DEFAULT_FIELD_EDITOR(PdmUiCheckBoxEditor, bool);
 
 CAF_PDM_UI_REGISTER_DEFAULT_FIELD_EDITOR(PdmUiLineEditor, QString);
+CAF_PDM_UI_REGISTER_DEFAULT_FIELD_EDITOR(PdmUiDateEditor, QDate);
+CAF_PDM_UI_REGISTER_DEFAULT_FIELD_EDITOR(PdmUiDateEditor, QDateTime);
 CAF_PDM_UI_REGISTER_DEFAULT_FIELD_EDITOR(PdmUiLineEditor, int);
 CAF_PDM_UI_REGISTER_DEFAULT_FIELD_EDITOR(PdmUiLineEditor, double);
 CAF_PDM_UI_REGISTER_DEFAULT_FIELD_EDITOR(PdmUiLineEditor, float);