Skip to content

Commit 58d1690

Browse files
adragnevVWadragnevVW
authored
Merge pull request #139 from mvrdevelopment/Fix-#138-GDTF-creates-empty-folder
Fix-GDTF-creates-empty-folder
2 parents 0b5fbaf + b584197 commit 58d1690

2 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎src/GDTFManager.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7691,7 +7691,13 @@ void GdtfFixture::PrepareWorkingFolder(TXString folderName)
76917691
if(folderName.IsEmpty()){ folderName = "GdtfGroup"; }
76927692

76937693
fWorkingFolder = (IID_FolderIdentifier);
7694-
fWorkingFolder->Set(EFolderSpecifier::kSpotlightFolder, true /*UserFolder*/, folderName);
7694+
7695+
IFolderIdentifierPtr folder ( IID_FolderIdentifier );
7696+
folder->Set( EFolderSpecifier::kSpotlightFolder, true, "GDTFs" );
7697+
folder->CreateOnDisk();
7698+
7699+
fWorkingFolder->Set(folder, folderName );
7700+
76957701

76967702
//---------------------------------------------------------------------------------------------
76977703
// Always start with a empty folder

‎unittest/GdtfUnittest.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,8 @@ void GdtfUnittest::ReadFile()
533533
this->checkifEqual("GetFixtureThumbnail " , thumbFileName, "MyThumbnail");
534534

535535
// Check if the Resource Files have been unpacked correctly.
536-
this->checkifEqual("GetFixtureThumbnail " , fullPath_PNG, fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator + "MyThumbnail.png" );
537-
this->checkifEqual("GetFixtureThumbnail " , fullPath_SVG, fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator + "MyThumbnail.svg");
536+
this->checkifEqual("GetFixtureThumbnail " , fullPath_PNG, fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator + "MyThumbnail.png");
537+
this->checkifEqual("GetFixtureThumbnail " , fullPath_SVG, fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator + "MyThumbnail.svg");
538538

539539
this->checkifTrue("Testwheel PNG exists.", UnitTestUtil::FileExists (fullPath_PNG) );
540540
this->checkifTrue("Testmodel SVG exits.", UnitTestUtil::FileExists (fullPath_SVG) );
@@ -1717,7 +1717,7 @@ void GdtfUnittest::ReadFile()
17171717
std::string GdtfUnittest::GetTestPNG_ThumbNail(bool readLocation)
17181718
{
17191719
std::string path;
1720-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator; }
1720+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator; }
17211721
else { path = fTestResourcesFolder + kSeparator; }
17221722
path += "MyThumbnail.png";
17231723
return path;
@@ -1726,7 +1726,7 @@ std::string GdtfUnittest::GetTestPNG_ThumbNail(bool readLocation)
17261726
std::string GdtfUnittest::GetTestSVG_ThumbNail(bool readLocation)
17271727
{
17281728
std::string path;
1729-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator; }
1729+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator; }
17301730
else { path = fTestResourcesFolder + kSeparator; }
17311731
path += "MyThumbnail.svg";
17321732
return path;
@@ -1735,7 +1735,7 @@ std::string GdtfUnittest::GetTestSVG_ThumbNail(bool readLocation)
17351735
std::string GdtfUnittest::GetTestSVG_Model(bool readLocation)
17361736
{
17371737
std::string path;
1738-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg" + kSeparator; }
1738+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg" + kSeparator; }
17391739
else { path = fTestResourcesFolder + kSeparator; }
17401740
path += "MyModel.svg";
17411741
return path;
@@ -1744,7 +1744,7 @@ std::string GdtfUnittest::GetTestSVG_Model(bool readLocation)
17441744
std::string GdtfUnittest::GetTestSVGSide_Model(bool readLocation)
17451745
{
17461746
std::string path;
1747-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg_side" + kSeparator; }
1747+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg_side" + kSeparator; }
17481748
else { path = fTestResourcesFolder + kSeparator; }
17491749
path += "MyModelSide.svg";
17501750
return path;
@@ -1753,7 +1753,7 @@ std::string GdtfUnittest::GetTestSVGSide_Model(bool readLocation)
17531753
std::string GdtfUnittest::GetTestSVGFront_Model(bool readLocation)
17541754
{
17551755
std::string path;
1756-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg_front" + kSeparator; }
1756+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg_front" + kSeparator; }
17571757
else { path = fTestResourcesFolder + kSeparator; }
17581758
path += "MyModelFront.svg";
17591759
return path;
@@ -1762,7 +1762,7 @@ std::string GdtfUnittest::GetTestSVGFront_Model(bool readLocation)
17621762
std::string GdtfUnittest::GetTest3DS_Model(bool readLocation)
17631763
{
17641764
std::string path;
1765-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "models3ds" + kSeparator; }
1765+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "models3ds" + kSeparator; }
17661766
else { path = fTestResourcesFolder + kSeparator; }
17671767

17681768
path += "MyModel.3ds";
@@ -1772,7 +1772,7 @@ std::string GdtfUnittest::GetTest3DS_Model(bool readLocation)
17721772
std::string GdtfUnittest::GetTest3DSLow_Model(bool readLocation)
17731773
{
17741774
std::string path;
1775-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "models3ds_low" + kSeparator; }
1775+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "models3ds_low" + kSeparator; }
17761776
else { path = fTestResourcesFolder + kSeparator; }
17771777

17781778
path += "MyModelLow.3ds";
@@ -1782,7 +1782,7 @@ std::string GdtfUnittest::GetTest3DSLow_Model(bool readLocation)
17821782
std::string GdtfUnittest::GetTest3DSHigh_Model(bool readLocation)
17831783
{
17841784
std::string path;
1785-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "models3ds_high" + kSeparator; }
1785+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "models3ds_high" + kSeparator; }
17861786
else { path = fTestResourcesFolder + kSeparator; }
17871787

17881788
path += "MyModelHigh.3ds";
@@ -1792,7 +1792,7 @@ std::string GdtfUnittest::GetTest3DSHigh_Model(bool readLocation)
17921792
std::string GdtfUnittest::GetTestGLTF_Model_glb(bool readLocation)
17931793
{
17941794
std::string path;
1795-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf" + kSeparator; }
1795+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf" + kSeparator; }
17961796
else { path = fTestResourcesFolder + kSeparator; }
17971797

17981798
path += "MyModel.glb";
@@ -1802,7 +1802,7 @@ std::string GdtfUnittest::GetTestGLTF_Model_glb(bool readLocation)
18021802
std::string GdtfUnittest::GetTestGLTFLow_Model_glb(bool readLocation)
18031803
{
18041804
std::string path;
1805-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf_low" + kSeparator; }
1805+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf_low" + kSeparator; }
18061806
else { path = fTestResourcesFolder + kSeparator; }
18071807

18081808
path += "MyModelLow.glb";
@@ -1812,7 +1812,7 @@ std::string GdtfUnittest::GetTestGLTFLow_Model_glb(bool readLocation)
18121812
std::string GdtfUnittest::GetTestGLTFHigh_Model_glb(bool readLocation)
18131813
{
18141814
std::string path;
1815-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf_high" + kSeparator; }
1815+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf_high" + kSeparator; }
18161816
else { path = fTestResourcesFolder + kSeparator; }
18171817

18181818
path += "MyModelHigh.glb";
@@ -1822,7 +1822,7 @@ std::string GdtfUnittest::GetTestGLTFHigh_Model_glb(bool readLocation)
18221822
std::string GdtfUnittest::GetTestGLTF_Model(bool readLocation)
18231823
{
18241824
std::string path;
1825-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf" + kSeparator; }
1825+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf" + kSeparator; }
18261826
else { path = fTestResourcesFolder + kSeparator; }
18271827

18281828
path += "Fox.gltf";
@@ -1832,7 +1832,7 @@ std::string GdtfUnittest::GetTestGLTF_Model(bool readLocation)
18321832
std::string GdtfUnittest::GetTestWheel_PNG(bool readLocation)
18331833
{
18341834
std::string path;
1835-
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator + "wheels" + kSeparator; }
1835+
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator + "wheels" + kSeparator; }
18361836
else { path = fTestResourcesFolder + kSeparator; }
18371837
path += "MWheel_Img1.png";
18381838
return path;

0 commit comments

Comments
 (0)