[freemedforms] 10 new revisions pushed by eric.mae...@gmail.com on 2012-10-18 20:34 GMT

[freeme...@googlecode.com]

10 new revisions:

Revision: d678bf59ed54
Author: Christian A. Reiter <christian...@gmail.com>
Date: Wed Oct 17 16:08:22 2012
Log: check existence of the OpenCV libs; fixme comment
http://code.google.com/p/freemedforms/source/detail?r=d678bf59ed54

Revision: 3e6ba6512cfd
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 05:08:05 2012
Log: Merge branch 'master' of https://code.google.com/p/freemedforms
http://code.google.com/p/freemedforms/source/detail?r=3e6ba6512cfd

Revision: e2734f056eca
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 06:13:42 2012
Log: Merge branch 'master' of https://code.google.com/p/freemedforms
http://code.google.com/p/freemedforms/source/detail?r=e2734f056eca

Revision: cd69a7694045
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:14:59 2012
Log: just a log
http://code.google.com/p/freemedforms/source/detail?r=cd69a7694045

Revision: d803fd27414d
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:16:36 2012
Log: warns
http://code.google.com/p/freemedforms/source/detail?r=d803fd27414d

Revision: f24f00ce1df4
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:21:05 2012
Log: missing )
http://code.google.com/p/freemedforms/source/detail?r=f24f00ce1df4

Revision: ca8f299b0afd
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:27:08 2012
Log: pfiou...
http://code.google.com/p/freemedforms/source/detail?r=ca8f299b0afd

Revision: 5169e0732f74
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:33:02 2012
Log: objectname
http://code.google.com/p/freemedforms/source/detail?r=5169e0732f74

Revision: 35c1a709a4af
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:33:31 2012
Log: bug: after the first run, form is not correctly loaded
http://code.google.com/p/freemedforms/source/detail?r=35c1a709a4af

Revision: 9e3d9b0a5915
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:33:57 2012
Log: Merge branch 'master' of https://code.google.com/p/freemedforms
http://code.google.com/p/freemedforms/source/detail?r=9e3d9b0a5915

==============================================================================
Revision: d678bf59ed54
Author: Christian A. Reiter <christian...@gmail.com>
Date: Wed Oct 17 16:08:22 2012
Log: check existence of the OpenCV libs; fixme comment

http://code.google.com/p/freemedforms/source/detail?r=d678bf59ed54

Modified:
/plugins/listviewplugin/addremovecombobox.cpp

=======================================
--- /plugins/listviewplugin/addremovecombobox.cpp Wed Oct 17 15:56:23 2012
+++ /plugins/listviewplugin/addremovecombobox.cpp Wed Oct 17 16:08:22 2012
@@ -108,6 +108,7 @@

// set the ComboBox to that row
mCombo->setCurrentIndex(model->rowCount()-1);
+ mRemoveButton->setEnabled(true);

//inform other widgets of successfully added item
Q_EMIT itemAdded(model->index(model->rowCount()-1, 0));
@@ -121,7 +122,7 @@
void AddRemoveComboBox::removeItem()
{
QAbstractItemModel *model = mCombo->model();
- if (model->rowCount() = 0)
+ if (model->rowCount() == 0)
return;

if (!model->removeRow(mCombo->currentIndex())) {
@@ -130,10 +131,11 @@
// check if there are any items left afterwords
const bool enabled = (model->rowCount() > 0);
mRemoveButton->setEnabled(enabled);
- mCombo->setCurrentIndex(mCombo->count() - 1);
+// mCombo->setCurrentIndex(mCombo->count() - 1);

// inform other widgets of change
Q_EMIT itemRemoved();
+
}

/*! Updates the visual state of the UI: enables/disables widgets etc. */
@@ -142,6 +144,7 @@
mRemoveButton->setEnabled(mCombo->currentIndex() != -1);
}

+/*! Reimplemented event handler to handle state changes. Used for language
change. */
void AddRemoveComboBox::changeEvent(QEvent *e)
{
QWidget::changeEvent(e);
@@ -155,7 +158,7 @@
}
}

-/*! Sets the visible text of the ComboBox */
+/*! Sets the visible text of the actual item in the QComboBox. */
void AddRemoveComboBox::setEditText(const QString &text)
{
mCombo->setEditText(text);

==============================================================================
Revision: 3e6ba6512cfd
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 05:08:05 2012
Log: Merge branch 'master' of https://code.google.com/p/freemedforms

http://code.google.com/p/freemedforms/source/detail?r=3e6ba6512cfd



==============================================================================
Revision: e2734f056eca
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 06:13:42 2012
Log: Merge branch 'master' of https://code.google.com/p/freemedforms

http://code.google.com/p/freemedforms/source/detail?r=e2734f056eca



==============================================================================
Revision: cd69a7694045
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:14:59 2012
Log: just a log
http://code.google.com/p/freemedforms/source/detail?r=cd69a7694045

Modified:
/plugins/webcamplugin/webcamplugin.cpp

=======================================
--- /plugins/webcamplugin/webcamplugin.cpp Sun Oct 7 11:01:55 2012
+++ /plugins/webcamplugin/webcamplugin.cpp Thu Oct 18 13:14:59 2012
@@ -189,13 +189,14 @@
*/
void WebcamPlugin::detectDevices()
{
-
+ int nbDevice = 0;
for(int deviceId = 0; deviceId<10; deviceId++) {
cv::VideoCapture cap(deviceId);
cv::Mat frame;
if (cap.isOpened()) {
cap.read(frame);
if (!frame.empty()) {
+ ++nbDevice;
// add WebcamPhotoProvider object to the static list of
providers
bool alreadyThere = false;
foreach(WebcamPhotoProvider *provider,
WebcamPhotoProvider::getProviders()) {
@@ -207,6 +208,7 @@
}
}
}
+ LOG(QString(("Found %1 webcam device").arg(nbDevice));
}

void WebcamPlugin::coreAboutToClose()

==============================================================================
Revision: d803fd27414d
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:16:36 2012
Log: warns
http://code.google.com/p/freemedforms/source/detail?r=d803fd27414d

Modified:
/plugins/formmanagerplugin/formmanager.cpp

=======================================
--- /plugins/formmanagerplugin/formmanager.cpp Sun Oct 7 15:58:32 2012
+++ /plugins/formmanagerplugin/formmanager.cpp Thu Oct 18 13:16:36 2012
@@ -335,7 +335,7 @@

bool readPmhxCategories(const QString &formUuidOrAbsPath)
{
- qWarning() << "readPmhxCategories";
+// qWarning() << "readPmhxCategories";
Q_UNUSED(formUuidOrAbsPath);
// TODO: code here why don't we use the \e formUuidOrAbsPath param?
// get all form readers (IFormIO)

==============================================================================
Revision: f24f00ce1df4
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:21:05 2012
Log: missing )
http://code.google.com/p/freemedforms/source/detail?r=f24f00ce1df4

Modified:
/plugins/webcamplugin/webcamplugin.cpp

=======================================
--- /plugins/webcamplugin/webcamplugin.cpp Thu Oct 18 13:14:59 2012
+++ /plugins/webcamplugin/webcamplugin.cpp Thu Oct 18 13:21:05 2012
@@ -208,7 +208,7 @@
}
}
}
- LOG(QString(("Found %1 webcam device").arg(nbDevice));
+ LOG(QString(("Found %1 webcam device").arg(nbDevice)));
}

void WebcamPlugin::coreAboutToClose()

==============================================================================
Revision: ca8f299b0afd
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:27:08 2012
Log: pfiou...
http://code.google.com/p/freemedforms/source/detail?r=ca8f299b0afd

Modified:
/plugins/webcamplugin/webcamplugin.cpp

=======================================
--- /plugins/webcamplugin/webcamplugin.cpp Thu Oct 18 13:21:05 2012
+++ /plugins/webcamplugin/webcamplugin.cpp Thu Oct 18 13:27:08 2012
@@ -208,7 +208,7 @@
}
}
}
- LOG(QString(("Found %1 webcam device").arg(nbDevice)));
+ LOG(QString("Found %1 webcam device").arg(nbDevice));
}

void WebcamPlugin::coreAboutToClose()

==============================================================================
Revision: 5169e0732f74
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:33:02 2012
Log: objectname
http://code.google.com/p/freemedforms/source/detail?r=5169e0732f74

Modified:
/plugins/webcamplugin/webcamplugin.cpp

=======================================
--- /plugins/webcamplugin/webcamplugin.cpp Thu Oct 18 13:27:08 2012
+++ /plugins/webcamplugin/webcamplugin.cpp Thu Oct 18 13:33:02 2012
@@ -62,7 +62,8 @@
{
if (Utils::Log::warnPluginsCreation())
qWarning() << "creating Webcam";
-
+ setObjectName("WebcamPlugin");
+
// Add Translator to the Application
Core::ICore::instance()->translators()->addNewTranslator("webcam");


==============================================================================
Revision: 35c1a709a4af
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:33:31 2012
Log: bug: after the first run, form is not correctly loaded
http://code.google.com/p/freemedforms/source/detail?r=35c1a709a4af

Modified:
/plugins/formmanagerplugin/formmanagerplugin.cpp

=======================================
--- /plugins/formmanagerplugin/formmanagerplugin.cpp Thu Oct 4 01:33:28
2012
+++ /plugins/formmanagerplugin/formmanagerplugin.cpp Thu Oct 18 13:33:31
2012
@@ -142,15 +142,17 @@

// Check FirstRun Default Form
const QString &uid = settings()->defaultForm();
+// qWarning() << uid;
if (!uid.isEmpty()) {
episodeBase()->setGenericPatientFormFile(uid);
formManager().readPmhxCategories(uid);
+ formManager().loadPatientFile();
settings()->setDefaultForm("");
+ } else {
+ // reload patient file just to emit patientFormsLoaded
+ formManager().readPmhxCategories("");
+ formManager().loadPatientFile();
}
-
- // reload patient file just to emit patientFormsLoaded
- formManager().readPmhxCategories("");
- formManager().loadPatientFile();
}

ExtensionSystem::IPlugin::ShutdownFlag FormManagerPlugin::aboutToShutdown()

==============================================================================
Revision: 9e3d9b0a5915
Author: eric.maeker <eric....@gmail.com>
Date: Thu Oct 18 13:33:57 2012
Log: Merge branch 'master' of https://code.google.com/p/freemedforms

http://code.google.com/p/freemedforms/source/detail?r=9e3d9b0a5915