Female Cat Urinating on My Desk?

I have a real problem. Luna, my 5 year old cat, has been urinating on my desk and bathroom sink. She used to urinate on things when she was in heat. I understood that because she is has always been weird when she is in heat. We moved a year ago, in with friends. We, myself and Luna, are renting a bedroom and bath from them. Luna stays in my bedroom mostly. Sometimes I let her out to get some exercise. The only thing that has changed in the time that Luna started urinating on my desk is my Great Pyrenees decided she wanted to stay outside. Luna was urinating on the bathroom counter, but she has stopped that. I have a small piece of glass on my desk because she has ruined the finish of the top of my desk by urinating on it. I have cleaned both the top of the desk with bleach water, apple cider vinegar, glass cleaner, and regular vinegar, not at the same time. At different times I have had to clean my desk. I have rubbed her nose in the urine, I have cleaned her litter box, I have taken her to the vet and she is still doing it. Help please.