Commit bf3481fb authored by Josh's avatar Josh
Browse files

db naming

parent fa6ca750
......@@ -106,8 +106,8 @@ class HDRFileDB( HDRDatabaseInterface ):
Directory Names
'''
self.BASE_FOLDER = "Images"
self.SLICE_FOLDER = "Sliced"
self.PROCESSED_FOLDER = "Processed"
self.SLICE_FOLDER = "SL"
self.PROCESSED_FOLDER = "PROC"
self.dbBasePath = Path( dbLoc ).resolve()
self.imagesPath = self.dbBasePath.joinpath( self.BASE_FOLDER )
......@@ -157,7 +157,7 @@ class HDRFileDB( HDRDatabaseInterface ):
processedList = []
slicedDir = [ p for p in self._idToBasePath( sliceId ).rglob( sliceId ) ][0]
processedDir = slicedDir.joinpath( "Processed" )
processedDir = slicedDir.joinpath( self.PROCESSED_FOLDER )
for processedImage in processedDir.iterdir():
processedId = processedImage.name
displayName = self._idParts( processedImage.name )[self.PROC_TYPE]
......@@ -187,7 +187,7 @@ class HDRFileDB( HDRDatabaseInterface ):
def getMSLabelArray( self, sliceId: str ) -> np.array:
baseDir = self._idToBasePath( sliceId )
labelsIdentifier = "{}-{}-{}-Sliced-MeanShiftLabels-Processed.npy".format( self._idSliceSize( sliceId ),
labelsIdentifier = "{}-{}-{}-SL-MSLAB-PROC.npy".format( self._idSliceSize( sliceId ),
self._idXPix( sliceId ),
self._idYPix( sliceId ) )
msLabelsPath = [ p for p in baseDir.rglob( "*{}".format( labelsIdentifier ) ) ][0]
......@@ -201,7 +201,7 @@ class HDRFileDB( HDRDatabaseInterface ):
sliceDir = [ p for p in baseDir.rglob( sliceId ) ][0]
processedDir = sliceDir.joinpath( self.PROCESSED_FOLDER )
newMaskDir = processedDir.joinpath( "{}-{}-Processed".format( sliceId, maskName ) )
newMaskDir = processedDir.joinpath( "{}-{}-PROC".format( sliceId, maskName ) )
newMaskPath = newMaskDir.joinpath( "{}.{}".format( newMaskDir.name, self._idImageExt( sliceId ) ) )
print( "=====================")
print( sliceId )
......@@ -261,4 +261,4 @@ class HDRFileDB( HDRDatabaseInterface ):
return self.imagesPath.joinpath( "{}-{}-{}-{}".format( self._idUid( imageId ),
self._idImageExt( imageId ),
self._idName( imageId ),
"Original" ) )
\ No newline at end of file
"OR" ) )
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment