Few fixes

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index 7abcd5ec30d624335702cc00f73533d6450e049a..0a4a8bbe1579f305e61f149f8afbbadb801a46f0 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -51,8 +51,6 @@
 #include <QHeaderView>
 #include <QApplication>
 #include <QRadioButton>
-#include <QStandardItemModel>
-#include <QStandardItem>
 
 #include <LightApp_SelectionMgr.h>
 #include <SalomeApp_Application.h> 
@@ -105,9 +103,9 @@ enum {
   SMP_BTNS = 0,
 //   SMP_ATTRACTOR_BTN,
 //   SMP_SEPARATOR1,
-  SMP_SURFACE_BTN,
-  SMP_EDGE_BTN,
   SMP_POINT_BTN,
+  SMP_EDGE_BTN,
+  SMP_SURFACE_BTN,
   SMP_SEPARATOR2,
   SMP_REMOVE_BTN,
 };
@@ -541,7 +539,7 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
 
   // ---
   tab->insertTab( STD_TAB, myStdGroup, tr( "SMESH_ARGUMENTS" ) );
-  tab->insertTab( ADV_TAB, myAdvGroup, tr( "GHS3D_ADV_ARGS" ) );
+  tab->insertTab( ADV_TAB, myAdvGroup, tr( "BLSURF_ADV_ARGS" ) );
   tab->insertTab( SMP_TAB, mySmpGroup, tr( "BLSURF_SIZE_MAP" ) );
 
   tab->setCurrentIndex( STD_TAB );
@@ -559,22 +557,9 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
   connect(removeButton, SIGNAL(clicked()), this, SLOT(onRemoveMap()));
   connect(mySizeMapTable, SIGNAL(cellChanged ( int, int  )),this,SLOT (onSetSizeMap(int,int )));
 
-//  connect(tab, SIGNAL(currentChanged ( int  )),this,SLOT (onSetSelectionFilter(int)));
-
   return fr;
 }
 
-
-void BLSURFPluginGUI_HypothesisCreator::onSetSelectionFilter(int page) 
-{
-  cout << "BLSURFPluginGUI_HypothesisCreator::onSetSelectionFilter(" << page << ")" << endl;
-  aSel->clearFilters();
-  if (page == SMP_TAB) {
-    cout << "Page is SIZEMAP" << endl;
-    aSel = GeomToolSelected->selectionMgr();
-  }
-}
-
 void BLSURFPluginGUI_HypothesisCreator::retrieveParams() const
 {
   cout << "BLSURFPluginGUI_HypothesisCreator::retrieveParams" << endl; 

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
index 4db9d65fd4894320ff59519478887e36029b8966..7b7d015e344fca051daf87ea82361a5260791359 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
@@ -104,7 +104,6 @@ protected slots:
   void                onAddMapOnPoint();
   void                onRemoveMap();
   void                onSetSizeMap(int,int);
-  void                onSetSelectionFilter(int);
 
 private:
   bool                readParamsFromHypo( BlsurfHypothesisData& ) const;

diff --git a/src/GUI/BLSURFPlugin_msg_en.ts b/src/GUI/BLSURFPlugin_msg_en.ts
index 5c33a10b934c76a52cccbc271fc91bb193b34bb4..5fb60b85c16258312ac0fd0b04549deaff96a35a 100644 (file)
--- a/src/GUI/BLSURFPlugin_msg_en.ts
+++ b/src/GUI/BLSURFPlugin_msg_en.ts
@@ -102,7 +102,6 @@
             <source>SMP_ENTRY_COLUMN</source>
             <translation>Entry</translation>
         </message>
-        <message>
         <message>
             <source>SMP_NAME_COLUMN</source>
             <translation>Name</translation>
@@ -143,6 +142,10 @@
             <source>BLSURF_SM_POINT_VALUE</source>
             <translation>Size on Point(s)</translation>
         </message>
+        <message>
+            <source>BLSURF_ADV_ARGS</source>
+            <translation>Advanced</translation>
+        </message>
         <message>
             <source>BLSURF_TITLE</source>
             <translation>Hypothesis Construction</translation>

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 28ff246915bacb1cb3e5a9498aec6518be22a1f4..d65b7a6521272287168082346b872371736d1f6b 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -24,15 +24,15 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =        \
+       BLSURFPluginGUI_HypothesisCreator.h
 
 # Libraries targets
 lib_LTLIBRARIES = libBLSURFPluginGUI.la
 
-dist_libBLSURFPluginGUI_la_SOURCES =           \
-       BLSURFPluginGUI.cxx                     \
-       BLSURFPluginGUI_HypothesisCreator.h     \
-       BLSURFPluginGUI_HypothesisCreator.cxx   
+dist_libBLSURFPluginGUI_la_SOURCES = \
+       BLSURFPluginGUI.cxx \
+       BLSURFPluginGUI_HypothesisCreator.cxx
 #      ui_BLSURFPluginGUI_MapFunctionEditor.h  \
 #      BLSURFPluginGUI_MapFunctionEditor.h     \
 #      BLSURFPluginGUI_MapFunctionEditor.cxx