Changeset 479 for trunk

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

Files:

• Colors/colorbar.pro (modified) (1 diff)
• Colors/getcolor.pro (modified) (2 diffs)
• Colors/lct.pro (modified) (2 diffs)
• Postscript/closeps.pro (modified) (2 diffs)
• ToBeReviewed/PLOTS/DESSINE/pltv.pro (modified) (1 diff)
• ToBeReviewed/PLOTS/DESSINE/tvplus.pro (modified) (2 diffs)
• ToBeReviewed/PLOTS/DIVERS/givewindowsize.pro (modified) (3 diffs)
• ToBeReviewed/PLOTS/DIVERS/placedessin.pro (modified) (2 diffs)
• ToBeReviewed/PLOTS/LABEL/label.pro (modified) (1 diff)
• ToBeReviewed/TRIANGULATION/dessinetri.pro (modified) (1 diff)
• ToBeReviewed/WIDGET/AUTOUR_de_XXX/letsdraw.pro (modified) (1 diff)
• Utilities/isbatch.pro (deleted)
• Utilities/set_default_device.pro (added)
• buildinit.pro (modified) (1 diff)

trunk/SRC/Colors/colorbar.pro

@@ -132 +132 @@
                                 ; Check and define keywords.
 
-   IF N_ELEMENTS(ncolors) EQ 0 THEN BEGIN
-
-; Most display devices to not use the 256 colors available to
-; the PostScript device. This presents a problem when writing
-; general-purpose programs that can be output to the display or
-; to the PostScript device. This problem is especially bothersome
-; if you don't specify the number of colors you are using in the
-; program. One way to work around this problem is to make the
-; default number of colors the same for the display device and for
-; the PostScript device. Then, the colors you see in PostScript are
-; identical to the colors you see on your display. Here is one way to
-; do it.
-
-      IF postScriptDevice THEN BEGIN
-         oldDevice = !D.NAME
-
-; What kind of computer are we using? SET_PLOT to appropriate
-; display device.
-
-         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
-
-; Open a window (to make sure !D.N_COLORS is accurate).
-
-         WINDOW, /FREE, /PIXMAP, XSIZE=10, YSIZE=10
-         WDELETE, !D.WINDOW
-
-; Here is how many colors we should use.
-
-         ncolors = !D.N_COLORS
-         SET_PLOT, oldDevice
-         IF oldDevice EQ 'X' OR oldDevice EQ 'MAC' OR oldDevice EQ 'WIN' then BEGIN
-            !p.BACKGROUND=(!d.n_colors-1) < 255
-            !p.color=0
-            if !d.n_colors gt 256 then !p.background='ffffff'x
-         ENDIF
-      ENDIF ELSE ncolors = !D.N_COLORS
-   ENDIF
+   IF N_ELEMENTS(ncolors) EQ 0 THEN ncolors = !D.N_COLORS < 256
    IF N_ELEMENTS(bottom) EQ 0 THEN bottom = 0B
    IF N_ELEMENTS(cb_charsize) EQ 0 THEN cb_charsize = 1.0

trunk/SRC/Colors/getcolor.pro

@@ -250 +250 @@
 
    IF Float(!Version.Release) GE 5.2 THEN BEGIN
-      IF (!D.Name EQ 'X' OR !D.Name EQ 'WIN' OR !D.Name EQ 'MAC') THEN BEGIN
+      IF (!D.Name EQ 'X' OR !D.Name EQ 'WIN' OR !D.Name EQ 'Z') THEN BEGIN
          Device, Get_Decomposed=decomposedState
       ENDIF ELSE decomposedState = 0
@@ -332 +332 @@
 IF Float(!Version.Release) GE 5.2 THEN BEGIN
 
-      IF (!D.Name EQ 'X' OR !D.Name EQ 'WIN' OR !D.Name EQ 'MAC') THEN BEGIN
+      IF (!D.Name EQ 'X' OR !D.Name EQ 'WIN' OR !D.Name EQ 'Z') THEN BEGIN
          Device, Get_Decomposed=decomposedState
       ENDIF ELSE decomposedState = 0

trunk/SRC/Colors/lct.pro

@@ -52 +52 @@
     if n_elements(ex) NE 0 then $
        if (where(tag_names(ex) EQ 'FILE'))[0] NE -1 then ex.FILE = nametbl
-; if we are in POSTSCRIPT mode, we have to pass in X mode in order to change the color palette
-    oldname = !d.name
-    ;++if !d.name EQ 'PS' OR !d.name EQ 'Z' then BEGIN
-    if !d.name EQ 'PS' then BEGIN
-      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
-    ENDIF
 ;
     if arg_present(get_name) then begin
@@ -78 +62 @@
     ENDELSE
 ;
-    if oldname EQ 'PS' AND keyword_set(lightness) then palit, lightness
+    if !d.name EQ 'PS' AND keyword_set(lightness) then palit, lightness
 ;
-    set_plot, oldname
-    IF oldname EQ 'X' OR oldname EQ 'MAC' OR oldname EQ 'WIN' then BEGIN
-      !p.BACKGROUND = (!d.n_colors-1) < 255
-      !p.color = 0
-      if !d.n_colors gt 256 then !p.background = 'ffffff'x
-    ENDIF
-
   ENDIF ELSE ras = report('The file containing the color palettes doesn''t exist...')
 

trunk/SRC/Postscript/closeps.pro

@@ -89 +89 @@
 last_part:
 ;
-   thisOS = strupcase(strmid(!version.os_family, 0, 3))
-   CASE thisOS of
-     'MAC': SET_PLOT, thisOS
-     'WIN': SET_PLOT, thisOS
-     ELSE: SET_PLOT, 'X'
-   ENDCASE
    def_myuniquetmpdir
    colorfile = myuniquetmpdir + 'original_colors.dat'
@@ -104 +98 @@
    ENDIF
    !p.font = -1
-; force background color to the last color (white)
-   !p.BACKGROUND=(!d.n_colors-1) < 255
-   !p.color=0
-   if !d.n_colors gt 256 then !p.background='ffffff'x
+   set_default_device
 ;------------------------------------------------------------
    if keyword_set(infowidget) then $

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

trunk/SRC/ToBeReviewed/TRIANGULATION/dessinetri.pro

@@ -74 +74 @@
 ;
    IF keyword_set(changecolor) THEN BEGIN
-      oldname = !d.name
-      if !d.name EQ 'PS' OR !d.name EQ 'Z' then BEGIN
-         thisos = strupcase(strmid(!version.os_family, 0, 3))
-         CASE thisOS of
-            'MAC': set_plot, thisOS
-            'WIN': set_plot, thisOS
-            ELSE: set_plot, 'X'
-         ENDCASE
-         ncolors=(!d.n_colors-1) < 255
-         set_plot, oldname
-       ENDIF ELSE ncolors=(!d.n_colors-1) < 255
-       color = 1+indgen(changecolor)*(ncolors/(changecolor-1))
-     ENDIF ELSE color = 0
-     color = color#replicate(1, n_elements(tri)/3/n_elements(color)+1)
+     ncolors = (!d.n_colors-1) < 255
+     color = 1+indgen(changecolor)*(ncolors/(changecolor-1))
+   ENDIF ELSE color = 0
+   color = color#replicate(1, n_elements(tri)/3/n_elements(color)+1)
 ;
    tempdeux = systime(1)         ; For key_performance =2

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/letsdraw.pro

@@ -58 +58 @@
 ; We select it (we will pass to it all commands concerning the window)
    wset, win
-;   erase, 255                       ; we clean the window
-; We make sure that, if we work with a screen coding colors on 24 bits, the specified background color !p.background is the one applied.
-;    if !d.n_colors gt 256 then begin
-;       device, decomposed=1
-;       !p.background='ffffff'x
-;       plot,[0],[0]
-;       device, decomposed=0
-;    ENDIF
-;
+
    smallout = long(extractatt(top_uvalue, 'smallout'))
    numdessinout = smallout[2]-1

trunk/SRC/buildinit.pro

@@ -521 +521 @@
           , '; colors ...' $
           , ';' $
-          , 'device, decomposed = 0' $
-          , 'device, retain = 2']
+          , 'set_default_device']
 ;
 ; default color tables