update control GUI

diff --git a/control/gui/Buttons2.pm b/control/gui/Buttons2.pm
index 97327902c2832711aae757711e839ffdc43bdff5..a5216ce722a012a7e7e479f1d866f949f1c9e17f 100644 (file)
--- a/control/gui/Buttons2.pm
+++ b/control/gui/Buttons2.pm
@@ -145,7 +145,7 @@ sub NEW {
     $groupBox_4->setObjectName( "groupBox_4" );
     #$groupBox_3->setCheckable(1);
     #$groupBox_3->setChecked(0);
-    $groupBox_4->hide();
+    #$groupBox_4->hide();
     my $vl_gb4 = Qt::VBoxLayout( $groupBox_4 );
     $self->{vl_gb4} = $vl_gb4;
     $vl_gb4->setObjectName( "vl_gb4" );
@@ -190,11 +190,11 @@ sub NEW {
 
 #    $vl_top->addWidget( $pushButton );
 
-    my $checkBox = Qt::CheckBox( $centralwidget );
-    $self->{checkBox} = $checkBox;
-    $checkBox->setObjectName( "checkBox" );
+ #   my $checkBox = Qt::CheckBox( $centralwidget );
+ #   $self->{checkBox} = $checkBox;
+ #   $checkBox->setObjectName( "checkBox" );
 
-    $vl_top->addWidget( $checkBox );
+ #   $vl_top->addWidget( $checkBox );
 
     $mainWindow->setCentralWidget( $centralwidget );
     my $menubar = Qt::MenuBar( $mainWindow );
@@ -246,8 +246,8 @@ sub NEW {
 #    Qt::Object::connect($pushButton, SIGNAL 'clicked()' , $mainWindow, SLOT 'close()' );
 
 
-    Qt::Object::connect($checkBox, SIGNAL 'stateChanged(int)' ,
-                      this, SLOT 'hide_expert_checked(int)' );
+#    Qt::Object::connect($checkBox, SIGNAL 'stateChanged(int)' ,
+#                     this, SLOT 'hide_expert_checked(int)' );
 
     Qt::MetaObject::connectSlotsByName( $mainWindow );
 
@@ -267,7 +267,7 @@ sub retranslateUi {
     $self->{groupBox_6}->setTitle( Qt::Application::translate( 'MainWindow', "Settings", undef, Qt::Application::UnicodeUTF8() ) );
     $self->{groupBox_7}->setTitle( Qt::Application::translate( 'MainWindow', "Reboot", undef, Qt::Application::UnicodeUTF8() ) );
 #    $self->{pushButton}->setText( Qt::Application::translate( 'MainWindow', "Quit DAQ-Control", undef, Qt::Application::UnicodeUTF8() ) );
-    $self->{checkBox}->setText( Qt::Application::translate( 'MainWindow', "Show Expert Tools", undef, Qt::Application::UnicodeUTF8() ) );
+#    $self->{checkBox}->setText( Qt::Application::translate( 'MainWindow', "Show Expert Tools", undef, Qt::Application::UnicodeUTF8() ) );
 
 
 } # retranslateUi
@@ -336,7 +336,7 @@ my \$icon$i = Qt::Icon;
 \$icon$i->addPixmap(Qt::Pixmap(\"$icon_path\"), Qt::Icon::Normal(), Qt::Icon::Off() );
 
 \$pb$i->setIcon( \$icon$i );
-\$pb$i->setIconSize( Qt::Size(40, 40) );
+\$pb$i->setIconSize( Qt::Size(32, 32) );
 
 |;
 

diff --git a/control/gui/expert/28_Stop_TDC_CAL.png b/control/gui/expert/28_Stop_TDC_CAL.png
index b17be10355494683ec20f002e833c92636d466ab..3d6e2c17e2d0f300a28502d9654ee6a1694b634d 100644 (file)
Binary files a/control/gui/expert/28_Stop_TDC_CAL.png and b/control/gui/expert/28_Stop_TDC_CAL.png differ

diff --git a/control/gui/expert/Restart_Hmon b/control/gui/expert/Restart_Hmon
index a120706aae940efa242378988068402640d0fee0..0dd3bb1b84b4fdf81cad3d0ec6f8a22e80f93767 100755 (executable)
--- a/control/gui/expert/Restart_Hmon
+++ b/control/gui/expert/Restart_Hmon
@@ -8,6 +8,7 @@ xterm -geometry 80x24 -bg orange -fg black -e bash -c '
   ./start.sh #1>/dev/null 2>/dev/null
   echo Hmon has been restarted
   sleep 5
+  exit
   "
 '
 

diff --git a/control/gui/expert/Thresholds_STS_Reset b/control/gui/expert/old/Thresholds_STS_Reset
similarity index 100%
rename from control/gui/expert/Thresholds_STS_Reset
rename to control/gui/expert/old/Thresholds_STS_Reset

diff --git a/control/gui/monitor/10_CTS_Mon b/control/gui/monitor/10_CTS_Mon
index 6214a041326a19e3450ac633f7a0b98bb760d623..ce98270d5941d332e9d620ddedda91901990283f 100755 (executable)
--- a/control/gui/monitor/10_CTS_Mon
+++ b/control/gui/monitor/10_CTS_Mon
@@ -4,16 +4,16 @@
 #if [ $myvar == "256" ]; then exit; fi
 #notifyall.sh "DAQ" "<I> DAQ is going to be restarted." "STARTUP" &
 
-export DAQOPSERVER=hadesp31
-cd /home/hadaq/trbsoft/hadesdaq/control/ctsmon
-perl ./mon_cts.pl 
-sleep 1
+#export DAQOPSERVER=hadesp31
+#cd /home/hadaq/trbsoft/hadesdaq/control/ctsmon
+#perl ./mon_cts.pl 
+#sleep 1
 
-exit
+#exit
 
 
 #xterm -geometry 80x24 -bg orange -fg black -e bash --login -c '
-  ssh -X hadaq@lxhadeb06 "
+  ssh -X hadaq@lxhadesdaqp "
   source /home/hadaq/.bashrc
   export DAQOPSERVER=hadesp31
   cd /home/hadaq/trbsoft/hadesdaq/control/ctsmon

diff --git a/control/gui/monitor/91_Hmon_Snaphot.png b/control/gui/monitor/91_Hmon_Snaphot.png
index c72e7547a2357991fb6ef4842cca544b506a2534..98bb06f6b46bca810d1cf4822fb8af92c765def5 100644 (file)
Binary files a/control/gui/monitor/91_Hmon_Snaphot.png and b/control/gui/monitor/91_Hmon_Snaphot.png differ

diff --git a/control/gui/monitor/40_Eventbuilder b/control/gui/monitor/old/40_Eventbuilder
similarity index 100%
rename from control/gui/monitor/40_Eventbuilder
rename to control/gui/monitor/old/40_Eventbuilder

diff --git a/control/gui/reboot/50_Reboot_Start_iTOF b/control/gui/reboot/50_Reboot_Start
similarity index 100%
rename from control/gui/reboot/50_Reboot_Start_iTOF
rename to control/gui/reboot/50_Reboot_Start

diff --git a/control/gui/reboot/50_Reboot_FW_TOF_Ho_Hubs b/control/gui/reboot/50_Reboot_TOF_FW_Hubs
similarity index 100%
rename from control/gui/reboot/50_Reboot_FW_TOF_Ho_Hubs
rename to control/gui/reboot/50_Reboot_TOF_FW_Hubs

diff --git a/control/gui/reboot/50_Reboot_STS_Hodo b/control/gui/reboot/old/50_Reboot_STS_Hodo
similarity index 100%
rename from control/gui/reboot/50_Reboot_STS_Hodo
rename to control/gui/reboot/old/50_Reboot_STS_Hodo

diff --git a/control/gui/settings/Thresholds_TOF b/control/gui/settings/Thresholds_TOF_FW
similarity index 100%
rename from control/gui/settings/Thresholds_TOF
rename to control/gui/settings/Thresholds_TOF_FW

diff --git a/control/gui/settings/Thresholds_HODO b/control/gui/settings/old/Thresholds_HODO
similarity index 100%
rename from control/gui/settings/Thresholds_HODO
rename to control/gui/settings/old/Thresholds_HODO