From e1e6a7182d0458a8e1d364307d4912eef604fa3c Mon Sep 17 00:00:00 2001 From: gdd Date: Thu, 28 May 2009 14:57:55 +0000 Subject: [PATCH] Few fixes --- src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx | 21 +++---------------- src/GUI/BLSURFPluginGUI_HypothesisCreator.h | 1 - src/GUI/BLSURFPlugin_msg_en.ts | 5 ++++- src/GUI/Makefile.am | 10 ++++----- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx index 7abcd5e..0a4a8bb 100644 --- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx @@ -51,8 +51,6 @@ #include #include #include -#include -#include #include #include @@ -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 4db9d65..7b7d015 100644 --- 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 5c33a10..5fb60b8 100644 --- a/src/GUI/BLSURFPlugin_msg_en.ts +++ b/src/GUI/BLSURFPlugin_msg_en.ts @@ -102,7 +102,6 @@ SMP_ENTRY_COLUMN Entry - SMP_NAME_COLUMN Name @@ -143,6 +142,10 @@ BLSURF_SM_POINT_VALUE Size on Point(s) + + BLSURF_ADV_ARGS + Advanced + BLSURF_TITLE Hypothesis Construction diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am index 28ff246..d65b7a6 100644 --- 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 -- 2.39.2