Thread: [Gcblue-commits] gcb_wx/src/database tcDatabaseObject.cpp,1.20,1.21

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3422/src/database

Modified Files:
	tcDatabaseObject.cpp 
Log Message:


Index: tcDatabaseObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseObject.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcDatabaseObject.cpp	23 Mar 2006 01:11:02 -0000	1.20
--- tcDatabaseObject.cpp	26 Mar 2006 00:32:14 -0000	1.21
***************
*** 220,223 ****
--- 220,246 ----
  
      /**
+     * @return string array with parsed filenames of images for this db object
+     * Database image files are stored in the images\db folder
+     */
+     const wxArrayString& tcDatabaseObject::GetParsedImageList()
+     {
+         if ((parsedImageList.size() > 0) || (imageList.size() < 3))
+         {
+             return parsedImageList;
+         }
+ 
+         wxString s(imageList.c_str());
+         while (!s.IsEmpty())
+         {
+             wxString fileName = s.BeforeFirst(';');
+             fileName.Prepend("db\\");
+             parsedImageList.Add(fileName);
+             s = s.AfterFirst(';');
+         }
+         return parsedImageList;
+         
+     }
+ 
+     /**
      * workaround for write serialization issue
      * @return true if db obj is a leaf obj 
***************
*** 247,253 ****
  		wxString fileWithPath;
  
! 		if (strlen(mzImageFileName.mz) > 4)
  		{
! 			fileWithPath.Printf("icons\\%s", mzImageFileName.mz);
  		}
  		else
--- 270,276 ----
  		wxString fileWithPath;
  
! 		if (strlen(iconFileName.mz) > 4)
  		{
! 			fileWithPath.Printf("icons\\%s", iconFileName.mz);
  		}
  		else
***************
*** 269,273 ****
              mnKey,mnModelType,mnType,mnClassID);
          file.WriteString(s.GetBuffer());
!         s.Format("   imagefile:%s \n",mzImageFileName.mz);
          file.WriteString(s.GetBuffer());
      }
--- 292,296 ----
              mnKey,mnModelType,mnType,mnClassID);
          file.WriteString(s.GetBuffer());
!         s.Format("   imagefile:%s \n",iconFileName.mz);
          file.WriteString(s.GetBuffer());
      }
***************
*** 278,282 ****
              file.Read(&mnType,sizeof(mnType));
              mzClass.Serialize(file,mbLoad);
!             mzImageFileName.Serialize(file,mbLoad);   
              if (anVersion >= VERSION_1_0_2) {
                  mz3DModelFileName.Serialize(file,mbLoad);
--- 301,305 ----
              file.Read(&mnType,sizeof(mnType));
              mzClass.Serialize(file,mbLoad);
!             iconFileName.Serialize(file,mbLoad);   
              if (anVersion >= VERSION_1_0_2) {
                  mz3DModelFileName.Serialize(file,mbLoad);
***************
*** 289,293 ****
              file.Write(&mnType,sizeof(mnType));
              mzClass.Serialize(file,mbLoad);
!             mzImageFileName.Serialize(file,mbLoad);
              if (anVersion >= VERSION_1_0_2) {
                  mz3DModelFileName.Serialize(file,mbLoad);
--- 312,316 ----
              file.Write(&mnType,sizeof(mnType));
              mzClass.Serialize(file,mbLoad);
!             iconFileName.Serialize(file,mbLoad);
              if (anVersion >= VERSION_1_0_2) {
                  mz3DModelFileName.Serialize(file,mbLoad);
***************
*** 306,310 ****
              *csv >> mnModelType;
              *csv >> mnType;
!             *csv >> s; mzImageFileName = s.c_str();
              *csv >> s; mz3DModelFileName = s.c_str();
   
--- 329,333 ----
              *csv >> mnModelType;
              *csv >> mnType;
!             *csv >> s; iconFileName = s.c_str();
              *csv >> s; mz3DModelFileName = s.c_str();
   
***************
*** 326,330 ****
              *csv << long(mnModelType);
              *csv << long(mnType);
!             *csv << std::string(mzImageFileName.mz);
              *csv << std::string(mz3DModelFileName.mz);
              size_t len = strlen(mzDescription);
--- 349,353 ----
              *csv << long(mnModelType);
              *csv << long(mnType);
!             *csv << std::string(iconFileName.mz);
              *csv << std::string(mz3DModelFileName.mz);
              size_t len = strlen(mzDescription);
***************
*** 351,355 ****
          node->SetAttribute("modelType", int(mnModelType));
          node->SetAttribute("funcType", int(mnType));
!         node->SetAttribute("image", mzImageFileName.mz);
          node->SetAttribute("model3D", mz3DModelFileName.mz);
          TiXmlNode* descriptionNode = node->InsertEndChild(TiXmlElement("notes"));
--- 374,378 ----
          node->SetAttribute("modelType", int(mnModelType));
          node->SetAttribute("funcType", int(mnType));
!         node->SetAttribute("image", iconFileName.mz);
          node->SetAttribute("model3D", mz3DModelFileName.mz);
          TiXmlNode* descriptionNode = node->InsertEndChild(TiXmlElement("notes"));
***************
*** 363,367 ****
          *csv << "Model class id";  // model type 
          *csv << "Functional class id"; // functional classification
!         *csv << "ImageFileName";
          *csv << "3DModelFileName";
          *csv << "Description";
--- 386,390 ----
          *csv << "Model class id";  // model type 
          *csv << "Functional class id"; // functional classification
!         *csv << "IconFileName";
          *csv << "3DModelFileName";
          *csv << "Description";
***************
*** 381,385 ****
          columnString += "ClassificationId number(3),";
          columnString += "Cost number(7),";
!         columnString += "ImageFileName varchar(30)," ;
          columnString += "ModelFileName varchar(30),";
          columnString += "Description varchar(255)";
--- 404,409 ----
          columnString += "ClassificationId number(3),";
          columnString += "Cost number(7),";
!         columnString += "ImageList varchar(30)," ;
!         columnString += "IconFileName varchar(30)," ;
          columnString += "ModelFileName varchar(30),";
          columnString += "Description varchar(255)";
***************
*** 393,397 ****
  		mnType = entry.GetInt("ClassificationId");
          cost = entry.GetDouble("Cost");
! 		mzImageFileName = entry.GetString("ImageFileName").c_str();
  		mz3DModelFileName = entry.GetString("ModelFileName").c_str();
  
--- 417,422 ----
  		mnType = entry.GetInt("ClassificationId");
          cost = entry.GetDouble("Cost");
!         imageList = entry.GetString("ImageList").c_str();
! 		iconFileName = entry.GetString("IconFileName").c_str();
  		mz3DModelFileName = entry.GetString("ModelFileName").c_str();
  
***************
*** 404,413 ****
  	void tcDatabaseObject::WriteSql(std::string& valueString)
  	{
! 		wxString str = wxString::Format("'%s',%d,%d,%f,'%s','%s','%s'",
  			mzClass.mz,
  			mnModelType,
  			mnType,
              cost,
! 			mzImageFileName.mz,
  			mz3DModelFileName.mz,
  			mzDescription);
--- 429,439 ----
  	void tcDatabaseObject::WriteSql(std::string& valueString)
  	{
! 		wxString str = wxString::Format("'%s',%d,%d,%f,'%s','%s','%s','%s'",
  			mzClass.mz,
  			mnModelType,
  			mnType,
              cost,
!             imageList.c_str(),
! 			iconFileName.mz,
  			mz3DModelFileName.mz,
  			mzDescription);
***************
*** 418,433 ****
  
  
!     tcDatabaseObject::tcDatabaseObject() 
      {
-         mzClass = "UNDEFINED";
-         cost = 0;
-         mzImageFileName = "NONE";
-         mz3DModelFileName = "";
          strcpy(mzDescription,"No description is available.");
-         mnKey = 0;
-         mnModelType = MTYPE_OBJECT;
-         mnClassID = DTYPE_OBJECT;
-         mnType = PTYPE_UNKNOWN;
-         model = 0;
      }
  
--- 444,459 ----
  
  
!     tcDatabaseObject::tcDatabaseObject() :
!         mzClass("UNDEFINED"),
!         cost(0),
!         iconFileName(""),
!         mz3DModelFileName(""),
!         mnKey(0),
!         mnModelType(MTYPE_OBJECT),
!         mnClassID(DTYPE_OBJECT),
!         mnType(PTYPE_UNKNOWN),
!         model(0)
      {
          strcpy(mzDescription,"No description is available.");
      }
  
***************
*** 435,440 ****
  		mzClass(obj.mzClass),
          cost(obj.cost),
! 		mzImageFileName(obj.mzImageFileName),
!         mz3DModelFileName(obj.mz3DModelFileName)
      {
          mnKey = obj.mnKey;                       
--- 461,468 ----
  		mzClass(obj.mzClass),
          cost(obj.cost),
!         imageList(obj.imageList),
! 		iconFileName(obj.iconFileName),
!         mz3DModelFileName(obj.mz3DModelFileName),
!         parsedImageList(obj.parsedImageList)
      {
          mnKey = obj.mnKey;                       
***************
*** 443,447 ****
          mnModelType = obj.mnModelType;
         
!         strcpy(mzDescription, obj.mzDescription); // BAD, assumes obj has legal string
          model = 0; // model not copied
      }
--- 471,475 ----
          mnModelType = obj.mnModelType;
         
!         strncpy(mzDescription, obj.mzDescription, DESCRIPTION_STRING_LENGTH-1);
          model = 0; // model not copied
      }

Thread: [Gcblue-commits] gcb_wx/src/database tcDatabaseObject.cpp,1.20,1.21

gcblue-commits