Changeset 41320 for trunk

Timestamp:

Apr 1, 2020, 4:11:54 PM (6 years ago)

Author:

eugene

Message:

add PDF native support

Location:

trunk/Ohana/src/kapa2

Files:

• Makefile (modified) (4 diffs)
• include/prototypes.h (modified) (1 diff)
• include/structures.h (modified) (1 diff)
• src/CheckPipe.c (modified) (1 diff)
• src/PDF_Alpha.c (added)
• src/PDF_Frame.c (added)
• src/PDF_Image.c (added)
• src/PDF_Labels.c (added)
• src/PDF_Objects.c (added)
• src/PDF_Overlay.c (added)
• src/PDF_Pixmap.c (added)
• src/PDF_PrintUtils.c (added)
• src/PDF_Textlines.c (added)
• src/PDFit.c (added)

trunk/Ohana/src/kapa2/Makefile

@@ -23 +23 @@
 install: $(DESTBIN)/kapa
 
+PDF = \
+$(SRC)/PDFit.$(ARCH).o                  \
+$(SRC)/PDF_Frame.$(ARCH).o              \
+$(SRC)/PDF_Objects.$(ARCH).o            \
+$(SRC)/PDF_Labels.$(ARCH).o             \
+$(SRC)/PDF_Image.$(ARCH).o              \
+$(SRC)/PDF_Overlay.$(ARCH).o            \
+$(SRC)/PDF_Textlines.$(ARCH).o          \
+$(SRC)/PDF_Pixmap.$(ARCH).o             \
+$(SRC)/PDF_Alpha.$(ARCH).o              \
+$(SRC)/PDF_PrintUtils.$(ARCH).o 
+
+BDRAW = \
+$(SRC)/bDrawIt.$(ARCH).o                \
+$(SRC)/bDrawFrame.$(ARCH).o             \
+$(SRC)/bDrawObjects.$(ARCH).o           \
+$(SRC)/bDrawLabels.$(ARCH).o            \
+$(SRC)/bDrawImage.$(ARCH).o             \
+$(SRC)/bDrawOverlay.$(ARCH).o 
+
+PSFILES = \
+$(SRC)/PSit.$(ARCH).o                   \
+$(SRC)/PSFrame.$(ARCH).o                \
+$(SRC)/PSObjects.$(ARCH).o              \
+$(SRC)/PSLabels.$(ARCH).o               \
+$(SRC)/PSimage.$(ARCH).o                \
+$(SRC)/PSOverlay.$(ARCH).o              \
+$(SRC)/PSTextlines.$(ARCH).o            \
+$(SRC)/PSPixmap.$(ARCH).o
+
 KAPA = \
 $(SRC)/kapa.$(ARCH).o                     $(SRC)/args.$(ARCH).o               \
@@ -38 +68 @@
 $(SRC)/DrawObjects.$(ARCH).o              $(SRC)/DrawFrame.$(ARCH).o          \
 $(SRC)/DrawTextlines.$(ARCH).o            $(SRC)/DrawLabels.$(ARCH).o         \
-$(SRC)/PSObjects.$(ARCH).o                $(SRC)/PSFrame.$(ARCH).o            \
-$(SRC)/PSLabels.$(ARCH).o                 $(SRC)/PSTextlines.$(ARCH).o        \
-$(SRC)/bDrawObjects.$(ARCH).o             $(SRC)/bDrawFrame.$(ARCH).o         \
-$(SRC)/bDrawLabels.$(ARCH).o              $(SRC)/bDrawIt.$(ARCH).o            \
-$(SRC)/bDrawImage.$(ARCH).o               $(SRC)/MemoryDump.$(ARCH).o         \
+$(SRC)/MemoryDump.$(ARCH).o           \
 $(SRC)/PNGit.$(ARCH).o                    $(SRC)/PPMit.$(ARCH).o              \
-$(SRC)/PSit.$(ARCH).o                     $(SRC)/CrossHairs.$(ARCH).o         \
 $(SRC)/CheckPipe.$(ARCH).o                $(SRC)/EventLoop.$(ARCH).o          \
 $(SRC)/Reconfig.$(ARCH).o                 $(SRC)/Refresh.$(ARCH).o            \
@@ -52 +77 @@
 $(SRC)/ErasePlots.$(ARCH).o               $(SRC)/EraseImage.$(ARCH).o         \
 $(SRC)/EraseCurrentPlot.$(ARCH).o         $(SRC)/EraseSections.$(ARCH).o      \
-$(SRC)/SetToolbox.$(ARCH).o                                                   \
+$(SRC)/SetToolbox.$(ARCH).o               $(SRC)/CrossHairs.$(ARCH).o         \
 $(SRC)/SetSection.$(ARCH).o               $(SRC)/DefineSection.$(ARCH).o      \
 $(SRC)/SetLimits.$(ARCH).o                $(SRC)/SetFont.$(ARCH).o            \
@@ -75 +100 @@
 $(SRC)/CheckButtons.$(ARCH).o             $(SRC)/InvertButton.$(ARCH).o       \
 $(SRC)/UpdatePointer.$(ARCH).o            $(SRC)/JPEGit24.$(ARCH).o           \
-$(SRC)/bDrawOverlay.$(ARCH).o             $(SRC)/ButtonFunctions.$(ARCH).o    \
-$(SRC)/PSimage.$(ARCH).o                  $(SRC)/PSPixmap.$(ARCH).o           \
-$(SRC)/PSOverlay.$(ARCH).o                $(SRC)/SetChannel.$(ARCH).o         \
+$(SRC)/ButtonFunctions.$(ARCH).o    \
+$(SRC)/SetChannel.$(ARCH).o         \
 $(SRC)/SetColorScale.$(ARCH).o            $(SRC)/ColorCube.$(ARCH).o          \
 $(SRC)/ColorHistogram.$(ARCH).o           $(SRC)/CreateWide.$(ARCH).o
 
-OBJ  =  $(KAPA)
+OBJ  =  $(KAPA) $(PDF) $(BDRAW) $(PSFILES)
 
 # dependancy rules for include files ########################

trunk/Ohana/src/kapa2/include/prototypes.h

@@ -120 +120 @@
 void          FreeLayout          PROTO((void));
 
+/* PDF drawing primitives */
+double        PDF_SetLineWeight  PROTO((IOBuffer *buffer, double lweightIn));
+void          PDF_SetKapaColor   PROTO((IOBuffer *buffer, bDrawColor color));
+void          PDF_SetScaledColor PROTO((IOBuffer *buffer, float *pixel1, float *pixel2, float *pixel3, float value, int Npixels));
+void          PDF_DrawCircle     PROTO((IOBuffer *buffer, float Xc, float Yc, float R, int isFill));
+
+/* PDF print utils */
+PDF_FILE     *PDF_Open           PROTO((char *filename));
+int           PDF_Print          PROTO((PDF_FILE *obj, int newObject, char *format, ...));
+int           PDF_Close          PROTO((PDF_FILE *obj));
+int           PDF_CreateStream   PROTO((IOBuffer *buffer, float scale, int Xoff, int Yoff));
+int           PDF_WriteStream    PROTO((PDF_FILE *obj, IOBuffer *buffer));
+int           PDF_WriteImage     PROTO((PDF_FILE *obj, IOBuffer *buffer, int dX, int dY));
+void          PDF_AlphaDump      PROTO((PDF_FILE *obj));
+void          PDF_AlphaSet       PROTO((Gobjects *object, IOBuffer *buffer));
+void          PDF_AlphaInit      PROTO(());
+
+/* PDF drawing utilities */
+int           PDFcommand          PROTO((int sock));
+int           PDFit               PROTO((char *filename, char *pagename, int scaleMode, int pageMode));
+int           PDF_Frame           PROTO((KapaGraphWidget *graph, IOBuffer *buffer));
+int           PDF_Objects         PROTO((KapaGraphWidget *graph, IOBuffer *buffer));
+void          PDF_Labels          PROTO((KapaGraphWidget *graph, IOBuffer *buffer));
+void          PDF_Textlines       PROTO((KapaGraphWidget *graph, IOBuffer *buffer));
+int           PDF_ObjectsN        PROTO((KapaGraphWidget *graph, Gobjects *objects, IOBuffer *buffer));
+void          PDF_Connect         PROTO((KapaGraphWidget *graph, Gobjects *objects, IOBuffer *buffer));
+void          PDF_Histogram       PROTO((KapaGraphWidget *graph, Gobjects *objects, IOBuffer *buffer));
+void          PDF_Points          PROTO((KapaGraphWidget *graph, Gobjects *objects, IOBuffer *buffer));
+void          PDF_XErrors         PROTO((KapaGraphWidget *graph, Gobjects *objects, IOBuffer *buffer));
+void          PDF_YErrors         PROTO((KapaGraphWidget *graph, Gobjects *objects, IOBuffer *buffer));
+void          PDF_Tick            PROTO((Graphic *graphic, Axis *axis, int P, TickMarkData *tick, int naxis, IOBuffer *buffer));
+void          PDF_ClipLine        PROTO((double x0, double y0, double x1, double y1, double X0, double Y1, double X1, double Y0, IOBuffer *buffer));
+int           PDF_Image           PROTO((PDF_FILE *obj, KapaImageWidget *image, IOBuffer *buffer));
+void          PDF_Overlay         PROTO((KapaImageWidget *image, int N, IOBuffer *buffer, int extra));
+void          PDF_Pixmap          PROTO((Graphic *graphic, KapaImageWidget *image, IOBuffer *buffer));
+
 /* PS drawing utilities */
 int           PSit                PROTO((char *filename, char *pagename, int scaleMode, int pageMode));

trunk/Ohana/src/kapa2/include/structures.h

@@ -250 +250 @@
   char *name;
 } Section;
+
+typedef struct {
+  FILE *f;
+  int Nsegment;
+  int NSEGMENT;
+  int *offset;
+  int *objnum;
+
+  int Nstream;
+  int NSTREAM;
+  int *streamObjnum;
+
+  int Nimage;
+  int NIMAGE;
+  int *imageObjnum;
+} PDF_FILE;
+

trunk/Ohana/src/kapa2/src/CheckPipe.c

@@ -94 +94 @@
   }
   
+  if (!strcmp (word, "PDFT")) {
+    status = PDFcommand (sock);
+    KiiSendCommand (sock, 4, "DONE");
+    FINISHED (status);
+  }
+  
   if (!strcmp (word, "PNGF")) {
     status = PNGcommand (sock);