From: vsr <vsr@opencascade.com>
Date: Thu, 15 Mar 2012 16:10:52 +0000 (+0000)
Subject: 0021208: EDF 1138 SMESH: Performance issue when loading SMESH with an hdf file contai... 
X-Git-Tag: V6_5_0a1~43
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=05189ca91b2a16174ae9a3e774f723b8c680508e;p=modules%2Fsmesh.git

0021208: EDF 1138 SMESH: Performance issue when loading SMESH with an hdf file containing a big mesh
Show message in the status bar on mesh loading operation
---

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 6de6c06a1..37994bfd3 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -139,6 +139,7 @@
 
 // Qt includes
 // #define       INCLUDE_MENUITEM_DEF // VSR commented ????????
+#include <QApplication>
 #include <QMenu>
 #include <QTextStream>
 
@@ -5946,6 +5947,35 @@ void SMESHGUI::onViewClosed( SUIT_ViewWindow* pview ) {
 #endif
 }
 
+void SMESHGUI::message( const QString& msg )
+{
+  // dispatch message
+  QStringList data = msg.split("/");
+  if ( data.count() > 0 ) {
+    if ( data.first() == "mesh_loading" ) {
+      // get mesh entry
+      QString entry = data.count() > 1 ? data[1] : QString();
+      if ( entry.isEmpty() )
+	return;
+      // get study
+      _PTR(Study) study = dynamic_cast<SalomeApp_Study*>( application()->activeStudy() )->studyDS();
+      // get mesh name
+      _PTR(SObject) obj = study->FindObjectID( entry.toLatin1().constData() );
+      QString name;
+      if ( obj )
+	name = obj->GetName().c_str();
+      if ( name.isEmpty() )
+	return;
+      
+      if ( data.last() == "stop" )
+	application()->putInfo( tr( "MESH_LOADING_MSG_FINISHED" ).arg( name ) );
+      else
+	application()->putInfo( tr( "MESH_LOADING_MSG" ).arg( name ) );
+      QApplication::processEvents();
+    }
+  }
+}
+
 /*!
   \brief Connects or disconnects signals about activating and cloning view on the module slots
   \param pview view which is connected/disconnected
diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h
index 4c7e0ef15..86ebc053e 100644
--- a/src/SMESHGUI/SMESHGUI.h
+++ b/src/SMESHGUI/SMESHGUI.h
@@ -137,6 +137,8 @@ public :
   virtual void                    createPreferences();
   virtual void                    preferencesChanged( const QString&, const QString& );
 
+  virtual void                    message( const QString& );
+
   virtual void                    update( const int );
 
   static SALOMEDS::Color          getUniqueColor( const QList<SALOMEDS::Color>& );
@@ -158,7 +160,6 @@ public slots:
   virtual void                    studyClosed( SUIT_Study* );
   void                            onViewClosed( SUIT_ViewWindow* );
 
-
 private slots:
   void                            OnGUIEvent();
   void                            onViewManagerActivated( SUIT_ViewManager* );
diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index d58f9cb85..377b5b6a5 100644
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -3657,6 +3657,14 @@ Input value precision can be adjusted using
         <source>SMESH_PLUGINS_OTHER</source>
         <translation>SMESH plugins</translation>
     </message>
+    <message>
+        <source>MESH_LOADING_MSG</source>
+        <translation>Loading mesh %0 in progress</translation>
+    </message>
+    <message>
+        <source>MESH_LOADING_MSG_FINISHED</source>
+        <translation>Mesh %0 loading done</translation>
+    </message>
 </context>
 <context>
     <name>SMESHGUI_GroupDlg</name>
diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 7f23f5af5..95b185513 100755
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -3729,6 +3729,14 @@ avec le paramètre &apos;%1&apos; des préférences du module Mesh.</translation
         <source>SMESH_PLUGINS_OTHER</source>
         <translation>Extensions SMESH</translation>
     </message>
+    <message>
+        <source>MESH_LOADING_MSG</source>
+        <translation type="unfinished">Loading mesh %0 in progress</translation>
+    </message>
+    <message>
+        <source>MESH_LOADING_MSG_FINISHED</source>
+        <translation type="unfinished">Mesh %0 loading done</translation>
+    </message>
 </context>
 <context>
     <name>SMESHGUI_GroupDlg</name>