parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pep8

0.0.9
Theophile Terraz 2024-06-12 11:40:52 +02:00
parent 59fc80a10b
commit 7d4091eb24
6 changed files with 207 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/View/Geometry/PlotKPZ.py
View File

@ -68,11 +68,14 @@ class PlotKPZ(PamhyrPlot):
return return
modifiers = QApplication.keyboardModifiers() modifiers = QApplication.keyboardModifiers()
if modifiers not in [Qt.ControlModifier, Qt.NoModifier, Qt.ShiftModifier]: if modifiers not in [Qt.ControlModifier,
Qt.NoModifier,
Qt.ShiftModifier]:
return return
ind, point = self._closest_kp(event) ind, point = self._closest_kp(event)
if self.parent._table is not None: if self.parent._table is None:
return
self.parent._table.blockSignals(True) self.parent._table.blockSignals(True)
if modifiers == Qt.ControlModifier: if modifiers == Qt.ControlModifier:
rows = list( rows = list(
@ -102,7 +105,6 @@ class PlotKPZ(PamhyrPlot):
self.parent.select_row_profile_slider(ind) self.parent.select_row_profile_slider(ind)
self.parent._table.blockSignals(False) self.parent._table.blockSignals(False)
#self.update()
return return
def _closest_kp(self, event): def _closest_kp(self, event):
@ -124,13 +126,19 @@ class PlotKPZ(PamhyrPlot):
return closest return closest
def _select_in_table(self, ind): def _select_in_table(self, ind):
if self._table is not None: if self._table is None:
return
self._table.setFocus() self._table.setFocus()
selection = self._table.selectionModel() selection = self._table.selectionModel()
index = QItemSelection() index = QItemSelection()
if len(ind) > 0:
if len(ind) == 0:
return
for i in ind: for i in ind:
index.append(QItemSelectionRange(self._table.model().index(i, 0))) index.append(QItemSelectionRange(self._table.model().index(i, 0)))
selection.select( selection.select(
index, index,
QItemSelectionModel.Rows | QItemSelectionModel.Rows |

20
src/View/Geometry/PlotXY.py
View File

@ -64,11 +64,14 @@ class PlotXY(PamhyrPlot):
return return
modifiers = QApplication.keyboardModifiers() modifiers = QApplication.keyboardModifiers()
if modifiers not in [Qt.ControlModifier, Qt.NoModifier, Qt.ShiftModifier]: if modifiers not in [Qt.ControlModifier,
Qt.NoModifier,
Qt.ShiftModifier]:
return return
ind, point = self._closest_section(event) ind, point = self._closest_section(event)
if self._table is not None: if self._table is None:
return
self._table.blockSignals(True) self._table.blockSignals(True)
if modifiers == Qt.ControlModifier: if modifiers == Qt.ControlModifier:
rows = list( rows = list(
@ -98,7 +101,6 @@ class PlotXY(PamhyrPlot):
self.parent.select_row_profile_slider(ind) self.parent.select_row_profile_slider(ind)
self._table.blockSignals(False) self._table.blockSignals(False)
#self.update()
return return
def _closest_section(self, event): def _closest_section(self, event):
@ -127,11 +129,13 @@ class PlotXY(PamhyrPlot):
return closest return closest
def _select_in_table(self, ind): def _select_in_table(self, ind):
if self._table is not None: if self._table is None:
return
self._table.setFocus() self._table.setFocus()
selection = self._table.selectionModel() selection = self._table.selectionModel()
index = QItemSelection() index = QItemSelection()
if len(ind) > 0: if len(ind) == 0:
return
for i in ind: for i in ind:
index.append(QItemSelectionRange(self._table.model().index(i, 0))) index.append(QItemSelectionRange(self._table.model().index(i, 0)))
selection.select( selection.select(
@ -184,10 +188,12 @@ class PlotXY(PamhyrPlot):
self.line_xy.append(np.column_stack(xy)) self.line_xy.append(np.column_stack(xy))
self._colors, self._style = self.color_hightlight() self._colors, self._style = self.color_hightlight()
self.line_xy_collection = collections.LineCollection(self.line_xy, self.line_xy_collection = collections.LineCollection(
self.line_xy,
colors=self._colors, colors=self._colors,
linestyle=self._style, linestyle=self._style,
picker=10) picker=10
)
self.canvas.axes.add_collection(self.line_xy_collection) self.canvas.axes.add_collection(self.line_xy_collection)
def color_hightlight(self): def color_hightlight(self):

27
src/View/Geometry/Profile/Plot.py
View File

@ -72,17 +72,20 @@ class Plot(PamhyrPlot):
# wet_preimeter, water_width) # wet_preimeter, water_width)
) )
self._onpickevent = None self._onpickevent = None
self._rect_select = RectangleSelector(ax=self.canvas.axes, self._rect_select = RectangleSelector(
ax=self.canvas.axes,
onselect=self.rect_select_callback, onselect=self.rect_select_callback,
useblit=True, useblit=True,
button=[1], # don't use middle nor right button button=[1], # don't use middle nor right button
minspanx=2.0, minspanx=2.0,
minspany=2.0, minspany=2.0,
spancoords='pixels', spancoords='pixels',
interactive=False) interactive=False
)
def onrelease(self, event): def onrelease(self, event):
# we need to do that to prevent conflicst between onpick and rect_select_callback # we need to do that to prevent conflicst
# between onpick and rect_select_callback
modifiers = QApplication.keyboardModifiers() modifiers = QApplication.keyboardModifiers()
points, hyd = self.highlight points, hyd = self.highlight
if self._onpickevent is not None: if self._onpickevent is not None:
@ -102,7 +105,10 @@ class Plot(PamhyrPlot):
if len(rows) > 0: if len(rows) > 0:
i1 = min(rows[0], rows[-1], ind) i1 = min(rows[0], rows[-1], ind)
i2 = max(rows[0], rows[-1], ind) i2 = max(rows[0], rows[-1], ind)
p = [[self.data.points[i].x,self.data.points[i].y] for i in range(i1, i2)] p = [
[self.data.points[i].x, self.data.points[i].y]
for i in range(i1, i2)
]
else: else:
i1 = ind i1 = ind
i2 = ind i2 = ind
@ -122,7 +128,9 @@ class Plot(PamhyrPlot):
return return
modifiers = QApplication.keyboardModifiers() modifiers = QApplication.keyboardModifiers()
if modifiers not in [Qt.ControlModifier, Qt.NoModifier, Qt.ShiftModifier]: if modifiers not in [Qt.ControlModifier,
Qt.NoModifier,
Qt.ShiftModifier]:
return return
self._onpickevent = event self._onpickevent = event
@ -178,7 +186,9 @@ class Plot(PamhyrPlot):
index = QItemSelection() index = QItemSelection()
if len(ind) > 0: if len(ind) > 0:
for i in ind: for i in ind:
index.append(QItemSelectionRange(self._table.model().index(i, 0))) index.append(QItemSelectionRange(
self._table.model().index(i, 0))
)
selection.select( selection.select(
index, index,
QItemSelectionModel.Rows | QItemSelectionModel.Rows |
@ -248,7 +258,6 @@ class Plot(PamhyrPlot):
return return
modifiers = QApplication.keyboardModifiers() modifiers = QApplication.keyboardModifiers()
x1, y1 = eclick.xdata, eclick.ydata x1, y1 = eclick.xdata, eclick.ydata
x2, y2 = erelease.xdata, erelease.ydata x2, y2 = erelease.xdata, erelease.ydata
@ -276,12 +285,12 @@ class Plot(PamhyrPlot):
listp = [] listp = []
station = self.data._get_station(self.data.points) station = self.data._get_station(self.data.points)
for i, p in enumerate(self.data.points): for i, p in enumerate(self.data.points):
if (min(x1,x2)<station[i]<max(x1,x2) and min(y1,y2)<p.z<max(y1,y2)): if (min(x1, x2) < station[i] < max(x1, x2)
and min(y1, y2) < p.z < max(y1, y2)):
listi.append(i) listi.append(i)
listp.append((station[i], p.z)) listp.append((station[i], p.z))
return listi, listp return listi, listp
def _compute_hydraulics(self, z): def _compute_hydraulics(self, z):
profile = self.data profile = self.data

4
src/View/HydraulicStructures/PlotKPC.py
View File

@ -181,7 +181,9 @@ class PlotKPC(PamhyrPlot):
return return
modifiers = QApplication.keyboardModifiers() modifiers = QApplication.keyboardModifiers()
if modifiers not in [Qt.ControlModifier, Qt.NoModifier, Qt.ShiftModifier]: if modifiers not in [Qt.ControlModifier,
Qt.NoModifier,
Qt.ShiftModifier]:
return return
closest = self._closest_profile(event) closest = self._closest_profile(event)

7
src/View/LateralContribution/PlotXY.py
View File

@ -75,7 +75,6 @@ class PlotXY(PamhyrPlot):
if event.mouseevent.button.value == 3: if event.mouseevent.button.value == 3:
table.setData(index[4], kp[closest[0]]) table.setData(index[4], kp[closest[0]])
#self.update()
return return
def _closest_section(self, event): def _closest_section(self, event):
@ -129,10 +128,12 @@ class PlotXY(PamhyrPlot):
self.line_xy.append(np.column_stack(xy)) self.line_xy.append(np.column_stack(xy))
self._colors, self._style = self.color_hightlight() self._colors, self._style = self.color_hightlight()
self.line_xy_collection = collections.LineCollection(self.line_xy, self.line_xy_collection = collections.LineCollection(
self.line_xy,
colors=self._colors, colors=self._colors,
linestyle=self._style, linestyle=self._style,
picker=10) picker=10
)
self.canvas.axes.add_collection(self.line_xy_collection) self.canvas.axes.add_collection(self.line_xy_collection)
def color_hightlight(self): def color_hightlight(self):

6
src/View/LateralContribution/Window.py
View File

@ -297,9 +297,3 @@ class LateralContributionWindow(PamhyrWindow):
parent=self parent=self
) )
win.show() win.show()
#@pyqtSlot()
def onChange(self,i): #changed!
QtGui.QMessageBox.information(self,
"Tab Index Changed!",
"Current Tab Index: %d" % i ) #changed!