From d092e327148b438ff1a7315f199790ad52e79212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Mon, 22 Jun 2015 11:43:23 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@27
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 kx_tools/kx_pult.cpp               | 5 ++++-
 kx_tools/kx_pult.h                 | 2 +-
 qad_sql_table/sql_table_widget.cpp | 8 +++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/kx_tools/kx_pult.cpp b/kx_tools/kx_pult.cpp
index 340b370..9bff3eb 100644
--- a/kx_tools/kx_pult.cpp
+++ b/kx_tools/kx_pult.cpp
@@ -22,7 +22,7 @@ XCheck::XCheck(int index): QWidget() {
 	setMouseTracking(true);
 	check.setText(QString::number(index + 1) + " ");
 	check.setAutoFillBackground(true);
-	spin.setMaximum(99999);
+	spin.setMaximum(KX_X_COUNT - 1);
 	QBoxLayout * l = new QBoxLayout(QBoxLayout::LeftToRight);
 	l->setMargin(0);
 	l->setSpacing(2);
@@ -55,6 +55,8 @@ KX_Pult::KX_Pult(): QMainWindow(), config_("kx_pult.conf"), name_("x"), config(p
 	ui->treeK->viewport()->installEventFilter(this);
 	log_menu.addAction(ui->actionClear);
 	prot_x = 0;
+	show_x = config.getValue("show_x", true);
+	ui->tab_2->setVisible(show_x);
 	session.setFile("session_KX_Pult.conf");
 	session.addEntry(this);
 	session.addEntry(ui->tabWidget);
@@ -206,6 +208,7 @@ void KX_Pult::setControlsEnable(bool enable) {
 
 
 void KX_Pult::setX(const KX_X_Data & data) {
+	if (!show_x) return;
 	ui->graphic->lock();
 	for (int i = 0; i < KX_X_PACKET_NUM; ++i) {
 		if (!isNormalDouble(data.x_data[i])) continue;
diff --git a/kx_tools/kx_pult.h b/kx_tools/kx_pult.h
index 6fa9a38..1396c94 100644
--- a/kx_tools/kx_pult.h
+++ b/kx_tools/kx_pult.h
@@ -111,7 +111,7 @@ private:
 	KX_Coefficients coeffs;
 	__KX_Protocol_X * prot_x;
 	int csize, wcnt, timer, timer_update, clear_target;
-	bool needWrite, isPause, need_update;
+	bool needWrite, isPause, need_update, show_x;
 
 private slots:
 	void loading(QPIConfig & conf);
diff --git a/qad_sql_table/sql_table_widget.cpp b/qad_sql_table/sql_table_widget.cpp
index ac45a02..7ea85ec 100644
--- a/qad_sql_table/sql_table_widget.cpp
+++ b/qad_sql_table/sql_table_widget.cpp
@@ -581,8 +581,9 @@ QPair<QString, QString> SQLTableWidget::trColumn(const QString & n) {
 
 
 void SQLTableWidget::updateTable(bool save_selection) {
-	if ((!filters_active || !table_opened)) return;
-	int sp = ui->view->verticalScrollBar()->value();
+	if (!filters_active || !table_opened) return;
+	int vp = ui->view->verticalScrollBar()->value();
+	int hp = ui->view->horizontalScrollBar()->value();
 	//bool focus = view->hasFocus();
 	QModelIndex csi;
 	QModelIndexList sl;
@@ -613,7 +614,6 @@ void SQLTableWidget::updateTable(bool save_selection) {
 	ui->labelNew->setFixedWidth(qMax<int>(ui->view->verticalHeader()->sizeHint().width() + 2, 16));
 	ui->labelFilter->setFixedWidth(qMax<int>(ui->view->verticalHeader()->sizeHint().width() + 2, 16));
 	ui->layoutNew->invalidate();
-	ui->view->verticalScrollBar()->setValue(sp);
 	if (save_selection) {
 		QItemSelectionModel * sm = ui->view->selectionModel();
 		foreach (const QModelIndex & i, sl)
@@ -644,6 +644,8 @@ void SQLTableWidget::updateTable(bool save_selection) {
 			}
 		}
 	}
+	ui->view->verticalScrollBar()->setValue(vp);
+	ui->view->horizontalScrollBar()->setValue(hp);
 	//if (focus) view->setFocus();
 }