ENH: Renamed DatasetModel::Name to ::Hash.

Code/Common/Core/mvdDatabaseConnection.cxx

@@ -211,6 +211,7 @@ DatabaseConnection
     dbc.ExecuteQuery( SQL_CREATE_DB[ i ] );
     }
 
+/*
 #if 1
   for( int i=0; i<SQL_INSERT_ITEMS_COUNT; ++i )
     {
@@ -218,6 +219,7 @@ DatabaseConnection
     dbc.ExecuteQuery( SQL_INSERT_ITEMS[ i ] );
     }
 #endif
+*/
 }
 
 /*****************************************************************************/

Code/Common/Core/mvdDatabaseModel.cxx

@@ -109,7 +109,7 @@ DatabaseModel
     // store alias <-> name
     StringPairType spair;
     spair.first = it.value()->GetAlias();
-    spair.second = it.value()->GetName();
+    spair.second = it.value()->GetHash();
 
     // insert the pair in the list
     list.append( spair);
@@ -122,7 +122,7 @@ DatabaseModel
 /*******************************************************************************/
 DatasetModel*
 DatabaseModel
-::SelectDatasetModel( const DatasetId& id )
+::SelectDatasetModel( const DatasetHash& id )
 {
   // qDebug() << this << "::SelectDatasetModel(" << id << ")";
 
@@ -181,7 +181,7 @@ DatabaseModel
 /*******************************************************************************/
 void
 DatabaseModel
-::RemoveDatasetModel( const DatasetId& id )
+::RemoveDatasetModel( const DatasetHash& id )
 {
   ReleaseDatasetModel( id, true );
 
@@ -221,17 +221,17 @@ DatabaseModel
 }
 
 /*******************************************************************************/
-DatabaseModel::DatasetId
+DatasetHash
 DatabaseModel
 ::RegisterDatasetModel( DatasetModel* model )
 {
   assert( model!=NULL );
 
-  // Construct DatasetId.
-  DatasetId id( model->GetName() );
+  // Construct DatasetHash.
+  DatasetHash hash( model->GetHash() );
 
   // Find possible previously registerd dataset-model...
-  DatasetModelMap::iterator it( m_DatasetModels.find( id ) );
+  DatasetModelMap::iterator it( m_DatasetModels.find( hash ) );
 
   if( it!=m_DatasetModels.end() )
     {
@@ -247,7 +247,7 @@ DatabaseModel
     }
 
   // Insert new dataset-model...
-  it = m_DatasetModels.insert( id, model );
+  it = m_DatasetModels.insert( hash, model );
 
   // Re-parent dataset-model.
   model->setParent( this );
@@ -256,13 +256,13 @@ DatabaseModel
   emit DatabaseChanged();
 
   // Return registered ID.
-  return id;
+  return hash;
 }
 
 /*******************************************************************************/
 void
 DatabaseModel
-::ReleaseDatasetModel( const DatasetId& id, bool remove )
+::ReleaseDatasetModel( const DatasetHash& id, bool remove )
 {
   // qDebug() << this << "::ReleaseDatasetModel(" << id << ")";
 
@@ -296,7 +296,7 @@ DatabaseModel
 /*******************************************************************************/
 DatasetModel*
 DatabaseModel
-::NewDatasetModel( const DatasetId& id )
+::NewDatasetModel( const DatasetHash& id )
 {
   // qDebug() << this << "::NewDatasetModel(" << id << ")";
 
@@ -378,7 +378,7 @@ DatabaseModel
       assert( datasetModel!=NULL );
 
       // by default alias == name
-      m_DatasetModels.insert( datasetModel->GetName(), datasetModel );
+      m_DatasetModels.insert( datasetModel->GetHash(), datasetModel );
       }
     else
       {

Code/Common/Core/mvdDatabaseModel.h

@@ -83,10 +83,6 @@ class Monteverdi2_EXPORT DatabaseModel :
 // Public types.
 public:
 
-  /**
-   */
-  typedef QString DatasetId;
-
   /**
    * \class BuildContext
    * \brief WIP.
@@ -124,12 +120,12 @@ public:
   /**
    */
   inline
-    const DatasetModel* FindDatasetModel( const DatasetId& id ) const;
+    const DatasetModel* FindDatasetModel( const DatasetHash& id ) const;
 
   /**
    */
   inline
-    DatasetModel* FindDatasetModel( const DatasetId& id );
+    DatasetModel* FindDatasetModel( const DatasetHash& id );
 
   /**
    */
@@ -143,11 +139,11 @@ public:
 
   /**
    */
-  DatasetModel* SelectDatasetModel( const DatasetId& id );
+  DatasetModel* SelectDatasetModel( const DatasetHash& id );
 
   /**
    */
-  void RemoveDatasetModel( const DatasetId& id );
+  void RemoveDatasetModel( const DatasetHash& id );
 
   //
   // AbstractModel overrides.
@@ -185,7 +181,7 @@ public slots:
 
   /**
    */
-  DatasetId RegisterDatasetModel( DatasetModel* );
+  DatasetHash RegisterDatasetModel( DatasetModel* );
 
   /*-[ PROTECTED SECTION ]---------------------------------------------------*/
 
@@ -209,7 +205,7 @@ protected:
 private:
   /**
    */
-  typedef QMap< DatasetId, DatasetModel* > DatasetModelMap;
+  typedef QMap< DatasetHash, DatasetModel* > DatasetModelMap;
 
 //
 // Private methods.
@@ -230,13 +226,13 @@ private:
    */
   inline
     DatasetModelMap::const_iterator
-    DatasetModelIterator( const DatasetId& id ) const;
+    DatasetModelIterator( const DatasetHash& id ) const;
 
   /**
    */
   inline
     DatasetModelMap::iterator
-    DatasetModelIterator( const DatasetId& id );
+    DatasetModelIterator( const DatasetHash& id );
 
   /**
    * \brief Find dataset identified by given key, delete its
@@ -247,12 +243,12 @@ private:
    * \param remove true to remove it from list of registered dataset,
    * false to keep it in.
    */
-  void ReleaseDatasetModel( const DatasetId& id, bool remove );
+  void ReleaseDatasetModel( const DatasetHash& id, bool remove );
 
   /**
    */
   inline
-    void SetSelectedDatasetModel( const DatasetId& id );
+    void SetSelectedDatasetModel( const DatasetHash& id );
 
   /**
    */
@@ -261,7 +257,7 @@ private:
 
   /**
    */
-  DatasetModel* NewDatasetModel( const DatasetId& id );
+  DatasetModel* NewDatasetModel( const DatasetHash& id );
 
 //
 // Private attributes.
@@ -325,7 +321,7 @@ DatabaseModel
 inline
 void
 DatabaseModel
-::SetSelectedDatasetModel( const DatasetId& id )
+::SetSelectedDatasetModel( const DatasetHash& id )
 {
   SetSelectedDatasetModel( FindDatasetModel( id ) );
 }
@@ -347,7 +343,7 @@ DatabaseModel
 inline
 const DatasetModel*
 DatabaseModel
-::FindDatasetModel( const DatasetId& id ) const
+::FindDatasetModel( const DatasetHash& id ) const
 {
   // qDebug() << this << "::FindDatasetModel(" << id << ")";
 
@@ -362,7 +358,7 @@ DatabaseModel
 inline
 DatasetModel*
 DatabaseModel
-::FindDatasetModel( const DatasetId& id )
+::FindDatasetModel( const DatasetHash& id )
 {
   // qDebug() << this << "::FindDatasetModel(" << id << ")";
 
@@ -377,7 +373,7 @@ DatabaseModel
 inline
 DatabaseModel::DatasetModelMap::const_iterator
 DatabaseModel
-::DatasetModelIterator( const QString& id ) const
+::DatasetModelIterator( const DatasetHash& id ) const
 {
   // qDebug() << this << "::DatasetModelIterator(" << id << ")";
 

Code/Common/Core/mvdDatasetDescriptor.cxx

@@ -842,7 +842,7 @@ DatasetDescriptor
   
   // dataset name element
   QDomElement nameElt(
-    CreateTextNode( model->GetName(), 
+    CreateTextNode( model->GetHash(), 
                     TAG_NAMES[ ELEMENT_DATASET_NAME ] )
     );
   datasetElt.appendChild( nameElt );

Code/Common/Core/mvdDatasetModel.cxx

@@ -74,12 +74,12 @@ const char* DatasetModel::HISTOGRAM_FILE_EXT = ".txt";
 /*****************************************************************************/
 bool
 DatasetModel
-::IsVersionCompliant( const QString& path, const QString& name )
+::IsVersionCompliant( const QString& path, const QString& hash )
 {
   try
     {
     return DatasetDescriptor::IsVersionCompliant(
-      QDir( QFileInfo( path, name ).filePath() )
+      QDir( QFileInfo( path, hash ).filePath() )
       .filePath( DatasetModel::DESCRIPTOR_FILENAME )
       );
     }
@@ -115,7 +115,7 @@ DatasetModel
   AbstractModel( parent ),
   m_Descriptor( NULL ),
   m_Path(),
-  m_Name(),
+  m_Hash(),
   m_Alias( ),
   m_Directory(),
   m_LastPhysicalCenter(),
@@ -325,20 +325,20 @@ DatasetModel
   // Create directory structure, if needed.
   bool isEmpty = I18nCoreApplication::MakeDirTree(
     buildContext->m_Path,
-    buildContext->m_Name
+    buildContext->m_Hash
   );
 
   // Access working directory.
   QDir workingDir( buildContext->m_Path );
-  if( !workingDir.cd( buildContext->m_Name ) )
+  if( !workingDir.cd( buildContext->m_Hash ) )
     throw SystemError(
       ToStdString(
-	QString( "('%1')" ).arg( workingDir.filePath( buildContext->m_Name ) ) )
+	QString( "('%1')" ).arg( workingDir.filePath( buildContext->m_Hash ) ) )
     );    
 
   // Remember access to directory structure.
   m_Path = buildContext->m_Path;
-  m_Name = buildContext->m_Name;
+  m_Hash = buildContext->m_Hash;
   m_Alias = buildContext->m_Alias;
   m_Directory = workingDir;
 

Code/Common/Core/mvdDatasetModel.h

@@ -100,13 +100,13 @@ public:
 
     // Constructor used when importing.
     BuildContext( const QString& path,
-		  const QString& name,
+		  const QString& hash,
 		  const QString& alias,
 		  int width,
 		  int height,
 		  bool isForceCreateEnabled =false ) :
       m_Path( path ),
-      m_Name( name ),
+      m_Hash( hash ),
       m_Alias( alias),
       m_Width( width ),
       m_Height( height ),
@@ -117,9 +117,9 @@ public:
 
     // Constructor used when pre-loading.
     BuildContext( const QString& path,
-		  const QString& name ) :
+		  const QString& hash ) :
       m_Path( path ),
-      m_Name( name ),
+      m_Hash( hash ),
       m_Alias(),
       m_Width( -1 ),
       m_Height( -1 ),
@@ -131,7 +131,7 @@ public:
     // Constructor used when selecting.
     BuildContext( int width, int height ) :
       m_Path(),
-      m_Name(),
+      m_Hash(),
       m_Alias(),
       m_Width( width ),
       m_Height( height ),
@@ -144,7 +144,7 @@ public:
     // Public attributes
   public:
     QString m_Path;
-    QString m_Name;
+    QString m_Hash;
     QString m_Alias;
     int m_Width;
     int m_Height;
@@ -172,7 +172,7 @@ public:
 
   /**
    */
-  static bool IsVersionCompliant( const QString& path, const QString& name );
+  static bool IsVersionCompliant( const QString& path, const QString& hash );
 
   //
   // Instance methods.
@@ -196,7 +196,7 @@ public:
 
   /**
    */
-  inline const QString& GetName() const;
+  inline const DatasetHash& GetHash() const;
 
   /**
    */
@@ -365,7 +365,7 @@ private:
 
   /**
    */
-  QString m_Name;
+  QString m_Hash;
 
   /**
    */
@@ -496,11 +496,11 @@ DatasetModel
 
 /*****************************************************************************/
 inline
-const QString&
+const DatasetHash&
 DatasetModel
-::GetName() const
+::GetHash() const
 {
-  return m_Name;
+  return m_Hash;
 }
 
 /*****************************************************************************/

Code/Common/Core/mvdTypes.h

@@ -290,7 +290,13 @@ typedef std::map< std::string, StringVector > ApplicationsTagContainer;
 
 /*******************************************************************************/
 /* Type definitions for dataset properties                                     */
-
+/**
+ */
+typedef int SqlId;
+/**
+ */
+// typedef SqlId DatasetId;
+typedef QString DatasetHash;
 /**
  */
 typedef std::pair< std::string, std::string > PropertyType;

Code/Common/Gui/mvdDatabaseBrowserController.cxx

@@ -370,7 +370,7 @@ DatabaseBrowserController
   // loop.
   bool areSignalsBlocked = widget->blockSignals( true );
   {
-  widget->SetCurrentDataset( datasetModel->GetName() );
+  widget->SetCurrentDataset( datasetModel->GetHash() );
   }
   widget->blockSignals( areSignalsBlocked );
 }