I'm far from an expert, but the diameter should be the entire OD of the prop.
You must also take into account, the pitch, as that could affect clearance to water intakes, skegs etc.
Hopefully my answer, didn't make you feel that way. That's just my understanding of it. I'm less than a novice at this stuff.