[Thuban-list] Patch: classifiers

[Moritz Lennert]

Daniel Calvelo Aros said:

>
> PS. I couldn't manage to reverse my previous patch for HSV ramps, so it's
> also
> included here. Sorry for the inconvenience!
>

I am having some trouble with the patching of the two...

The hsv.patch contains code changing the GetRamp function:

*** 979,985 ****
          topSizer.SetSizeHints(self)

      def GetRamp(self):
!         return CustomRamp(self.startPropCtrl.GetProperties(),
                            self.endPropCtrl.GetProperties())

      def _OnCopyStart(self, event):
--- 985,995 ----
          topSizer.SetSizeHints(self)

      def GetRamp(self):
!       if self.modeChoice.GetStringSelection()==_("HSV Ramp"):
!           rampType = HSVCustomRamp
!       else:
!           rampType = CustomRamp
!         return rampType(self.startPropCtrl.GetProperties(),
                            self.endPropCtrl.GetProperties())


However, the hsv+class.patch doesn't seem to do the same change:

          topSizer.SetSizeHints(self)

      def GetRamp(self):
!         return CustomRamp(self.startPropCtrl.GetProperties(),
                            self.endPropCtrl.GetProperties())

      def _OnCopyStart(self, event):
--- 1268,1274 ----
          topSizer.SetSizeHints(self)

      def GetRamp(self):
!         return HSVCustomRamp(self.startPropCtrl.GetProperties(),
                            self.endPropCtrl.GetProperties())

      def _OnCopyStart(self, event):

When I try to use both patches, I get

$ patch -p0 < hsv+class.patch
patching file thuban/Thuban/Model/classgen.py
patching file thuban/Thuban/Model/color.py

$ patch -p0 < hsv.patch
patching file thuban/Thuban/Model/classgen.py
Reversed (or previously applied) patch detected!  Assume -R? [n]

(and the same when I try to apply the patches in reverse order)

Could someone tell me how to solve this ?

Moritz
patching file thuban/Thuban/UI/classgen.py