From 00b2f01590bc90447c477b6a593aedc5de064567 Mon Sep 17 00:00:00 2001 From: Alexander Marchuk Date: Wed, 19 Nov 2014 17:29:26 +0300 Subject: [PATCH] fix PY-14453 --- python/helpers/pydev/pydevd_comm.py | 2 -- .../jetbrains/python/debugger/array/AsyncArrayTableModel.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/python/helpers/pydev/pydevd_comm.py b/python/helpers/pydev/pydevd_comm.py index dcc8cf2b9715..e00ae732eff3 100644 --- a/python/helpers/pydev/pydevd_comm.py +++ b/python/helpers/pydev/pydevd_comm.py @@ -966,8 +966,6 @@ class InternalGetVariable(InternalThreadCommand): #======================================================================================================================= # InternalGetArray #======================================================================================================================= -from pydevd_vars import getVariable - class InternalGetArray(InternalThreadCommand): def __init__(self, seq, roffset, coffset, rows, cols, format, thread_id, frame_id, scope, attrs): self.sequence = seq diff --git a/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java b/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java index d57274c2e9e7..2ac2d3980490 100644 --- a/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java +++ b/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java @@ -173,11 +173,11 @@ public class AsyncArrayTableModel extends AbstractTableModel { int rows = data[0].length; for (int roffset = 0; roffset < rows / CHUNK_ROW_SIZE; roffset++) { for (int coffset = 0; coffset < cols / CHUNK_COL_SIZE; coffset++) { - Pair key = itemToChunkKey(roffset * CHUNK_ROW_SIZE, coffset * CHUNK_COL_SIZE); + Pair key = itemToChunkKey(roffset * CHUNK_ROW_SIZE, roffset * CHUNK_ROW_SIZE); final Object[][] chunkData = new Object[CHUNK_ROW_SIZE][CHUNK_COL_SIZE]; for (int r = 0; r < CHUNK_ROW_SIZE; r++) { for (int c = 0; c < CHUNK_COL_SIZE; c++) { - chunkData[r][c] = data[roffset + r][coffset + c]; + chunkData[r][c] = data[roffset * CHUNK_ROW_SIZE + r][roffset * CHUNK_ROW_SIZE + c]; } } myChunkCache.put(key, new ListenableFuture() {