[Mapbender-commits] r1394 - trunk/mapbender/http/print

[svn_mapbender at osgeo.org]

Author: sven
Date: 2007-05-30 10:36:29 -0400 (Wed, 30 May 2007)
New Revision: 1394

Modified:
   trunk/mapbender/http/print/mod_printPDF.php
   trunk/mapbender/http/print/mod_printPDF_pdf.php
   trunk/mapbender/http/print/printPDF.conf
   trunk/mapbender/http/print/printPDF_b.conf
   trunk/mapbender/http/print/print_functions.php
Log:


Modified: trunk/mapbender/http/print/mod_printPDF.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF.php	2007-05-30 14:06:02 UTC (rev 1393)
+++ trunk/mapbender/http/print/mod_printPDF.php	2007-05-30 14:36:29 UTC (rev 1394)
@@ -286,28 +286,25 @@
 		
 		// write the measured coordinates
 		
-		if (pt.mod_measure_RX != undefined && pt.mod_measure_RY != undefined){
-		
-		var tmp_x = '';
-		var tmp_y = '';
-		var tmp_dist = '';
-		for(i = 0; i<pt.mod_measure_RX.length; i++) {
-			if(tmp_x != '') {
-				tmp_x += ','
+		if (pt.mod_measure_RX != undefined && pt.mod_measure_RY != undefined) {
+			var tmp_x = '';
+			var tmp_y = '';
+			for(i = 0; i<pt.mod_measure_RX.length; i++) {
+				if(tmp_x != '') {
+					tmp_x += ','
+				}
+				tmp_x += pt.mod_measure_RX[i];
 			}
-			tmp_x += pt.mod_measure_RX[i];
-		}
-		for(i = 0; i<pt.mod_measure_RY.length; i++) {
-			if(tmp_y != '') {
-				tmp_y += ','
+			for(i = 0; i<pt.mod_measure_RY.length; i++) {
+				if(tmp_y != '') {
+					tmp_y += ','
+				}
+				tmp_y += pt.mod_measure_RY[i];
 			}
-			tmp_y += pt.mod_measure_RY[i];
+			document.forms['form1'].elements['measured_x_values'].value = tmp_x;
+			document.forms['form1'].elements['measured_y_values'].value = tmp_y;
 		}
-		document.forms['form1'].elements['measured_x_values'].value = tmp_x;
-		document.forms['form1'].elements['measured_y_values'].value = tmp_y;
 		
-		}
-		
 		document.form1.submit();
 	}
 	else{

Modified: trunk/mapbender/http/print/mod_printPDF_pdf.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF_pdf.php	2007-05-30 14:06:02 UTC (rev 1393)
+++ trunk/mapbender/http/print/mod_printPDF_pdf.php	2007-05-30 14:36:29 UTC (rev 1394)
@@ -456,8 +456,8 @@
 $theMeasureConfigArray = array(
    "do_fill" => FALSE,
      "fill_color" => array(
-     "r" => "0.95",
-     "g" => "0.95",
+     "r" => "0.01",
+     "g" => "0.01",
      "b" => "0.95"
    ),
    "do_stroke" => TRUE,
@@ -473,9 +473,7 @@
        "dash" => array(10, 6)
        )
    );
-$use_r = 180 / 255;
-$use_g = 206 / 255;
-$use_b = 140 / 255;
+
 addMeasuredItem(&$pdf, $_POST['measured_x_values'], $_POST['measured_y_values'], $theMeasureConfigArray);
 hideElementsOutsideMapframe(&$pdf);
 
@@ -714,7 +712,9 @@
 						//$pdf->ezText($url, 9, array('spacing'=>1.2));
 						//print the picture / Bild schreiben
 						$pdf->ezImage($legendFilename, 0, 'width', 'none', 'left');
-						unlink($legendFilename);
+						if($unlink == true){
+							unlink($legendFilename);
+						}
 						
 					} //if legendurl
 				}// for legendurl
@@ -757,8 +757,25 @@
 			}// for layers
 		} //if wms_id not 0
 	}// for wms
-
-
+	
+	/****
+    * USER POLYGON:
+    */
+   if($_POST['measured_x_values'] != ""
+      && $_POST['measured_y_values'] != ""
+        && is_file($legendFilenameUserPolygon)) {
+     // lade Bild:
+       $myY = $pdf->ezText("<b>Eingezeichnetes Element</b>", 11);
+       $pdf->ezSetDy(-15);
+       $pdf->ezImage($legendFilenameUserPolygon, 5, 15, 'none', 'left');
+       if($unlink == true){
+       		unlink($legendFilenameUserPolygon);
+       }
+       $pdf->ezSetY($myY - 7);
+       $pdf->ezText("Element", 11, array("left" => 25));
+             // lösche Bild:
+   } 
+	
 $pdf->ezText($legendFooter, 11);
 }//legend true
 /* ------------------------ 

Modified: trunk/mapbender/http/print/printPDF.conf
===================================================================
--- trunk/mapbender/http/print/printPDF.conf	2007-05-30 14:06:02 UTC (rev 1393)
+++ trunk/mapbender/http/print/printPDF.conf	2007-05-30 14:36:29 UTC (rev 1394)
@@ -24,6 +24,7 @@
 $legend=true;
 $label_legend = 'Legende drucken';
 $legendFilename = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
+$legendFilenameUserPolygon = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
 $legendText = "Legende";
 $legendFooter = "powered by Mapbender";
 $legendImage = "./img/mapbender_logo.png";

Modified: trunk/mapbender/http/print/printPDF_b.conf
===================================================================
--- trunk/mapbender/http/print/printPDF_b.conf	2007-05-30 14:06:02 UTC (rev 1393)
+++ trunk/mapbender/http/print/printPDF_b.conf	2007-05-30 14:36:29 UTC (rev 1394)
@@ -24,6 +24,7 @@
 $legend=true;
 $label_legend = 'print legend';
 $legendFilename = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
+$legendFilenameUserPolygon = TMPDIR."/legend_".substr(md5(uniqid(rand())),0,7).".png";
 $legendText = "Legende";
 $legendFooter = "powered by Mapbender";
 $legendImage = "./img/mapbender_logo.png";

Modified: trunk/mapbender/http/print/print_functions.php
===================================================================
--- trunk/mapbender/http/print/print_functions.php	2007-05-30 14:06:02 UTC (rev 1393)
+++ trunk/mapbender/http/print/print_functions.php	2007-05-30 14:36:29 UTC (rev 1394)
@@ -214,7 +214,7 @@
 
 	// get the arrays
 	$theFullArr = makeCoordPairs($x_value_str, $y_value_str);
-  $thePolyArr = makePolyFromCoord($theFullArr);
+    $thePolyArr = makePolyFromCoord($theFullArr);
 	
 	if (isClosedPolygon($theFullArr)) {
 	  $nr_of_points = count($theFullArr);