From 611f9ce04145d9934dc3c8dc451f0a38721f89dc Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 19 Oct 2011 10:06:28 +0200 Subject: Some reorganisation, preparing for much more pcpview stuff. --- client/client.pro | 4 +-- client/pcpviewer.cc | 50 -------------------------------- client/pcpviewer.h | 45 ----------------------------- client/pcpviewer/pcpviewer.cc | 66 +++++++++++++++++++++++++++++++++++++++++++ client/pcpviewer/pcpviewer.h | 49 ++++++++++++++++++++++++++++++++ client/pracro.cc | 2 +- 6 files changed, 118 insertions(+), 98 deletions(-) delete mode 100644 client/pcpviewer.cc delete mode 100644 client/pcpviewer.h create mode 100644 client/pcpviewer/pcpviewer.cc create mode 100644 client/pcpviewer/pcpviewer.h diff --git a/client/client.pro b/client/client.pro index dd926a9..c6c7e86 100644 --- a/client/client.pro +++ b/client/client.pro @@ -49,13 +49,13 @@ HEADERS += \ macrodrawer.h \ messagebox.h \ netcom.h \ - pcpviewer.h \ praxisd.h \ resumewidget.h \ template.h \ widgets.h \ expandbutton.h \ aboutbox.h \ + pcpviewer/pcpviewer.h \ widgets/common.h \ widgets/widget.h \ widgets/label.h \ @@ -92,12 +92,12 @@ SOURCES += \ macrodrawer.cc \ messagebox.cc \ netcom.cc \ - pcpviewer.cc \ praxisd.cc \ resumewidget.cc \ template.cc \ expandbutton.cc \ aboutbox.cc \ + pcpviewer/pcpviewer.cc \ widgets/common.cc \ widgets/widget.cc \ widgets/label.cc \ diff --git a/client/pcpviewer.cc b/client/pcpviewer.cc deleted file mode 100644 index f5347d6..0000000 --- a/client/pcpviewer.cc +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set et sw=2 ts=2: */ -/*************************************************************************** - * pcpviewer.cc - * - * Tue Oct 11 14:13:34 CEST 2011 - * Copyright 2011 Bent Bisballe Nyeng - * deva@aasimon.org - ****************************************************************************/ - -/* - * This file is part of Pracro. - * - * Pracro 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 2 of the License, or - * (at your option) any later version. - * - * Pracro 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Pracro; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#include "pcpviewer.h" - -#include - -PCPViewer::PCPViewer(QString patientid) : praxisd("localhost", 10000) -{ - this->patientid = patientid; - - // QString j = praxisd.journal_get_by_cpr(patientid); - // printf("%s\n", j.toStdString().c_str()); - - DokMenuVector d = praxisd.dokmenu_get_all_by_cpr(patientid); - DokMenuVector::iterator di = d.begin(); - while(di != d.end()) { - printf("%s %s %s %d %s\n", - di->group.toStdString().c_str(), - di->subject.toStdString().c_str(), - di->filename.toStdString().c_str(), - di->filesize, - di->date.toStdString().c_str()); - di++; - } -} diff --git a/client/pcpviewer.h b/client/pcpviewer.h deleted file mode 100644 index 479b587..0000000 --- a/client/pcpviewer.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set et sw=2 ts=2: */ -/*************************************************************************** - * pcpviewer.h - * - * Tue Oct 11 14:13:34 CEST 2011 - * Copyright 2011 Bent Bisballe Nyeng - * deva@aasimon.org - ****************************************************************************/ - -/* - * This file is part of Pracro. - * - * Pracro 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 2 of the License, or - * (at your option) any later version. - * - * Pracro 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with Pracro; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#ifndef __PRACRO_PCPVIEWER_H__ -#define __PRACRO_PCPVIEWER_H__ - -#include - -#include "praxisd.h" - -class PCPViewer : public QWidget { -Q_OBJECT -public: - PCPViewer(QString patientid); - -private: - PraxisdSync praxisd; - QString patientid; -}; - -#endif/*__PRACRO_PCPVIEWER_H__*/ diff --git a/client/pcpviewer/pcpviewer.cc b/client/pcpviewer/pcpviewer.cc new file mode 100644 index 0000000..739a681 --- /dev/null +++ b/client/pcpviewer/pcpviewer.cc @@ -0,0 +1,66 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * pcpviewer.cc + * + * Tue Oct 11 14:13:34 CEST 2011 + * Copyright 2011 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of Pracro. + * + * Pracro 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 2 of the License, or + * (at your option) any later version. + * + * Pracro 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with Pracro; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#include "pcpviewer.h" + +#include + +PCPViewer::PCPViewer(QString patientid) : praxisd("localhost", 10000) +{ + this->patientid = patientid; + + connect(&praxisd, SIGNAL(networkError(QString)), + this, SLOT(networkError(QString))); + + /* + connect(&praxisd, SIGNAL(gotPatient(Patient)), + this, SLOT(gotPatient(Patient))); + */ + connect(&praxisd, SIGNAL(gotDokMenu(DokMenuVector)), + this, SLOT(gotDokMenu(DokMenuVector))); + + praxisd.dokmenu_get_all_by_cpr(patientid); +} + +void PCPViewer::networkError(QString text) +{ + printf("ERROR: %s\n", text.toStdString().c_str()); +} + +void PCPViewer::gotDokMenu(DokMenuVector d) +{ + DokMenuVector::iterator di = d.begin(); + while(di != d.end()) { + printf("%s %s %s %d %s\n", + di->group.toStdString().c_str(), + di->subject.toStdString().c_str(), + di->filename.toStdString().c_str(), + di->filesize, + di->date.toStdString().c_str()); + di++; + } +} diff --git a/client/pcpviewer/pcpviewer.h b/client/pcpviewer/pcpviewer.h new file mode 100644 index 0000000..35459a1 --- /dev/null +++ b/client/pcpviewer/pcpviewer.h @@ -0,0 +1,49 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * pcpviewer.h + * + * Tue Oct 11 14:13:34 CEST 2011 + * Copyright 2011 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of Pracro. + * + * Pracro 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 2 of the License, or + * (at your option) any later version. + * + * Pracro 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 for more details. + * + * You should have received a copy of the GNU General Public License + * along with Pracro; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#ifndef __PRACRO_PCPVIEWER_H__ +#define __PRACRO_PCPVIEWER_H__ + +#include + +#include "praxisd.h" + +class PCPViewer : public QWidget { +Q_OBJECT +public: + PCPViewer(QString patientid); + +public slots: + void networkError(QString text); + void gotDokMenu(DokMenuVector d); + +private: + Praxisd praxisd; + QString patientid; +}; + +#endif/*__PRACRO_PCPVIEWER_H__*/ diff --git a/client/pracro.cc b/client/pracro.cc index 50ec007..2c9c141 100644 --- a/client/pracro.cc +++ b/client/pracro.cc @@ -38,7 +38,7 @@ #include "netcom.h" #include "mainwindow.h" #include "launcherwindow.h" -#include "pcpviewer.h" +#include "pcpviewer/pcpviewer.h" #include "debug.h" -- cgit v1.2.3