[us-commits] r2783 - trunk/programs/us_xpn_viewer

[svn at svn.aucsolutions.com]

Author: gegorbet
Date: 2019-06-08 16:11:17 +0000 (Sat, 08 Jun 2019)
New Revision: 2783

Modified:
   trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
Log:
limit View Optima Data runID length to 60 characters

Modified: trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
===================================================================
--- trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp	2019-06-03 17:45:41 UTC (rev 2782)
+++ trunk/programs/us_xpn_viewer/us_xpn_viewer_gui.cpp	2019-06-08 16:11:17 UTC (rev 2783)
@@ -2169,12 +2169,19 @@
    QRegExp rx( "[^A-Za-z0-9_-]" );
 
    int pos            = 0;
+   bool runID_changed = false;
 
-   bool runID_changed = false;
+   if ( new_runID.length() > 60 )
+   {
+      int kchar         = 60 - 4 - fRunId.length();
+      new_runID         = fExpNm.left( kchar ) + "-run" + fRunId;
+      runID_changed     = true;
+   }
+
    while ( ( pos = rx.indexIn( new_runID ) ) != -1 )
    {
       new_runID.replace( pos, 1, "_" );         // Replace 1 char at pos
-      runID_changed = true;
+      runID_changed     = true;
    }
 
    // Let the user know if the runID name has changed
@@ -2184,7 +2191,8 @@
             tr( "RunId Name Changed" ),
             tr( "The runId name has been changed.\nIt may consist only "
                 "of alphanumeric characters,\nthe underscore, and the "
-                "hyphen.\nNew runId:\n  " ) + new_runID );
+                "hyphen;\nand may be at most 60 characters in length."
+                "\nNew runId:\n  " ) + new_runID );
    }
 
    // Set the runID and directory
@@ -2525,12 +2533,19 @@
    QRegExp rx( "[^A-Za-z0-9_-]" );
 
    int pos            = 0;
+   bool runID_changed = false;
 
-   bool runID_changed = false;
+   if ( new_runID.length() > 60 )
+   {
+      int kchar         = 60 - 4 - fRunId.length();
+      new_runID         = fExpNm.left( kchar ) + "-run" + fRunId;
+      runID_changed     = true;
+   }
+
    while ( ( pos = rx.indexIn( new_runID ) ) != -1 )
    {
       new_runID.replace( pos, 1, "_" );         // Replace 1 char at pos
-      runID_changed = true;
+      runID_changed     = true;
    }
 
    // Let the user know if the runID name has changed
@@ -2540,7 +2555,8 @@
             tr( "RunId Name Changed" ),
             tr( "The runId name has been changed.\nIt may consist only "
                 "of alphanumeric characters,\nthe underscore, and the "
-                "hyphen.\nNew runId:\n  " ) + new_runID );
+                "hyphen;\nand may be at most 60 characters in length."
+                "\nNew runId:\n  " ) + new_runID );
    }
 
    // Set the runID and directory
@@ -3444,6 +3460,8 @@
       if ( status != 0 ) return;
    }
    QString runIDt = le_runID->text();              // User given run ID text
+DbgLv(1) << "ExpAuc: runIDt" << runIDt;
+DbgLv(1) << "ExpAuc: runID" << runID;
 
    if ( runIDt != runID )
    {  // Set runID to new entry given by user
@@ -3456,6 +3474,15 @@
          new_runID.replace( pos, 1, "_" );         // Replace 1 char at pos
       }
 
+DbgLv(1) << "ExpAuc: new_runID len" << new_runID.length();
+      if ( new_runID.length() > 60 )
+      {
+         new_runID          = QString( new_runID ).left( 52 )
+                            + QString( new_runID ).right( 8 );
+DbgLv(1) << "ExpAuc: corr new_runID len" << new_runID.length();
+DbgLv(1) << "ExpAuc: new_runID" << new_runID;
+      }
+
       // Let the user know that the runID name has changed
       QMessageBox::warning( this,
          tr( "RunId Name Changed" ),