diff --git a/ZoomPipeline_FuncSvr/zpmainframe.cpp b/ZoomPipeline_FuncSvr/zpmainframe.cpp
index 2cf2c857837d8909b4b1e2c4993b3dfc586bf421..9c53f4081c096f2d6c09d6f74e5155f0c3fffe4a 100644
--- a/ZoomPipeline_FuncSvr/zpmainframe.cpp
+++ b/ZoomPipeline_FuncSvr/zpmainframe.cpp
@@ -521,6 +521,11 @@ void ZPMainFrame::forkServer(QString config_file)
this->m_pClusterTerm->setPublishPort(strClusterPubPort.toInt());
this->m_pClusterTerm->StartListen(QHostAddress(strClusterTermAddr),strClusterTermPort.toInt());
+ int nRabbishCanSize = settings.value("settings/rubbish_can_size","32").toInt();
+ ZPNetwork::zp_netTransThread::RUBBISH_CAN_SIZE = nRabbishCanSize;
+
+ if (this->windowTitle().indexOf("(")==-1)
+ this->setWindowTitle(windowTitle() + "(" + strClusterPubName +")");
}
void ZPMainFrame::on_action_About_triggered()
@@ -648,6 +653,9 @@ void ZPMainFrame::LoadSettings(QString config_file)
ui->horizontalSlider_cluster_transThreads->setValue(nClusterTransThreads);
int nClusterWorkingThreads = settings.value("Cluster/nClusterWorkingThreads","4").toInt();
ui->horizontalSlider_cluster_workingThread->setValue(nClusterWorkingThreads);
+ //Rubbish Can (for Sockets)
+ int nRabbishCanSize = settings.value("settings/rubbish_can_size","32").toInt();
+ ui->horizontalSlider_rubbishCan->setValue(nRabbishCanSize);
}
@@ -732,7 +740,9 @@ void ZPMainFrame::SaveSettings(QString config_file)
settings.setValue("Cluster/strClusterPubPort",ui->lineEdit_cluster_pub_Port->text());
settings.setValue("Cluster/nClusterTransThreads",ui->horizontalSlider_cluster_transThreads->value());
settings.setValue("Cluster/nClusterWorkingThreads", ui->horizontalSlider_cluster_workingThread->value());
-
+ //Rubbish Can (for Sockets)
+ int nRabbishCanSize =ui->horizontalSlider_rubbishCan->value();
+ settings.setValue("settings/rubbish_can_size",nRabbishCanSize);
}
void ZPMainFrame::on_pushButton_addListener_clicked()
{
diff --git a/ZoomPipeline_FuncSvr/zpmainframe.ui b/ZoomPipeline_FuncSvr/zpmainframe.ui
index 2adbfde147c8438c78978db2f8c425a2b09099c9..c0b3a9b349366929f6410cb0970f4d897f0f0733 100644
--- a/ZoomPipeline_FuncSvr/zpmainframe.ui
+++ b/ZoomPipeline_FuncSvr/zpmainframe.ui
@@ -13,6 +13,9 @@
ZPMainFrame
+
+ -1
+
16
@@ -28,9 +31,6 @@
QTabWidget::Rounded
-
- -1
-
-
@@ -177,159 +177,200 @@
Task Pools
-
-
-
-
-
- 1
-
-
- 256
-
-
- 16
-
-
- 8.000000000000000
-
-
- true
-
-
-
- -
-
-
- 1
-
-
- 64
-
-
- 1
-
-
- %v
-
-
-
- -
-
-
- Working Task Threads
-
-
-
- -
-
-
- 1
-
-
- 64
-
-
- 1
-
-
- false
-
-
- %v
-
-
-
- -
-
-
- 1
-
-
- 64
-
-
- 8
-
-
- false
-
-
- 4.000000000000000
-
-
- true
-
-
-
- -
-
-
- SSL connection Trans Threads
-
-
-
- -
-
-
- Plain connection Trans Threads
-
-
-
- -
-
-
- 1
-
-
- 256
-
-
- 1
-
-
- %v
-
-
-
- -
-
-
- 1
-
-
- 64
-
-
- 8
-
-
- true
-
-
-
- -
-
-
- Save
-
-
-
- :/icons/Resources/3floppy_mount-1.png:/icons/Resources/3floppy_mount-1.png
-
-
+
+
-
+
+
-
+
+
+ Plain connection Trans Threads
+
+
+
+ -
+
+
+ 1
+
+
+ 64
+
+
+ 8
+
+
+ true
+
+
+
+ -
+
+
+ 1
+
+
+ 64
+
+
+ 1
+
+
+ false
+
+
+ %v
+
+
+
+ -
+
+
+ SSL connection Trans Threads
+
+
+
+ -
+
+
+ 1
+
+
+ 64
+
+
+ 8
+
+
+ false
+
+
+ 4.000000000000000
+
+
+ true
+
+
+
+ -
+
+
+ 1
+
+
+ 64
+
+
+ 1
+
+
+ %v
+
+
+
+ -
+
+
+ Working Task Threads
+
+
+
+ -
+
+
+ 1
+
+
+ 256
+
+
+ 16
+
+
+ 8.000000000000000
+
+
+ true
+
+
+
+ -
+
+
+ 1
+
+
+ 256
+
+
+ 1
+
+
+ %v
+
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
+
-
+
+
-
+
+
+ Rabbish Can Items Size
+
+
+
+ -
+
+
+ 16
+
+
+ 65536
+
+
+ Qt::Horizontal
+
+
+ QSlider::NoTicks
+
+
+ 256
+
+
+
+ -
+
+
+ QLCDNumber::Flat
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Save
+
+
+
+ :/icons/Resources/3floppy_mount-1.png:/icons/Resources/3floppy_mount-1.png
+
+
+
+
@@ -1166,5 +1207,21 @@
+
+ horizontalSlider_rubbishCan
+ valueChanged(int)
+ lcdNumber_rabbish
+ display(int)
+
+
+ 239
+ 393
+
+
+ 346
+ 393
+
+
+