Changeset 479 for trunk/SRC/ToBeReviewed/PLOTS

Timestamp:

08/17/12 12:18:32 (12 years ago)

Author:

smasson

Message:

full integration of the batch mode with Z buffer

Location:

trunk/SRC/ToBeReviewed/PLOTS

Files:

• DESSINE/pltv.pro (modified) (1 diff)
• DESSINE/tvplus.pro (modified) (2 diffs)
• DIVERS/givewindowsize.pro (modified) (3 diffs)
• DIVERS/placedessin.pro (modified) (2 diffs)
• LABEL/label.pro (modified) (1 diff)

trunk/SRC/ToBeReviewed/PLOTS/DESSINE/pltv.pro

@@ -177 +177 @@
    xsize = !p.position[2] - !p.position[0]
    ysize = !p.position[3] - !p.position[1]
-   IF !d.name EQ 'X' THEN BEGIN
+   IF !d.name EQ 'X' OR !d.name EQ 'Z' THEN BEGIN
      xsize = ceil(xsize * !d.x_size)
      ysize = ceil(ysize * !d.y_size)

trunk/SRC/ToBeReviewed/PLOTS/DESSINE/tvplus.pro

@@ -203 +203 @@
     window, window, xsize = nx+marginpix[0]+marginpix[1] $
             , ysize = ny+marginpix[2]+marginpix[3]
-; for 24 bits colors, make sure that the background color is the good one...
-    if !d.n_colors gt 256 then BEGIN
-      device, decomposed = 1
-      !p.background = 'ffffff'x
-      plot, [0], [0], xstyle = 5, ystyle = 5
-      device, decomposed = 0
-    endif
     tv, arr, marginpix[0], marginpix[2], _EXTRA = ex
 ;
@@ -245 +238 @@
 ; scrolling bar window case...
 ;------------------------------------------------------------
-; for 24 bits colors, make sure that the background color is the good one...
-    if !d.n_colors gt 256 then begin
-      window, /pixmap
-      device, decomposed = 1
-      !p.background = 'ffffff'x
-      plot, [0], [0]
-      device, decomposed = 0
-    endif
     slide_image, arr $          ; We draw it in a window with a scrolling bar
                  , xsize = nx, ysize = ny $

trunk/SRC/ToBeReviewed/PLOTS/DIVERS/givewindowsize.pro

@@ -6 +6 @@
 ;
 ; @returns
+;
+; @keyword dpi {in}{optional}{type=scalar}{default=72}
+; used only in z buffer. specify the number of dots per inch.
+; used to define the size of the virtual window activated in the Z buffer.
+;
+; @keyword _EXTRA
+; Used to pass keywords
 ;
 ; @uses
@@ -20 +27 @@
 ; @todo seb
 ;-
-FUNCTION givewindowsize
+FUNCTION givewindowsize, dpi = dpi, _extra = ex
 ;
   compile_opt idl2, strictarrsubs
@@ -30 +37 @@
 ;------------------------------------------------------------
 ;
-   dimensions = get_screen_size(RESOLUTION=resolution)
-   coef = floor(1./resolution[0])
+   IF !d.name EQ 'Z' THEN BEGIN
+     IF NOT keyword_set(dpi) THEN dpi = 72
+     coef = dpi/2.54 ; 1 inch = 2.54 cm
+   ENDIF ELSE BEGIN 
+     dimensions = get_screen_size(RESOLUTION = resolution)
+     coef = floor(1./resolution[0])
+   ENDELSE
    if NOT keyword_set(windowsize_scale) then BEGIN
      windowsize_scale = 1.

trunk/SRC/ToBeReviewed/PLOTS/DIVERS/placedessin.pro

@@ -240 +240 @@
     keyword_set(post) AND !d.name ne 'PS':openps, _extra = ex
 ; case of the first drawing on a screen
-    keyword_set(post) EQ 0 AND keyword_set(noerase) EQ 0 $
-      AND !d.name ne 'PS' AND !d.name ne 'Z':BEGIN
-      if not keyword_set(window) then window = 0
+    keyword_set(post) EQ 0 AND keyword_set(noerase) EQ 0 AND !d.name ne 'PS':BEGIN
 ; For the using of \@ps,\@oups and \@vzoom
       if lmgr(/demo) EQ 0 then BEGIN ; Are we in the demo mode??
@@ -253 +251 @@
         journal, listecommande ; We write it in the journal
       ENDIF
-      windsize = givewindowsize()
-      window, window, xsize = windsize[0], ysize = windsize[1],  retain = 2, _extra = ex
-; When we used colors which are coded on 24bit, we can not stipulate the background color
-; of a window thanks to !p.background, so we have to to this:
-;          if !d.n_colors gt 256 then begin
-;             device, decomposed=1
-;             !p.background='ffffff'x
-;             plot,[0],[0], /nodata, xstyle = 4, ystyle = 4
-;             device, decomposed=0
-;          endif
+      windsize = givewindowsize(_extra = ex)
+      IF !d.name EQ 'Z' THEN BEGIN
+        device, set_resolution = windsize
+        erase
+      ENDIF ELSE BEGIN 
+        if not keyword_set(window) then winnumb = 0
+        window, winnumb, xsize = windsize[0], ysize = windsize[1],  retain = 2, _extra = ex
+      ENDELSE
     END
     ELSE:

trunk/SRC/ToBeReviewed/PLOTS/LABEL/label.pro

@@ -51 +51 @@
 ;
 @common
-   if !d.name EQ 'PS' OR !d.name EQ 'Z' then BEGIN
-      old_dname = !d.name
-      thisOS = !VERSION.OS_FAMILY
-      thisOS = STRMID(thisOS, 0, 3)
-      thisOS = STRUPCASE(thisOS)
-      CASE thisOS of
-         'MAC': SET_PLOT, thisOS
-         'WIN': SET_PLOT, thisOS
-         ELSE: SET_PLOT, 'X'
-      ENDCASE
-      !p.BACKGROUND=(!d.n_colors-1) < 255
-      !p.color=0
-      if !d.n_colors gt 256 then !p.background='ffffff'x
-      ncoul = !D.n_Colors < 256
-      set_plot,old_dname
-   ENDIF ELSE ncoul = !D.n_Colors < 256
+;
+   ncoul = !D.n_Colors < 256
    case cas of
       0: begin