Changeset 383 for trunk/gui/vizservers

Timestamp:

Mar 28, 2006, 2:27:09 PM (19 years ago)

Author:

qiaow

Message:

Added Event class for recording user input.

Location:

trunk/gui/vizservers/nanovis

Files:

• Event.cpp (added)
• Event.h (added)
• Makefile (modified) (3 diffs)
• ParticleSystem.cpp (modified) (2 diffs)
• config.h (modified) (1 diff)
• nanovis.cpp (modified) (19 diffs)
• nanovis.h (modified) (1 diff)
• socket/RenderClient.cpp (modified) (7 diffs)
• transfer-function/ColorGradientGLUTWindow.cpp (modified) (3 diffs)
• transfer-function/MainWindow.cpp (modified) (3 diffs)
• transfer-function/TransferFunctionGLUTWindow.cpp (modified) (5 diffs)

trunk/gui/vizservers/nanovis/Makefile

@@ -2 +2 @@
                 Texture1D.o Texture3D.o Volume.o Texture2D.o ParticleSystem.o Sphere.o Color.o \
                 PerfQuery.o TransferFunction.o ControlPoint.o ColorGradient.o ColorPaletteWindow.o\
-                ColorGradientGLUTWindow.o TransferFunctionGLUTWindow.o MainWindow.o
+                ColorGradientGLUTWindow.o TransferFunctionGLUTWindow.o MainWindow.o Event.o
+OBJ_CLIENT = Socket.o ClientSocket.o RenderClient.o
 
 AUXSRC = config.h define.h global.h
@@ -14 +15 @@
 CFLAG = -g -c -Wall -I../src2/core
 
-all: nanovis 
+all: nanovis client
 
 clean:
@@ -40 +41 @@
         gcc $(CFLAG) $(SOCKETSRC)/Socket.cpp
 
+ClientSocket.o: $(SOCKETSRC)/ClientSocket.h $(SOCKETSRC)/ClientSocket.cpp Socket.o
+        gcc $(CFLAG) $(SOCKETSRC)/ClientSocket.cpp
+
+RenderClient.o: $(SOCKETSRC)/RenderClient.h $(SOCKETSRC)/RenderClient.cpp ClientSocket.o
+        gcc $(CFLAG) $(SOCKETSRC)/RenderClient.cpp
+
 RenderVertexArray.o: RenderVertexArray.h RenderVertexArray.cpp
         gcc $(CFLAG) RenderVertexArray.cpp
 
-#qdclient: $(OBJ_CLIENT) 
-#       gcc -g -o qdclient $(OBJ_CLIENT) $(LIB_CLIENT)
+client: $(OBJ_CLIENT) 
+        gcc -g -o client $(OBJ_CLIENT) $(LIB_CLIENT)
 
 Color.o: Color.cpp
         gcc $(CFLAG) Color.cpp
+
+Event.o: Event.cpp
+        gcc $(CFLAG) Event.cpp
 
 ControlPoint.o: $(TFSRC)/ControlPoint.cpp

trunk/gui/vizservers/nanovis/ParticleSystem.cpp

@@ -102 +102 @@
   reborn = false;
 
-  fprintf(stderr, "init particles\n");
+  //fprintf(stderr, "init particles\n");
 }
 
@@ -190 +190 @@
    }
 
-   fprintf(stderr, "advect: %d ", psys_frame);
+   //fprintf(stderr, "advect: %d ", psys_frame);
 }
 

trunk/gui/vizservers/nanovis/config.h

@@ -15 +15 @@
 
 
-#define NV40    //Uncomment if using 6 series card. By default we assume older card the 5xxx series
+#define NV40      //Uncomment if using 6 series card. By default we assume older card the 5xxx series
+//#define XINETD  //enable render server
+#define EVENTLOG  //enable event logging

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -32 +32 @@
 #include "transfer-function/MainWindow.h"
 
+//render server
+
 float color_table[256][4];      
+
+#ifdef XINETD
+FILE* xinetd_log;
+#endif
+
+#ifdef EVENTLOG
+FILE* event_log;
+//log
+void init_event_log();
+void end_event_log();
+#endif
 
 int render_window;              //the handle of the render window;
@@ -43 +56 @@
 float psys_x=0.4, psys_y=0, psys_z=0;
 
-char* screen_buffer = new char[4*NPIX*NPIX+1];          //buffer to store data read from the screen
+char* screen_buffer = new char[3*NPIX*NPIX+1];          //buffer to store data read from the screen
 NVISid fbo, color_tex, pattern_tex, mag_tex, final_fbo, final_color_tex, final_depth_rb; //fbo related identifiers
 NVISid vel_fbo, slice_vector_tex;       //for projecting 3d vector to 2d vector on a plane
@@ -87 +100 @@
 
 using namespace std;
+
+static void set_camera(int x_angle, int y_angle, int z_angle, float dis){
+  live_rot_x = x_angle;
+  live_rot_y = y_angle;
+  live_rot_z = z_angle;
+
+  live_obj_z = dis;
+}
+
 
 
@@ -100 +122 @@
 static int LoadCmd _ANSI_ARGS_((ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[]));
 
+//Tcl callback functions
+static int
+CameraCmd(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])
+{
+
+        fprintf(stderr, "camera cmd\n");
+        int x, y, z;
+        double dis;
+
+        if (argc != 5) {
+                Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
+                        " x_angle y_angle z_angle distance\"", (char*)NULL);
+                return TCL_ERROR;
+        }
+        if (Tcl_GetInt(interp, argv[1], &x) != TCL_OK) {
+                return TCL_ERROR;
+        }
+        if (Tcl_GetInt(interp, argv[2], &y) != TCL_OK) {
+                return TCL_ERROR;
+        }
+        if (Tcl_GetInt(interp, argv[3], &z) != TCL_OK) {
+                return TCL_ERROR;
+        }
+        if (Tcl_GetDouble(interp, argv[4], &dis) != TCL_OK) {
+                return TCL_ERROR;
+        }
+        set_camera(x, y, z, (float)dis);
+        return TCL_OK;
+}
+
+
+static int
+HelloCmd(ClientData cdata, Tcl_Interp *interp, int argc, CONST84 char *argv[])
+{
+        //send back 4 bytes as confirmation
+        char ack[4]="ACK";
+        fprintf(stderr, "wrote %d\n", write(fileno(stdout), ack, 4));
+        fflush(stdout);
+        return TCL_OK;
+}
 
 //report errors related to CG shaders
@@ -548 +610 @@
 
   tf[0]->update(data);
+
+#ifdef EVENTLOG
+  float param[3] = {0,0,0};
+  Event* tmp = new Event(EVENT_ROTATE, param, 0);
+  tmp->write(event_log);
+  delete tmp;
+#endif
 }
 
@@ -579 +648 @@
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+#ifdef NV40
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, win_width, win_height, 0,
                GL_RGB, GL_INT, NULL);
+#else
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, win_width, win_height, 0,
+               GL_RGB, GL_INT, NULL);
+#endif
   glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
                             GL_COLOR_ATTACHMENT0_EXT,
@@ -759 +833 @@
   psys->initialize((Particle*)data);
   delete[] data;
-
-  fprintf(stderr, "init particles\n");
 }
 
@@ -849 +921 @@
   interp = Tcl_CreateInterp();
   Tcl_MakeSafe(interp);
+
+  Tcl_CreateCommand(interp, "camera", CameraCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
+  //Tcl_CreateCommand(interp, "size", SizeCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
+  //Tcl_CreateCommand(interp, "clear", ClearCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
+  //Tcl_CreateCommand(interp, "cut", CutCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
+  //Tcl_CreateCommand(interp, "outline", OutlineCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
+  Tcl_CreateCommand(interp, "hello", HelloCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
+  //Tcl_CreateCommand(interp, "load", LoadCmd, (ClientData)0, (Tcl_CmdDeleteProc*)NULL);
 }
 
@@ -925 +1005 @@
   glBindTexture(GL_TEXTURE_2D, 0);
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo);
-  glReadPixels(0, 0, win_width, win_height, GL_RGBA, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer);
+  glReadPixels(0, 0, win_width, win_height, GL_RGB, /*GL_COLOR_ATTACHMENT0_EXT*/ GL_UNSIGNED_BYTE, screen_buffer);
   assert(glGetError()==0);
 }
 
+void display();
 
 void xinetd_listen(){
@@ -951 +1032 @@
     }
 
+    display();
     //read the image
     read_screen(); 
-    writen(fileno(stdout), screen_buffer, 4*win_width*win_height);      //unsigned byte
-
-    cerr << "server: serve() done" << endl;
+    writen(fileno(stdout), screen_buffer, 3*win_width*win_height);      //unsigned byte
+
+    cerr << "server: serve() image sent" << endl;
 }
 
@@ -992 +1074 @@
 
   nanosleep(&ts, 0);
-  //xinetd_listen();
-
+
+#ifdef XINETD
+  xinetd_listen();
+#else
   glutPostRedisplay();
+#endif
 }
 
@@ -1708 +1793 @@
 
    //convolve
-   lic();
+   //lic();
 
    /*
@@ -1783 +1868 @@
      psys->display_vertices();
    perf->disable();
-   fprintf(stderr, "particle pixels: %d\n", perf->get_pixel_count());
+   //fprintf(stderr, "particle pixels: %d\n", perf->get_pixel_count());
    perf->reset();
 
@@ -1797 +1882 @@
      render_volume(1, 256);
    perf->disable();
-   fprintf(stderr, "volume pixels: %d\n", perf->get_pixel_count());
+   //fprintf(stderr, "volume pixels: %d\n", perf->get_pixel_count());
    perf->reset();
 
@@ -1864 +1949 @@
 }
 
+void end_service();
 
 void keyboard(unsigned char key, int x, int y){
-   
+  
+   bool log = false;
+
    switch (key){
         case 'q':
+#ifdef XINETD
+                end_service();
+#endif
                 exit(0);
                 break;
@@ -1898 +1989 @@
         case 'w': //zoom out
                 live_obj_z-=0.1;
+                log = true;
                 break;
         case 's': //zoom in
                 live_obj_z+=0.1;
+                log = true;
                 break;
         case 'a': //left
                 live_obj_x-=0.1;
+                log = true;
                 break;
         case 'd': //right
                 live_obj_x+=0.1;
+                log = true;
                 break;
         case 'i':
@@ -1914 +2009 @@
                 break;
     }   
-    
+
+#ifdef EVENTLOG
+   if(log){
+     float param[3] = {live_obj_x, live_obj_y, live_obj_z};
+     Event* tmp = new Event(EVENT_MOVE, param, 0);
+     tmp->write(event_log);
+     delete tmp;
+   }
+#endif
 }
 
@@ -1952 +2055 @@
     }
 
+#ifdef EVENTLOG
+    float param[3] = {live_rot_x, live_rot_y, live_rot_z};
+    Event* tmp = new Event(EVENT_ROTATE, param, 0);
+    tmp->write(event_log);
+    delete tmp;
+#endif
+
     glutPostRedisplay();
 }
 
+#ifdef XINETD
+void init_service(){
+  //open log and map stderr to log file
+  xinetd_log = fopen("log.txt", "w");
+  close(2);
+  dup2(fileno(xinetd_log), 2);
+
+  //flush junk 
+  fflush(stdout);
+  fflush(stderr);
+}
+
+void end_service(){
+  //close log file
+  fclose(xinetd_log);
+}
+#endif
+
+#ifdef EVENTLOG
+void init_event_log(){
+  event_log = fopen("event.txt", "w");
+  assert(event_log!=0);
+}
+
+void end_event_log(){
+  fclose(event_log);
+}
+#endif
 
 /*----------------------------------------------------*/
@@ -1978 +2116 @@
 
    initGL();
+#ifdef XINETD
+   init_service();
+#endif
    initTcl();
 
-   //FILE* log_file = fopen("log.txt", "w");
-   //close(2);
-   //dup2(fileno(log_file), 2);
-
+#ifdef EVENTLOG
+   init_event_log();
+#endif
+   //event loop
    glutMainLoop();
+#ifdef EVENTLOG
+   end_event_log();
+#endif
+
+#ifdef XINETD
+   end_service();
+#endif
+
    return 0;
 }

trunk/gui/vizservers/nanovis/nanovis.h

@@ -40 +40 @@
 #include "ParticleSystem.h"
 #include "PerfQuery.h"
+#include "Event.h"
 
 #include "config.h"

trunk/gui/vizservers/nanovis/socket/RenderClient.cpp

@@ -30 +30 @@
 RenderClient::RenderClient(std::string& remote_host, int port_num){
         //screen_size = sizeof(float)*4*512*512;        //float
-        screen_size = 4*width*height;   //unsigned byte
+        screen_size = 3*width*height;   //unsigned byte
         screen_buffer = new char[screen_size];
 
@@ -116 +116 @@
 {
    delete[] client->screen_buffer;
-   client->screen_size = 4*_width*_height;
+   client->screen_size = 3*_width*_height;
    client->screen_buffer = new char[client->screen_size];
 
@@ -174 +174 @@
      //glDrawPixels(width, height, GL_RGBA, GL_FLOAT, client->screen_buffer);   
      //bzero(client->screen_buffer, client->screen_size);
-     glDrawPixels(width, height, GL_RGBA, GL_UNSIGNED_BYTE, client->screen_buffer);     
+     glDrawPixels(width, height, GL_RGB, GL_UNSIGNED_BYTE, client->screen_buffer);      
      glFlush();
      glutSwapBuffers();
@@ -469 +469 @@
 
 
-void init_client(){
+void init_client(char* host, char* port){
   //std::string host = "localhost";
   //hostname -i
-  std::string host = "128.46.137.192";
-  client = new RenderClient(host, 30000);
+  //std::string host = "128.46.137.192";
+  
+  std::string hostname = host;
+  client = new RenderClient(hostname, atoi(port));
 
   //point stdin stdout to socket
@@ -483 +485 @@
   */
   
-  
-  std::stringstream stream;
-  stream << "hello";
-  std::string msg1;
-  stream >> msg1;
+  std::string msg1 = "hello";
   std::string msg2 = " ";
 
@@ -496 +494 @@
   client->receive(msg2);
   
-  //cerr << "client: msg received - " << msg2 << endl;
+  cerr << "client: msg received - " << msg2 << endl;
   cerr << "connection to server established" << endl;
 }
@@ -541 +539 @@
 }
 
+void help(const char *argv0)
+{
+  fprintf(stderr,
+          "Syntax: %s addr:port load\n",
+          argv0);
+  exit(1);
+}
+
 /* Program entry point */
 int main(int argc, char *argv[])
 {
+    //parameters:  hostip and port
+    if(argc!=3) help(argv[0]);
+
     width =512; height=512;
 
-    init_client();
+    init_client(argv[1], argv[2]);
 
     glutInit(&argc, argv);

trunk/gui/vizservers/nanovis/transfer-function/ColorGradientGLUTWindow.cpp

@@ -83 +83 @@
 
         if(mapOutput==0)
-                printf("NULL");
+                fprintf(stderr, "NULL");
 
         //initialize mapOutput
@@ -148 +148 @@
 
         if(map == NULL){
-                printf("ColorGradient Window : forgot to bind the colorMap\n");
+                fprintf(stderr, "ColorGradient Window : forgot to bind the colorMap\n");
                 return;
         }
@@ -617 +617 @@
         for(i=0;i<numOfOutput;i++){
                 //printf("(%g,%g,%g) ", mapOutput[3*i], mapOutput[3*i+1], mapOutput[3*i+2]);
-                printf("(%g,%g,%g) ", color_table[i][0], color_table[i][1], color_table[i][2]);
-        }
-}
-
-
+                fprintf(stderr, "(%g,%g,%g) ", color_table[i][0], color_table[i][1], color_table[i][2]);
+        }
+}
+
+

trunk/gui/vizservers/nanovis/transfer-function/MainWindow.cpp

@@ -99 +99 @@
 
 void MainTransferFunctionWindow::mainMouse(int button, int state, int x, int y){
-        printf("main mouse\n");
+        fprintf(stderr, "main mouse\n");
         //find out what area received the event
         if (y<=main_winy-tf_winy){
@@ -242 +242 @@
         
         if (fileName==0 || strlen(fileName)<1){
-                printf("Error: file name not supplied.\n");
+                fprintf(stderr, "Error: file name not supplied.\n");
                 return;
         }
@@ -249 +249 @@
 
         if(!fp){
-                printf("Error: open file.\n");
+                fprintf(stderr, "Error: open file.\n");
                 return;
         }
 
-        printf("File \"%s\" opened.\n", fileName);
+        fprintf(stderr, "File \"%s\" opened.\n", fileName);
 
         char buf[300];                  //buffer to store one line from file

trunk/gui/vizservers/nanovis/transfer-function/TransferFunctionGLUTWindow.cpp

@@ -112 +112 @@
         tf_gvSelectedPoint = new ControlPoint(0,0);
 
-        printf("Transferfunction Init...\n");
+        fprintf(stderr, "Transferfunction Init...\n");
 }
 
@@ -598 +598 @@
         for(i=0;i<numOfOutput;i++){
                 //printf("%f, ",output[i]);
-                printf("%f, ",color_table[i][3]);
-        }
-        printf("\n");
+                fprintf(stderr, "%f, ",color_table[i][3]);
+        }
+        fprintf(stderr, "\n");
 }
 
@@ -803 +803 @@
 void TransferFunctionGLUTWindow::printPoints(){
         ControlPoint* cur=tf_pointList;
-        printf("********************\n");
-        printf("Total points %d \n", tf_numOfPoints);
+        fprintf(stderr, "********************\n");
+        fprintf(stderr, "Total points %d \n", tf_numOfPoints);
 
         if (tf_numOfPoints==0)
@@ -810 +810 @@
 
         while (cur->next!=0){
-                printf("(%g,%g)\n", cur->x, cur->y);
+                fprintf(stderr, "(%g,%g)\n", cur->x, cur->y);
                 cur=cur->next;
         }
-        printf("(%g,%g)\n", cur->x, cur->y);
-        printf("********************\n");
+        fprintf(stderr, "(%g,%g)\n", cur->x, cur->y);
+        fprintf(stderr, "********************\n");
 }
 
@@ -926 +926 @@
         for(int j=0; j<4; j++){
                 for (i=0; i<Hist[j].range; i++){
-                        printf("%ld\t", Hist[j].count[i]);      
-                }
-                printf("\n\n");
+                        fprintf(stderr, "%ld\t", Hist[j].count[i]);     
+                }
+                fprintf(stderr, "\n\n");
         }