##// END OF EJS Templates
cg
Erick Valdez -
r869:663ba5be753e
parent child
Show More
@@ -312,7 +312,7 class Axes:
312 decimationy = None
312 decimationy = None
313
313
314 __MAXNUMX = 200
314 __MAXNUMX = 200
315 __MAXNUMY = 100
315 __MAXNUMY = 400
316
316
317 __MAXNUMTIME = 500
317 __MAXNUMTIME = 500
318
318
@@ -501,15 +501,13 class Axes:
501 xlen = len(x)
501 xlen = len(x)
502 ylen = len(y)
502 ylen = len(y)
503
503
504 decimationx = int(xlen/self.__MAXNUMX)+1 \
504 decimationx = numpy.floor(xlen/self.__MAXNUMX) - 1 if numpy.floor(xlen/self.__MAXNUMX)>1 else 1
505 if int(xlen/self.__MAXNUMX)>1 else 1
505 decimationy = numpy.floor(ylen/self.__MAXNUMY) + 1
506 decimationy = int(ylen/self.__MAXNUMY) \
506
507 if int(ylen/self.__MAXNUMY)>1 else 1
508
507
509 x_buffer = x#[::decimationx]
508 x_buffer = x#[::decimationx]
510 y_buffer = y#[::decimationy]
509 y_buffer = y#[::decimationy]
511 z_buffer = z#[::decimationx, ::decimationy]
510 z_buffer = z#[::decimationx, ::decimationy]
512
513 #===================================================
511 #===================================================
514
512
515 if self.__firsttime:
513 if self.__firsttime:
@@ -565,9 +563,9 class Axes:
565 maxNumX = self.__MAXNUMTIME
563 maxNumX = self.__MAXNUMTIME
566
564
567 if maxNumY == None:
565 if maxNumY == None:
568 maxNumY = self.__MAXNUMY
566 maxNumY = self.__MAXNUMY
569
567
570 if self.__firsttime:
568 if self.__firsttime:
571 self.z_buffer = z
569 self.z_buffer = z
572 self.x_buffer = numpy.hstack((self.x_buffer, x))
570 self.x_buffer = numpy.hstack((self.x_buffer, x))
573
571
@@ -606,10 +604,8 class Axes:
606 xlen = len(self.x_buffer)
604 xlen = len(self.x_buffer)
607 ylen = len(y)
605 ylen = len(y)
608
606
609 decimationx = int(xlen/self.__MAXNUMX) \
607 decimationx = numpy.floor(xlen/maxNumX) + 1
610 if int(xlen/self.__MAXNUMX)>1 else 1
608 decimationy = numpy.floor(ylen/maxNumY) + 1
611 decimationy = int(ylen/self.__MAXNUMY) \
612 if int(ylen/self.__MAXNUMY)>1 else 1
613
609
614 x_buffer = self.x_buffer#[::decimationx]
610 x_buffer = self.x_buffer#[::decimationx]
615 y_buffer = y#[::decimationy]
611 y_buffer = y#[::decimationy]
General Comments 0
You need to be logged in to leave comments. Login now