From: ouv <ouv@opencascade.com>
Date: Wed, 3 Dec 2008 15:55:53 +0000 (+0000)
Subject: Dump Python extension
X-Git-Tag: TG_DumpPython_Extension_3_1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e068be6bc87886f9672eea8ee86e159c41b3f1e1;p=modules%2Fgui.git

Dump Python extension
---

diff --git a/doc/salome/gui/images/notebook1.png b/doc/salome/gui/images/notebook1.png
new file mode 100644
index 000000000..03d320d93
Binary files /dev/null and b/doc/salome/gui/images/notebook1.png differ
diff --git a/doc/salome/gui/input/gui_module_chapter.doc b/doc/salome/gui/input/gui_module_chapter.doc
index bc95ea061..3645116b0 100644
--- a/doc/salome/gui/input/gui_module_chapter.doc
+++ b/doc/salome/gui/input/gui_module_chapter.doc
@@ -20,6 +20,7 @@
 <li>\subpage using_find_tool_page</li>
 <li>\subpage using_registry_tool_page</li>
 <li>\subpage using_catalog_generator_page "Using Catalog Generator"</li>
+<li>\subpage using_notebook</li>
 <li>\subpage viewers_page</li>
 <ul>
 <li>\ref occ_3d_viewer_page</li>
diff --git a/doc/salome/gui/input/index.doc b/doc/salome/gui/input/index.doc
index 1f4d18053..e4666e575 100644
--- a/doc/salome/gui/input/index.doc
+++ b/doc/salome/gui/input/index.doc
@@ -31,6 +31,7 @@
 <li>\ref using_find_tool_page</li>
 <li>\ref using_registry_tool_page</li>
 <li>\ref using_catalog_generator_page "Using Catalog Generator"</li>
+<li>\ref using_notebook</li>
 <li>\ref viewers_page</li>
 <ul>
 <li>\ref occ_3d_viewer_page</li>
diff --git a/doc/salome/gui/input/using_notebook.doc b/doc/salome/gui/input/using_notebook.doc
new file mode 100644
index 000000000..d48fe8fcb
--- /dev/null
+++ b/doc/salome/gui/input/using_notebook.doc
@@ -0,0 +1,26 @@
+/*!
+
+\page using_notebook Using NoteBook
+
+SALOME <b>NoteBook</b> is destined for managing numerical and boolean
+parameters (variables) which are used to create and modify objects in
+different components.
+
+To open the <b>NoteBook</b> choose <b>File > Notebook</b>, the following
+dialog box will appear:
+
+\image html notebook1.png
+
+Here you can add new variables, remove and rename existing variables and 
+change their values.
+
+If you have modified some variables, which are already used in the current
+study, you should click <b>Update Study</b> button to apply your changes
+to the study.
+
+\note The dialog will not be validated until at least one of variables in
+the table has invalid name or value (marked by red color). Names of
+variables should be unique and their values should be numerical (integer or
+double) or boolean ("True" / "False").
+
+*/
\ No newline at end of file
diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
index d321db431..6d6c69fba 100644
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
@@ -152,12 +152,12 @@ QString NoteBook_TableRow::GetValue() const
 //============================================================================
 bool NoteBook_TableRow::CheckName()
 {
-  bool aResult = false;
   QString aName = GetName();
-  if( !aName.isEmpty() )
-    aResult = true;
-  
-  return aResult;
+  int aPos = 0;
+  QRegExpValidator aValidator( QRegExp("^([a-zA-Z]+)([a-zA-Z0-9_]*)$"), 0 );
+  if( aName.isEmpty() || !aValidator.validate( aName, aPos ) )
+    return false;
+  return true;
 }
 
 //============================================================================