[us-commits] r2757 - in trunk: gui programs/us_com_project programs/us_xpn_viewer

[svn at svn.aucsolutions.com]

Author: alexey
Date: 2019-05-07 02:22:39 +0000 (Tue, 07 May 2019)
New Revision: 2757

Modified:
   trunk/gui/us_select_item.cpp
   trunk/programs/us_com_project/us_com_project_gui.cpp
   trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
Log:
some updates on autoflow...



Modified: trunk/gui/us_select_item.cpp
===================================================================
--- trunk/gui/us_select_item.cpp	2019-05-07 02:13:23 UTC (rev 2756)
+++ trunk/gui/us_select_item.cpp	2019-05-07 02:22:39 UTC (rev 2757)
@@ -96,9 +96,31 @@
    main->setContentsMargins( 2, 2, 2, 2 );
    main->setSpacing        ( 2 );
 
+   //Inormation field for autoflow
+   QTextEdit*     le_info;
+
+   if ( autoflow_button )
+     {
+       le_info = us_textedit();
+       QFontMetrics m (le_info -> font()) ;
+       int RowHeight = m.lineSpacing() ;
+       le_info -> setFixedHeight  (5 * RowHeight) ;
+
+       QPalette p = le_info->palette(); 
+       p.setColor(QPalette::Base, Qt::lightGray);
+       p.setColor(QPalette::Text, Qt::darkRed);
+       le_info->setPalette(p);
+       
+       le_info->setText(tr( "<ul><li>Information on one or more experimental methods submitted to Bechman Optima(s) is available. "
+			    "You can reattach to the job by selecting the run from the list below. "
+			    "Alternatively, you can define new experiment method. </ul></li>" ));
+       
+       main->addWidget( le_info );
+     }
+   
    // Top layout: buttons and fields above list widget
    QGridLayout* top  = new QGridLayout;
-
+   
    // Search line
    QLabel* lb_filtdata = us_label( tr( "Search" ) );
    le_dfilter          = us_lineedit();

Modified: trunk/programs/us_com_project/us_com_project_gui.cpp
===================================================================
--- trunk/programs/us_com_project/us_com_project_gui.cpp	2019-05-07 02:13:23 UTC (rev 2756)
+++ trunk/programs/us_com_project/us_com_project_gui.cpp	2019-05-07 02:22:39 UTC (rev 2757)
@@ -358,7 +358,7 @@
   // --------------------------------------------------------------------------------------------
  
   
-  // Query 'autoflow': get cout of records
+  // Query 'autoflow': get count of records
   int autoflow_records = get_autoflow_records();
 
   qDebug() << "Autoflow record #: " << autoflow_records;

Modified: trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
===================================================================
--- trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp	2019-05-07 02:13:23 UTC (rev 2756)
+++ trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp	2019-05-07 02:22:39 UTC (rev 2757)
@@ -1424,9 +1424,7 @@
     return status_ok;                   //  skip starting a new one
   
   in_reload_data_init   = true;
-  
-  //msg_data_avail->accept();
-  
+
   // Ask for data directory
   QString dbhost    = xpnhost;
   int     dbport    = xpnport.toInt();