Changeset 239

Timestamp:

08/20/08 16:45:45 (4 years ago)

Author:

PRGazis

Message:

Fixed bug that could cause segfault during an unusual sequence of failed read operations, added a Clear All Data menu option, revised and cleaned up README and help menu

Files:

• README (modified) (3 diffs)
• data_file_manager.cpp (modified) (1 diff)
• global_definitions_vp.h (modified) (1 diff)
• vp.cpp (modified) (5 diffs)
• vp_help_manual.htm (modified) (6 diffs)

README

@@ -67 +67 @@
 Usage:
 
-In its current form (Version 2.1.2, build 238) 'viewpoints' is run either by 
+In its current form (Version 2.1.3, build 239) 'viewpoints' is run either by 
 clicking on the 'vp' icon or from the command line in the directory in which 
 it has been installed or to which a path is available.  When viewpoints is 
@@ -231 +231 @@
  File|Save all data          Write all data
  File|Save selected data     Write only the currently selected data
- File|Load Configuration     Load basic configuration information
- File|Save Configuration     Save basic configuration information
+ File|Load Configuration     Load configuration information
+ File|Save Configuration     Save configuration information
+ File|Clear all data         Replace data with a small default array
  File|Quit                   Quit
  View|File Name              Show name of current data file
@@ -374 +375 @@
 Notes and warnings:
 
-The current release of the 'viewpoints' package (version 2.1.2, build 238) is 
+The current release of the 'viewpoints' package (version 2.1.3, build 239) is 
 still a development version.  While every effort has been make to ensure that 
 it will work -- or fail gracefully if it doesn't -- it still has many rough 

data_file_manager.cpp

@@ -345 +345 @@
       sWarning.append( "Restoring existing data.");
       column_info = old_column_info;
+      points.resize( old_points.shape());
       points = old_points;
-      points.resize( old_points.shape());
       npoints = points.columns();
       nvars = points.rows();

global_definitions_vp.h

@@ -182 +182 @@
 //# Make absolutely certain SVN_VERSION is defined
 #ifdef __WIN32__
-  #define SVN_VERSION "Windows revision 238"
+  #define SVN_VERSION "Windows revision 239"
 #endif
 #ifndef SVN_VERSION

vp.cpp

@@ -562 +562 @@
     }
     else if( strncmp( widgetTitle, "Append", 6) == 0 ||
-        strncmp( widgetTitle, "Merge", 5) == 0) {
+        strncmp( widgetTitle, "Merge", 5) == 0 ||
+        strncmp( widgetTitle, "Clear all", 9) == 0) {
       thisOperation = NEW_DATA;
       do_restore_settings = 1;
@@ -930 +931 @@
     (Fl_Callback *) save_state, 0, FL_MENU_DIVIDER);
   main_menu_bar->add( 
+    "File/Clear all data       ", 0, 
+    (Fl_Callback *) read_data, (void*) "clear all data");
+  main_menu_bar->add( 
     "File/Quit   ", 0, (Fl_Callback *) exit);
 
@@ -1312 +1316 @@
   else dfm.do_merge( 0);
 
-  // If this was a "Reload File" operation and we know the name of the
-  // data file, do nothing.  Otherwise invoke the findInputFile() method of 
-  // the data_file_manager object to query the user for the input filename.
-  // If no file is specified, return immediately and hope the calling routine 
-  // can handle this situation.
-  if( ( strstr( (char *) user_data, "reload") != NULL) &&
+  // If this was a "Clear all data" operation, query the user and set the
+  // doCleaarAllData flag.  If this was a "Reload File" operation and we 
+  // know the name of the data file, do nothing.  Otherwise invoke the 
+  // findInputFile() method of the data_file_manager object to query the 
+  // user for the input filename.  If no file is specified, return 
+  // immediately and hope the calling routine can handle this situation.
+  unsigned doClearAllData = 0;
+  if( strstr( (char *) user_data, "clear") != NULL) {
+    if( !expert_mode &&
+        make_confirmation_window( "Clear all data?  Are you sure?") <= 0)
+      return;
+    doClearAllData = 1;
+  }
+  else if( ( strstr( (char *) user_data, "reload") != NULL) &&
       (dfm.input_filespec()).length() > 0) {
   }
@@ -1329 +1341 @@
   }
 
-  // Invoke the load_data_file() method of the data_file_manager object to 
-  // read the data file.  Error reporting is handled by the method itself.
-  dfm.load_data_file();
+  // If the doClearAllData flag is set, invoke the create_default_data()
+  // method of the Data_File_Manager object to generate default data, 
+  // otherwise invoke the load_data_file() method to read the data file.  
+  // Error reporting is handled by the relevant methods.
+  if( doClearAllData) dfm.create_default_data( 10);
+  else dfm.load_data_file();
 
   // If only one or fewer records are available, quit before something 
@@ -1909 +1924 @@
 
   about_string = "\n\
-    viewpoints 2.1.2 \n\
+    viewpoints 2.1.3 \n\
     " + string(SVN_VERSION) + "\n\
     \n\

vp_help_manual.htm

@@ -152 +152 @@
 <tr>
  <td>File|Load Configuration</td>
- <td>Load <em>some</em> configuration information</td>
+ <td>Load configuration information</td>
 </tr>
 <tr>
  <td>File|Save Configuration</td>
- <td>Save <em>some</em> configuration information</td>
+ <td>Save configuration information</td>
+</tr>
+<tr>
+ <td>File|Clear all data</td>
+ <td>Clear data and replace it with a small default array</td>
 </tr>
 <tr>
@@ -255 +259 @@
 <a name="Plot_Window_Controls"></a>
 <table>
-<tr><td colspan="2"><b>Tabbed control panels for <em>windows</em></td></tr>
+<tr><td colspan="2"><b>Tabbed control panels for <em>windows</em></b></td></tr>
 <tr>
  <th align="LEFT">Control</th><th align="LEFT">Action</th>
@@ -357 +361 @@
 <a name="Brush_Controls"></a>
 <table>
-<tr><td colspan="2"><b>Tabbed control panels for <em>brushes</em></td></tr>
+<tr><td colspan="2"><b>Tabbed control panels for <em>brushes</em></b></td></tr>
 <tr>
  <th align="LEFT">Control</th><th align="LEFT">Action</th>
@@ -400 +404 @@
 <p>
 <table>
-<tr><td colspan="2"><b>Main control panel</td></tr>
+<tr><td colspan="2"><b>Main control panel</b></td></tr>
 <tr>
  <th align="LEFT">Control</th><th align="LEFT">Action</th>
@@ -420 +424 @@
 </tr>
 <tr>
- <td>change axes</td><td>Change all (unlocked) axes in all plots.  Good for browsing.
+ <td>change axes</td><td>Change all (unlocked) axes in all plots.  Good for browsing.</td>
 </tr>
 <tr>
@@ -522 +526 @@
 
 <p>
-The current release of the 'viewpoints' package (version 2.1.2, build 238) 
+The current release of the 'viewpoints' package (version 2.1.3, build 239) 
 is still a development version.  While every effort has been make to ensure 
 that it will work -- or fail gracefully if it doesn't -- it still has many