diff --git a/schainpy2/Graphics/schainPlot.py b/schainpy2/Graphics/schainPlot.py index 5708045..62e1680 100644 --- a/schainpy2/Graphics/schainPlot.py +++ b/schainpy2/Graphics/schainPlot.py @@ -399,7 +399,7 @@ class Plot: self.xaxisastime, self.timefmt) - def plotBasicLine(self,x, y, color): + def plotBasicLine(self,x, y, color, xopt='bcst', yopt='bcst'): """ Inputs: x: @@ -408,5 +408,5 @@ class Plot: color: """ - self.drvObj.driver.basicLine(self.idframe, self.xpos, self.ypos, x, y, self.xmin, self.xmax, self.ymin, self.ymax, color) + self.drvObj.driver.basicLine(self.idframe, self.xpos, self.ypos, x, y, self.xmin, self.xmax, self.ymin, self.ymax, color, xopt=xopt, yopt=yopt) \ No newline at end of file diff --git a/schainpy2/Graphics/schainPlotLib.py b/schainpy2/Graphics/schainPlotLib.py index 36bdd3c..9832ac8 100644 --- a/schainpy2/Graphics/schainPlotLib.py +++ b/schainpy2/Graphics/schainPlotLib.py @@ -47,6 +47,7 @@ class PlplotDriver: plplot.plsstrm(self.idfigure) + def openDriver(self, pldriver=None): if pldriver == None: if sys.platform == "linux": @@ -74,7 +75,7 @@ class PlplotDriver: def openPage(self): plplot.plbop() - plplot.pladv(0) + #plplot.pladv(0) def closePage(self): plplot.pleop() @@ -87,13 +88,13 @@ class PlplotDriver: plplot.pleop() def setSubPlots(self,nrows, ncolumns): - plplot.plssub(ncolumns,nrows) + plplot.plssub(ncolumns, nrows) def setPlotLabels(self, id, xlabel, ylabel, title): plplot.pllab(xlabel, ylabel, title) def setFigTitle(self, title,color="black", szchar=0.55): - self.setSubPlots(1, 0) + self.setSubPlots(1, 1) plplot.pladv(0) plplot.plvpor(0., 1., 0., 1.) @@ -211,7 +212,7 @@ class PlplotDriver: plplot.plspause(True) plplot.plend() - def basicLine(self, id, xpos, ypos, x, y, xmin, xmax, ymin, ymax, color): + def basicLine(self, id, xpos, ypos, x, y, xmin, xmax, ymin, ymax, color, xopt="bcst", yopt="bcst"): """ Inputs: @@ -244,7 +245,7 @@ class PlplotDriver: plplot.plcol0(colline) plplot.plline(x, y) plplot.plcol0(1) - plplot.plbox("bcst", 0.0, 0, "bcst", 0.0, 0) +# plplot.plbox(xopt, 0.0, 0, yopt, 0.0, 0) def save(self, filename): curr_strm = plplot.plgstrm() diff --git a/schainpy2/Graphics/schainPlotTypes.py b/schainpy2/Graphics/schainPlotTypes.py index e60a23e..34ccc78 100644 --- a/schainpy2/Graphics/schainPlotTypes.py +++ b/schainpy2/Graphics/schainPlotTypes.py @@ -254,22 +254,24 @@ class SpcFrame(Frame): self.plotObjList = plotObjList def getScreenPosMainPlot(self): - xi = 0.15 + + xi = 0.10 if self.showprofile: - xw = 0.55 + xw = 0.62 else: - xw = 0.65 + xw = 0.9 if self.colorbar: xw = xw - 0.06 - yi = 0.20; yw = 0.75 + yi = 0.1; yw = 0.87 return xi, yi, xw, yw def getScreenPosGraph1(self): + if self.colorbar: xi = 0.65 + 0.08 else: @@ -277,7 +279,7 @@ class SpcFrame(Frame): xw = xi + 0.2 - yi = 0.2; yw = 0.75 + yi = 0.1; yw = 0.87 return xi, yi, xw, yw @@ -673,6 +675,8 @@ class Plot1D(Plot): self.ymax = ymax self.minvalue = minvalue self.maxvalue = maxvalue + self.xopt = "bcnstg" + self.yopt = "bcmstv" else: self.xmin = xmin