From cc4784e21be549fed648ce8473c0aea18b010453 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Mon, 24 Sep 2007 12:55:34 +0000
Subject: More changes to the examples xmls. Also removed some stray debug
 output from macro xml parser.

---
 server/src/macro_parser.cc | 4 ++--
 server/xml/example.xml     | 2 +-
 server/xml/patient.xml     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'server')

diff --git a/server/src/macro_parser.cc b/server/src/macro_parser.cc
index c317482..aeeb84f 100644
--- a/server/src/macro_parser.cc
+++ b/server/src/macro_parser.cc
@@ -53,7 +53,7 @@ static void start_hndl(void *p, const char *el, const char **attr)
 {
   MacroParser *parser = (MacroParser*)XML_GetUserData(p);
 
-  printf("Start tag [%s]\n", el);
+  //  printf("Start tag [%s]\n", el);
 
   // Convert to comfy C++ values...
   std::string name = el;
@@ -114,7 +114,7 @@ static void end_hndl(void *p, const char *el)
 {
   MacroParser *parser = (MacroParser*)XML_GetUserData(p);
  
-  printf("End tag [%s]\n", el);
+  //  printf("End tag [%s]\n", el);
 
   if(std::string("include") != el) parser->stack.pop_back();
 
diff --git a/server/xml/example.xml b/server/xml/example.xml
index 436aa2d..4bd7c80 100644
--- a/server/xml/example.xml
+++ b/server/xml/example.xml
@@ -3,7 +3,7 @@
   <window name="mainwindow"
           caption="Fundus"
           width="500"
-          height="500"
+          height="560"
           layout="vbox">
     <include name="patient"/>
     <frame name="spl_frame" caption="Spl:" layout="vbox">
diff --git a/server/xml/patient.xml b/server/xml/patient.xml
index 751f8f0..5afe1ea 100644
--- a/server/xml/patient.xml
+++ b/server/xml/patient.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <macro name="patient" version="1.0">
-  <frame name="cpr_frame" caption="CPR" layout="vbox">
+  <frame name="cpr_frame" caption="CPR og navn" layout="vbox">
     <lineedit name="patient_cpr" regexp="\d{6}-{0,1}\d{4}" value=""/>
-  </frame>
-  <frame name="name_frame" caption="Navn:" layout="vbox">
     <lineedit name="patient_navn" regexp=".+" value=""/>
+  </frame>
+  <frame name="name_frame" caption="Noter" layout="vbox">
     <textedit name="patient_note" regexp=".*" value=""/>
   </frame>
 </macro>
-- 
cgit v1.2.3